From aa90fa578fc241d24212b7f3697b7503cb9ff602 Mon Sep 17 00:00:00 2001 From: David Black Date: Sat, 18 Jan 2014 22:37:20 +0000 Subject: [PATCH] Fix Busybox --- metadata/stericson.busybox.donate.txt | 124 ++++++++++++++++++-------- srclibs/BusyboxConfigs-linusyang.txt | 3 + 2 files changed, 89 insertions(+), 38 deletions(-) create mode 100644 srclibs/BusyboxConfigs-linusyang.txt diff --git a/metadata/stericson.busybox.donate.txt b/metadata/stericson.busybox.donate.txt index 79a2509088..676dd914a7 100644 --- a/metadata/stericson.busybox.donate.txt +++ b/metadata/stericson.busybox.donate.txt @@ -4,55 +4,103 @@ Web Site:http://code.google.com/p/busybox-android/ Source Code:http://code.google.com/p/busybox-android/source Issue Tracker:http://code.google.com/p/busybox-android/issues -Summary:BusyBox installer +Name:BusyBox Installer +Summary:Interface to install system tools Description: -Installs and updates BusyBox on a rooted device. +Interface to install BusyBox 1.21.1 +(just ARM architecture for now as the ones can't be built) +as well other versions off the internet (if you're brave). +Don't install the 1.21.0 version as it isn't in the apk. BusyBox combines tiny versions of many common UNIX utilities into a single small executable. It provides replacements for most of the utilities you -usually find in GNU fileutils, shellutils, etc. See the BusyBox web site at -http://www.busybox.net for more information. BusyBox itself is GPLv2 -licensed. +usually find in GNU fileutils, shellutils, etc. + +The app allows you backup and restore current binaries; to disable individual applets +and see their help documentation. + +The range of applets +[https://raw2.github.com/tias/android-busybox-ndk/master/android_ndk_stericson-like available] +isn't identical to the upstream version. + +Requires root. . Requires Root:Yes Repo Type:git-svn -Repo:http://busybox-android.googlecode.com/svn;trunk=trunk;tags=tags +Repo:http://busybox-android.googlecode.com/svn/trunk -Build Version:7.1,103,!busybox prebuilt binaries 3,target=android-8,prebuild=\ -cd src/stericson &&\ -svn co -r 133 http://roottools.googlecode.com/svn/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools &&\ -cd ../.. +Build:10.3,161 + commit=32 + subdir=app/Pro + target=android-15 + srclibs=1:ViewPagerIndicator@8cd549;RootTools@310;BusyboxConfigs-linusyang@63dc + rm=binaries;patches;app/Free;app/Pro/assets + prebuild=mkdir assets && \ + cp -r $$RootTools$$/3.4/src/com/ src/ && \ + cp -r $$BusyboxConfigs-linusyang$$ ../BB && \ + sed -i 's/darwin-x86_64/linux-x86/g;/android_ndk_config-w-patches/d;s/#CONFIG_FILE/CONFIG_FILE/' ../BB/Makefile + build=cd ../BB && \ + export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \ + make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \ + mv busybox-git.arm/busybox ../Pro/assets/busybox1.21.1.png -# Replace reboot.png etc. in assets: although they are pulled from a device -# and don't need to be built from source according to system library exception, -# we could pull them from Replicant or CM. -# x86 and MIPS builds don't work for some reason -Build Version:9.6.3,141,!WIP (see description) at 26,subdir=app,\ -patch=code-141.patch,\ -target=android-15,\ -srclibs=ViewPagerIndicator@2.2.3;Busybox@1_21_0;RootTools@211;BusyboxConfigs@e71bc43bd0,\ -prebuild=sed -i 's@\(.1=\).*@\1$$ViewPagerIndicator$$@' project.properties && \ - rm -f ../binaries/* assets/busybox* && mkdir -p libs/ && \ - cp -r $$RootTools$$ .. && cp -r $$Busybox$$ .. && \ - cp -r $$BusyboxConfigs$$/* ../Busybox/configs/ && \ - cd ../Busybox && for i in configs/patches/*.patch; do patch -p1 < $i; done && \ - mv configs/android_ndk_stericson-like .config,\ -build=cd ../RootTools && ant release && ant -f makejar.ant && \ - mv roottools.jar ../app/libs/ && ant clean && cd ../Busybox && \ - export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \ - make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \ - mv busybox ../app/assets/busybox-1.21.0-ARM.png && make clean +Build:10.7,180 + commit=37 + subdir=application/Busybox + disable=busybox builds but java app isn't functional; need to rename busybox binaries sensibly so they are made available in the UI + forceversion=yes + forcevercode=yes + gradle=pro + srclibs=RootTools@310;BusyboxConfigs-linusyang@63dc + prebuild=mkdir assets && \ + cp -r $$RootTools$$/3.4/src/com/stericson/RootTools src/main/java/stericson/ && \ + cp -r $$BusyboxConfigs-linusyang$$ ../BB && \ + sed -i 's/darwin-x86_64/linux-x86/g;/android_ndk_config-w-patches/d;s/#CONFIG_FILE/CONFIG_FILE/' ../BB/Makefile + build=cd ../BB && \ + export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \ + make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \ + mv busybox-git.arm/busybox ../Busybox/assets/busybox.png + +Build:10.7,200 + commit=37 + disable=using Tias repo:sed: invalid option -- 'D' -- 'z' after patching; need to rename busybox binaries sensibly so they are made available in the UI + forceversion=yes + forcevercode=yes + subdir=application/Busybox + gradle=pro + srclibs=RootTools@310;BusyboxConfigs@835af1 + prebuild=mkdir assets && \ + cp -r $$RootTools$$/3.4/src/com/stericson/RootTools src/main/java/stericson/ && \ + cp -r $$BusyboxConfigs$$ ../BB && \ + sed -i 's/i686-android-linux/i686-linux-android/g;/android_ndk_config-w-patches/d;s/#CONFIG_FILE/CONFIG_FILE/' ../BB/Makefile + build=cd ../BB && \ + export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \ + make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \ + mv busybox-git.arm/busybox ../Busybox/assets/busybox-1.21.0-ARM.png && \ + export PATH=$$NDK$$/toolchains/x86-4.4.3/prebuilt/linux-x86/bin:$PATH && \ + make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-x86" ARCH=x86 ANDROID_NDK=$$NDK$$ && \ + mv busybox-git.x86/busybox ../Busybox/assets/busybox-1.21.0-x86.png && \ + export PATH=$$NDK$$/toolchains/mipsel-linux-android-4.4.3/prebuilt/linux-x86/bin:$PATH && \ + make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-mips" ARCH=mips ANDROID_NDK=$$NDK$$ && \ + mv busybox-git.mips/busybox ../Busybox/assets/busybox-1.21.0-MIPS.png + +Maintainer Notes: +The Java app is hard to figure out as things keep moving around and there are +no commit descriptions. +It's now using gradle but it's half baked at time of writing. + +Busybox x86 and MIPS hang for me with linusyang setup with stericson and basic configs. + +The busybox binary was tested with toolchain 4.6; I don't have toolchain 4.4.3 installed. +So if it doesn't build just sed 4.6 in ../BB/Makefile. + +For 10.3 I just ripped out the prebuilts; it seems to be OK but somebody should verify. +. -#export PATH=$$NDK$$/toolchains/mipsel-linux-android-4.4.3/prebuilt/linux-x86/bin:$PATH && \ -#export PATH=$$NDK$$/toolchains/x86-4.4.3/prebuilt/linux-x86/bin:$PATH && \ -#make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-x86" ARCH=x86 ANDROID_NDK=$$NDK$$ && \ -#mv busybox ../app/assets/busybox-1.21.0-x86.png && make clean -#make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-mips" ARCH=mips ANDROID_NDK=$$NDK$$ && \ -#mv busybox ../app/assets/busybox-1.21.0-MIPS.png && make clean Auto Update Mode:None -Update Check Mode:Static -Current Version:9.6.3 -Current Version Code:141 +Update Check Mode:None +Current Version:10.3 +Current Version Code:161 diff --git a/srclibs/BusyboxConfigs-linusyang.txt b/srclibs/BusyboxConfigs-linusyang.txt new file mode 100644 index 0000000000..249e261404 --- /dev/null +++ b/srclibs/BusyboxConfigs-linusyang.txt @@ -0,0 +1,3 @@ +Repo Type:git +Repo:https://github.com/linusyang/android-busybox-ndk.git +