@@ -9,12 +9,12 @@ function check_product()
|
||||
echo "Couldn't locate the top of the tree. Try setting TOP." >&2
|
||||
return
|
||||
fi
|
||||
if (echo -n $1 | grep -q -e "^lineage_") ; then
|
||||
LINEAGE_BUILD=$(echo -n $1 | sed -e 's/^lineage_//g')
|
||||
if (echo -n $1 | grep -q -e "^minus_") ; then
|
||||
MINUS_BUILD=$(echo -n $1 | sed -e 's/^minus_//g')
|
||||
else
|
||||
LINEAGE_BUILD=
|
||||
MINUS_BUILD=
|
||||
fi
|
||||
export LINEAGE_BUILD
|
||||
export MINUS_BUILD
|
||||
|
||||
TARGET_PRODUCT=$1 \
|
||||
TARGET_RELEASE=$2 \
|
||||
@@ -41,7 +41,7 @@ function breakfast()
|
||||
{
|
||||
target=$1
|
||||
local variant=$2
|
||||
source ${ANDROID_BUILD_TOP}/vendor/lineage/vars/aosp_target_release
|
||||
source ${ANDROID_BUILD_TOP}/vendor/minus/vars/aosp_target_release
|
||||
|
||||
if [ $# -eq 0 ]; then
|
||||
# No arguments, so let's have the full menu
|
||||
@@ -51,12 +51,12 @@ function breakfast()
|
||||
# A buildtype was specified, assume a full device name
|
||||
lunch $target
|
||||
else
|
||||
# This is probably just the Lineage model name
|
||||
# This is probably just the Minus model name
|
||||
if [ -z "$variant" ]; then
|
||||
variant="userdebug"
|
||||
fi
|
||||
|
||||
lunch lineage_$target-$aosp_target_release-$variant
|
||||
lunch minus_$target-$aosp_target_release-$variant
|
||||
fi
|
||||
fi
|
||||
return $?
|
||||
@@ -67,7 +67,7 @@ alias bib=breakfast
|
||||
function eat()
|
||||
{
|
||||
if [ "$OUT" ] ; then
|
||||
ZIPPATH=`ls -tr "$OUT"/lineage-*.zip | tail -1`
|
||||
ZIPPATH=`ls -tr "$OUT"/minus-*.zip | tail -1`
|
||||
if [ ! -f $ZIPPATH ] ; then
|
||||
echo "Nothing to eat"
|
||||
return 1
|
||||
@@ -75,13 +75,13 @@ function eat()
|
||||
echo "Waiting for device..."
|
||||
adb wait-for-device-recovery
|
||||
echo "Found device"
|
||||
if (adb shell getprop ro.lineage.device | grep -q "$LINEAGE_BUILD"); then
|
||||
if (adb shell getprop ro.minus.device | grep -q "$MINUS_BUILD"); then
|
||||
echo "Rebooting to sideload for install"
|
||||
adb reboot sideload-auto-reboot
|
||||
adb wait-for-sideload
|
||||
adb sideload $ZIPPATH
|
||||
else
|
||||
echo "The connected device does not appear to be $LINEAGE_BUILD, run away!"
|
||||
echo "The connected device does not appear to be $MINUS_BUILD, run away!"
|
||||
fi
|
||||
return $?
|
||||
else
|
||||
@@ -205,45 +205,6 @@ function dddclient()
|
||||
fi
|
||||
}
|
||||
|
||||
function lineageremote()
|
||||
{
|
||||
if ! git rev-parse --git-dir &> /dev/null
|
||||
then
|
||||
echo ".git directory not found. Please run this from the root directory of the Android repository you wish to set up."
|
||||
return 1
|
||||
fi
|
||||
git remote rm lineage 2> /dev/null
|
||||
local REMOTE=$(git config --get remote.github.projectname)
|
||||
local LINEAGE="true"
|
||||
if [ -z "$REMOTE" ]
|
||||
then
|
||||
REMOTE=$(git config --get remote.aosp.projectname)
|
||||
LINEAGE="false"
|
||||
fi
|
||||
if [ -z "$REMOTE" ]
|
||||
then
|
||||
REMOTE=$(git config --get remote.clo.projectname)
|
||||
LINEAGE="false"
|
||||
fi
|
||||
|
||||
if [ $LINEAGE = "false" ]
|
||||
then
|
||||
local PROJECT=$(echo $REMOTE | sed -e "s#platform/#android/#g; s#/#_#g")
|
||||
local PFX="LineageOS/"
|
||||
else
|
||||
local PROJECT=$REMOTE
|
||||
fi
|
||||
|
||||
local LINEAGE_USER=$(git config --get review.review.lineageos.org.username)
|
||||
if [ -z "$LINEAGE_USER" ]
|
||||
then
|
||||
git remote add lineage ssh://review.lineageos.org:29418/$PFX$PROJECT
|
||||
else
|
||||
git remote add lineage ssh://$LINEAGE_USER@review.lineageos.org:29418/$PFX$PROJECT
|
||||
fi
|
||||
echo "Remote 'lineage' created"
|
||||
}
|
||||
|
||||
function aospremote()
|
||||
{
|
||||
if ! git rev-parse --git-dir &> /dev/null
|
||||
@@ -321,7 +282,7 @@ function githubremote()
|
||||
|
||||
local PROJECT=$(echo $REMOTE | sed -e "s#platform/#android/#g; s#/#_#g")
|
||||
|
||||
git remote add github https://github.com/LineageOS/$PROJECT
|
||||
git remote add github https://github.com/MinusOS/$PROJECT
|
||||
echo "Remote 'github' created"
|
||||
}
|
||||
|
||||
@@ -366,14 +327,14 @@ function installboot()
|
||||
adb wait-for-device-recovery
|
||||
adb root
|
||||
adb wait-for-device-recovery
|
||||
if (adb shell getprop ro.lineage.device | grep -q "$LINEAGE_BUILD");
|
||||
if (adb shell getprop ro.minus.device | grep -q "$MINUS_BUILD");
|
||||
then
|
||||
adb push $OUT/boot.img /cache/
|
||||
adb shell dd if=/cache/boot.img of=$PARTITION
|
||||
adb shell rm -rf /cache/boot.img
|
||||
echo "Installation complete."
|
||||
else
|
||||
echo "The connected device does not appear to be $LINEAGE_BUILD, run away!"
|
||||
echo "The connected device does not appear to be $MINUS_BUILD, run away!"
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -404,296 +365,17 @@ function installrecovery()
|
||||
adb wait-for-device-recovery
|
||||
adb root
|
||||
adb wait-for-device-recovery
|
||||
if (adb shell getprop ro.lineage.device | grep -q "$LINEAGE_BUILD");
|
||||
if (adb shell getprop ro.minus.device | grep -q "$MINUS_BUILD");
|
||||
then
|
||||
adb push $OUT/recovery.img /cache/
|
||||
adb shell dd if=/cache/recovery.img of=$PARTITION
|
||||
adb shell rm -rf /cache/recovery.img
|
||||
echo "Installation complete."
|
||||
else
|
||||
echo "The connected device does not appear to be $LINEAGE_BUILD, run away!"
|
||||
echo "The connected device does not appear to be $MINUS_BUILD, run away!"
|
||||
fi
|
||||
}
|
||||
|
||||
function lineagegerrit() {
|
||||
if [ "$(basename $SHELL)" = "zsh" ]; then
|
||||
# zsh does not define FUNCNAME, derive from funcstack
|
||||
local FUNCNAME=$funcstack[1]
|
||||
fi
|
||||
|
||||
if [ $# -eq 0 ]; then
|
||||
$FUNCNAME help
|
||||
return 1
|
||||
fi
|
||||
local user=`git config --get review.review.lineageos.org.username`
|
||||
local review=`git config --get remote.github.review`
|
||||
local project=`git config --get remote.github.projectname`
|
||||
local command=$1
|
||||
shift
|
||||
case $command in
|
||||
help)
|
||||
if [ $# -eq 0 ]; then
|
||||
cat <<EOF
|
||||
Usage:
|
||||
$FUNCNAME COMMAND [OPTIONS] [CHANGE-ID[/PATCH-SET]][{@|^|~|:}ARG] [-- ARGS]
|
||||
|
||||
Commands:
|
||||
fetch Just fetch the change as FETCH_HEAD
|
||||
help Show this help, or for a specific command
|
||||
pull Pull a change into current branch
|
||||
push Push HEAD or a local branch to Gerrit for a specific branch
|
||||
|
||||
Any other Git commands that support refname would work as:
|
||||
git fetch URL CHANGE && git COMMAND OPTIONS FETCH_HEAD{@|^|~|:}ARG -- ARGS
|
||||
|
||||
See '$FUNCNAME help COMMAND' for more information on a specific command.
|
||||
|
||||
Example:
|
||||
$FUNCNAME checkout -b topic 1234/5
|
||||
works as:
|
||||
git fetch http://DOMAIN/p/PROJECT refs/changes/34/1234/5 \\
|
||||
&& git checkout -b topic FETCH_HEAD
|
||||
will checkout a new branch 'topic' base on patch-set 5 of change 1234.
|
||||
Patch-set 1 will be fetched if omitted.
|
||||
EOF
|
||||
return
|
||||
fi
|
||||
case $1 in
|
||||
__cmg_*) echo "For internal use only." ;;
|
||||
changes|for)
|
||||
if [ "$FUNCNAME" = "lineagegerrit" ]; then
|
||||
echo "'$FUNCNAME $1' is deprecated."
|
||||
fi
|
||||
;;
|
||||
help) $FUNCNAME help ;;
|
||||
fetch|pull) cat <<EOF
|
||||
usage: $FUNCNAME $1 [OPTIONS] CHANGE-ID[/PATCH-SET]
|
||||
|
||||
works as:
|
||||
git $1 OPTIONS http://DOMAIN/p/PROJECT \\
|
||||
refs/changes/HASH/CHANGE-ID/{PATCH-SET|1}
|
||||
|
||||
Example:
|
||||
$FUNCNAME $1 1234
|
||||
will $1 patch-set 1 of change 1234
|
||||
EOF
|
||||
;;
|
||||
push) cat <<EOF
|
||||
usage: $FUNCNAME push [OPTIONS] [LOCAL_BRANCH:]REMOTE_BRANCH
|
||||
|
||||
works as:
|
||||
git push OPTIONS ssh://USER@DOMAIN:29418/PROJECT \\
|
||||
{LOCAL_BRANCH|HEAD}:refs/for/REMOTE_BRANCH
|
||||
|
||||
Example:
|
||||
$FUNCNAME push fix6789:gingerbread
|
||||
will push local branch 'fix6789' to Gerrit for branch 'gingerbread'.
|
||||
HEAD will be pushed from local if omitted.
|
||||
EOF
|
||||
;;
|
||||
*)
|
||||
$FUNCNAME __cmg_err_not_supported $1 && return
|
||||
cat <<EOF
|
||||
usage: $FUNCNAME $1 [OPTIONS] CHANGE-ID[/PATCH-SET][{@|^|~|:}ARG] [-- ARGS]
|
||||
|
||||
works as:
|
||||
git fetch http://DOMAIN/p/PROJECT \\
|
||||
refs/changes/HASH/CHANGE-ID/{PATCH-SET|1} \\
|
||||
&& git $1 OPTIONS FETCH_HEAD{@|^|~|:}ARG -- ARGS
|
||||
EOF
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
__cmg_get_ref)
|
||||
$FUNCNAME __cmg_err_no_arg $command $# && return 1
|
||||
local change_id patchset_id hash
|
||||
case $1 in
|
||||
*/*)
|
||||
change_id=${1%%/*}
|
||||
patchset_id=${1#*/}
|
||||
;;
|
||||
*)
|
||||
change_id=$1
|
||||
patchset_id=1
|
||||
;;
|
||||
esac
|
||||
hash=$(($change_id % 100))
|
||||
case $hash in
|
||||
[0-9]) hash="0$hash" ;;
|
||||
esac
|
||||
echo "refs/changes/$hash/$change_id/$patchset_id"
|
||||
;;
|
||||
fetch|pull)
|
||||
$FUNCNAME __cmg_err_no_arg $command $# help && return 1
|
||||
$FUNCNAME __cmg_err_not_repo && return 1
|
||||
local change=$1
|
||||
shift
|
||||
git $command $@ http://$review/p/$project \
|
||||
$($FUNCNAME __cmg_get_ref $change) || return 1
|
||||
;;
|
||||
push)
|
||||
$FUNCNAME __cmg_err_no_arg $command $# help && return 1
|
||||
$FUNCNAME __cmg_err_not_repo && return 1
|
||||
if [ -z "$user" ]; then
|
||||
echo >&2 "Gerrit username not found."
|
||||
return 1
|
||||
fi
|
||||
local local_branch remote_branch
|
||||
case $1 in
|
||||
*:*)
|
||||
local_branch=${1%:*}
|
||||
remote_branch=${1##*:}
|
||||
;;
|
||||
*)
|
||||
local_branch=HEAD
|
||||
remote_branch=$1
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
git push $@ ssh://$user@$review:29418/$project \
|
||||
${local_branch}:refs/for/$remote_branch || return 1
|
||||
;;
|
||||
changes|for)
|
||||
if [ "$FUNCNAME" = "lineagegerrit" ]; then
|
||||
echo >&2 "'$FUNCNAME $command' is deprecated."
|
||||
fi
|
||||
;;
|
||||
__cmg_err_no_arg)
|
||||
if [ $# -lt 2 ]; then
|
||||
echo >&2 "'$FUNCNAME $command' missing argument."
|
||||
elif [ $2 -eq 0 ]; then
|
||||
if [ -n "$3" ]; then
|
||||
$FUNCNAME help $1
|
||||
else
|
||||
echo >&2 "'$FUNCNAME $1' missing argument."
|
||||
fi
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
;;
|
||||
__cmg_err_not_repo)
|
||||
if [ -z "$review" -o -z "$project" ]; then
|
||||
echo >&2 "Not currently in any reviewable repository."
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
;;
|
||||
__cmg_err_not_supported)
|
||||
$FUNCNAME __cmg_err_no_arg $command $# && return
|
||||
case $1 in
|
||||
#TODO: filter more git commands that don't use refname
|
||||
init|add|rm|mv|status|clone|remote|bisect|config|stash)
|
||||
echo >&2 "'$FUNCNAME $1' is not supported."
|
||||
;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
;;
|
||||
#TODO: other special cases?
|
||||
*)
|
||||
$FUNCNAME __cmg_err_not_supported $command && return 1
|
||||
$FUNCNAME __cmg_err_no_arg $command $# help && return 1
|
||||
$FUNCNAME __cmg_err_not_repo && return 1
|
||||
local args="$@"
|
||||
local change pre_args refs_arg post_args
|
||||
case "$args" in
|
||||
*--\ *)
|
||||
pre_args=${args%%-- *}
|
||||
post_args="-- ${args#*-- }"
|
||||
;;
|
||||
*) pre_args="$args" ;;
|
||||
esac
|
||||
args=($pre_args)
|
||||
pre_args=
|
||||
if [ ${#args[@]} -gt 0 ]; then
|
||||
change=${args[${#args[@]}-1]}
|
||||
fi
|
||||
if [ ${#args[@]} -gt 1 ]; then
|
||||
pre_args=${args[0]}
|
||||
for ((i=1; i<${#args[@]}-1; i++)); do
|
||||
pre_args="$pre_args ${args[$i]}"
|
||||
done
|
||||
fi
|
||||
while ((1)); do
|
||||
case $change in
|
||||
""|--)
|
||||
$FUNCNAME help $command
|
||||
return 1
|
||||
;;
|
||||
*@*)
|
||||
if [ -z "$refs_arg" ]; then
|
||||
refs_arg="@${change#*@}"
|
||||
change=${change%%@*}
|
||||
fi
|
||||
;;
|
||||
*~*)
|
||||
if [ -z "$refs_arg" ]; then
|
||||
refs_arg="~${change#*~}"
|
||||
change=${change%%~*}
|
||||
fi
|
||||
;;
|
||||
*^*)
|
||||
if [ -z "$refs_arg" ]; then
|
||||
refs_arg="^${change#*^}"
|
||||
change=${change%%^*}
|
||||
fi
|
||||
;;
|
||||
*:*)
|
||||
if [ -z "$refs_arg" ]; then
|
||||
refs_arg=":${change#*:}"
|
||||
change=${change%%:*}
|
||||
fi
|
||||
;;
|
||||
*) break ;;
|
||||
esac
|
||||
done
|
||||
$FUNCNAME fetch $change \
|
||||
&& git $command $pre_args FETCH_HEAD$refs_arg $post_args \
|
||||
|| return 1
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
function lineagerebase() {
|
||||
local repo=$1
|
||||
local refs=$2
|
||||
local pwd="$(pwd)"
|
||||
local dir="$(gettop)/$repo"
|
||||
|
||||
if [ -z $repo ] || [ -z $refs ]; then
|
||||
echo "LineageOS Gerrit Rebase Usage: "
|
||||
echo " lineagerebase <path to project> <patch IDs on Gerrit>"
|
||||
echo " The patch IDs appear on the Gerrit commands that are offered."
|
||||
echo " They consist on a series of numbers and slashes, after the text"
|
||||
echo " refs/changes. For example, the ID in the following command is 26/8126/2"
|
||||
echo ""
|
||||
echo " git[...]ges_apps_Camera refs/changes/26/8126/2 && git cherry-pick FETCH_HEAD"
|
||||
echo ""
|
||||
return
|
||||
fi
|
||||
|
||||
if [ ! -d $dir ]; then
|
||||
echo "Directory $dir doesn't exist in tree."
|
||||
return
|
||||
fi
|
||||
cd $dir
|
||||
repo=$(cat .git/config | grep git://github.com | awk '{ print $NF }' | sed s#git://github.com/##g)
|
||||
echo "Starting branch..."
|
||||
repo start tmprebase .
|
||||
echo "Bringing it up to date..."
|
||||
repo sync .
|
||||
echo "Fetching change..."
|
||||
git fetch "http://review.lineageos.org/p/$repo" "refs/changes/$refs" && git cherry-pick FETCH_HEAD
|
||||
if [ "$?" != "0" ]; then
|
||||
echo "Error cherry-picking. Not uploading!"
|
||||
return
|
||||
fi
|
||||
echo "Uploading..."
|
||||
repo upload .
|
||||
echo "Cleaning up..."
|
||||
repo abandon tmprebase .
|
||||
cd $pwd
|
||||
}
|
||||
|
||||
function mka() {
|
||||
m "$@"
|
||||
}
|
||||
@@ -766,7 +448,7 @@ function dopush()
|
||||
echo "Device Found."
|
||||
fi
|
||||
|
||||
if (adb shell getprop ro.lineage.device | grep -q "$LINEAGE_BUILD") || [ "$FORCE_PUSH" = "true" ];
|
||||
if (adb shell getprop ro.minus.device | grep -q "$MINUS_BUILD") || [ "$FORCE_PUSH" = "true" ];
|
||||
then
|
||||
# retrieve IP and PORT info if we're using a TCP connection
|
||||
TCPIPPORT=$(adb devices \
|
||||
@@ -885,7 +567,7 @@ EOF
|
||||
rm -f $OUT/.log
|
||||
return 0
|
||||
else
|
||||
echo "The connected device does not appear to be $LINEAGE_BUILD, run away!"
|
||||
echo "The connected device does not appear to be $MINUS_BUILD, run away!"
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -896,11 +578,6 @@ alias mmmap='dopush mmma'
|
||||
alias mkap='dopush mka'
|
||||
alias cmkap='dopush cmka'
|
||||
|
||||
function repopick() {
|
||||
T=$(gettop)
|
||||
$T/vendor/lineage/build/tools/repopick.py $@
|
||||
}
|
||||
|
||||
function sort-blobs-list() {
|
||||
T=$(gettop)
|
||||
$T/tools/extract-utils/sort-blobs-list.py $@
|
||||
@@ -910,7 +587,7 @@ function fixup_common_out_dir() {
|
||||
common_out_dir=$(_get_build_var_cached OUT_DIR)/target/common
|
||||
target_device=$(_get_build_var_cached TARGET_DEVICE)
|
||||
common_target_out=common-${target_device}
|
||||
if [ ! -z $LINEAGE_FIXUP_COMMON_OUT ]; then
|
||||
if [ ! -z $MINUS_FIXUP_COMMON_OUT ]; then
|
||||
if [ -d ${common_out_dir} ] && [ ! -L ${common_out_dir} ]; then
|
||||
mv ${common_out_dir} ${common_out_dir}-${target_device}
|
||||
ln -s ${common_target_out} ${common_out_dir}
|
||||
|
Reference in New Issue
Block a user