topjohnwu/ndk-box-kitchen
1
0
Fork 0
mirror of https://github.com/topjohnwu/ndk-box-kitchen.git synced 2024-11-23 11:29:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bump version and switch to TAG based

Browse Source
This commit is contained in:
topjohnwu 2017-09-05 12:01:46 +08:00
parent a323e0c795
commit c58dcf0d32
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
busybox.mk
View File

@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
VERSION = 1
PATCHLEVEL = 27
SUBLEVEL = 1
SUBLEVEL = 2
EXTRAVERSION = -topjohnwu
BB_VER = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)

19
ndk_busybox_kitchen.sh
View File

@ -13,7 +13,7 @@ COMMIT=false
CLEAN=false
UPDATE=false
GENERATE=false
BRANCH=1_27_stable
TAG=1_27_2
CONFIG=$PATCHPATH/osm0sis-full-64.config
usage() {
@ -23,7 +23,7 @@ usage() {
echo "then finally generate all header files and Android.mk for NDK building"
echo "Once all tasks are finished, simply call \"ndk-build\" to build busybox"
echo ""
echo "$0 [OPTIONS] [ACTION] [BRANCH]"
echo "$0 [OPTIONS] [ACTION] [TAG]"
echo ""
echo "Options:"
echo " -h Show this help message"
@ -35,8 +35,8 @@ usage() {
echo " --update Update current repos from upstream"
echo " --generate Generate proper headers and Android.mk"
echo ""
echo "For the first two actions, the busybox repo will be checked-out to [BRANCH]"
echo "If [BRANCH] is not specified, the default branch is \"$BRANCH\""
echo "For the first two actions, the busybox repo will be checked-out to [TAG]"
echo "If [TAG] is not specified, the default TAG is \"$TAG\""
echo ""
exit
}
@ -70,7 +70,7 @@ until [ $# -eq 0 ]; do
elif [ $1 = "--clean" ]; then CLEAN=true;
elif [ $1 = "--update" ]; then UPDATE=true;
elif [ $1 = "--generate" ]; then GENERATE=true;
else BRANCH=$1; fi
else TAG=$1; fi
shift
done
@ -103,8 +103,9 @@ if $UPDATE; then
cd ../$BBPATH
git reset --hard && git clean -dfx
git fetch
git checkout $BRANCH
git checkout master
git pull
git checkout $TAG
if $COMMIT; then
# New branch
@ -127,7 +128,7 @@ if $UPDATE; then
# A commit for osm0sis patches
sleep 1
git add .
git commit -m "Apply patches from osm0sis/android-busybox-ndk"
git commit -m "Apply patches from osm0sis/android-busybox-ndk" -m "Auto generated by ndk-busybox-kitchen"
fi
progress "Applying patches for ndk-build to work properly"
@ -137,7 +138,7 @@ if $UPDATE; then
# A commit for ndk-build patches
sleep 1
git add .
git commit -m "Apply patches for ndk-build to work properly"
git commit -m "Apply patches for ndk-build to work properly" -m "Auto generated by ndk-busybox-kitchen"
fi
find . \( -type f -name "*.orig" -o -name "*.reg" \) -exec rm -f {} \;
@ -175,7 +176,7 @@ if $GENERATE; then
if $COMMIT; then
git add -f include
git add *.mk
git commit -m "Add generated files for ndk-build"
git commit -m "Add generated files for ndk-build" -m "Auto generated by ndk-busybox-kitchen"
fi
fi