diff --git a/metadata/stericson.busybox.donate.txt b/metadata/stericson.busybox.donate.txt index 43c2e5dd80..8ec395be3e 100644 --- a/metadata/stericson.busybox.donate.txt +++ b/metadata/stericson.busybox.donate.txt @@ -13,6 +13,28 @@ 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. + +app/src/stericson/busybox/donate/jobs/GetAvailableAppletsJob.java:47: error: method getBusyBoxApplets in class RootTools cannot be applied to given types; + [javac] applets = RootTools.getBusyBoxApplets(storagePath); + [javac] ^ + [javac] required: no arguments + [javac] found: String + [javac] reason: actual and formal argument lists differ in length + [javac] /home/gerry/fdroiddata/build/stericson.busybox.donate/app/src/stericson/busybox/donate/jobs/Install.java:39: error: method getBusyBoxVersion in class RootTools cannot be applied to given types; + [javac] String tmp_version = RootTools.getBusyBoxVersion(activity.getFilesDir().toString() + "/bb"); + [javac] ^ + [javac] required: no arguments + [javac] found: String + [javac] reason: actual and formal argument lists differ in length + [javac] /home/gerry/fdroiddata/build/stericson.busybox.donate/app/src/stericson/busybox/donate/jobs/PrepareBinary.java:47: error: method getBusyBoxVersion in class RootTools cannot be applied to given types; + [javac] String version = RootTools.getBusyBoxVersion(storagePath); + [javac] ^ + [javac] required: no arguments + [javac] found: String + [javac] reason: actual and formal argument lists differ in length + [javac] Note: Some input files use or override a deprecated API. + [javac] Note: Recompile with -Xlint:deprecation for details. + [javac] 3 errors . Requires Root:Yes @@ -28,9 +50,9 @@ cd ../.. # 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. -# patch src/.../Constants.java to have exact list of applets # x86 and MIPS builds don't work for some reason -Build Version:9.6.3,141,!WIP at 26,subdir=app,\ +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 && \ @@ -45,7 +67,6 @@ build=cd ../RootTools && ant release && ant -f makejar.ant && \ 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 -#patch=code-141.patch,\ #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$$ && \ @@ -56,3 +77,4 @@ Auto Update Mode:None Update Check Mode:Static Current Version:9.6.3 Current Version Code:141 + diff --git a/metadata/stericson.busybox.donate/code-141.patch b/metadata/stericson.busybox.donate/code-141.patch new file mode 100644 index 0000000000..7ef9a448c8 --- /dev/null +++ b/metadata/stericson.busybox.donate/code-141.patch @@ -0,0 +1,20 @@ +diff --git a/app/src/stericson/busybox/donate/Constants.java b/app/src/stericson/busybox/donate/Constants.java +index 8c16ce7..573c64b 100644 +--- a/app/src/stericson/busybox/donate/Constants.java ++++ b/app/src/stericson/busybox/donate/Constants.java +@@ -23,12 +23,12 @@ public class Constants { + EXTRA_INSTALL_PATH = "path", + PREF_NAME = "BusyBox"; + +- public static String newest = "BusyBox 1.20.2"; ++ public static String newest = "BusyBox 1.21.0-ARM"; + public static String Key = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk78EBO78KPQkOCo2SCPqImOv6ViRmY7Vy/d5xOi1+B1mJEWtHreHxrDw9sdyVaxbd3X/PnFIUQzj2Qk159RMP7p2lIiJ1yYVyifOciVV1f4r2z7llCKMJYCVVe0k+9P5SVEWZWoV+5QqJqm06pZ12ChsMNUN+3JujIUtiCARVn4wBmCT+eXfHcxmhyVfnE4a+3FlLGYrnCKE2B6AhcHXJXfPaW3K4P6JMDbWGoxO6yM/qPHqsfbsZK45Ooaqs1To2Oe6b7SaaAxAXPGipTCzQ7x8BRnMLkTMoLVDN0ABVlCgYpcWB9HysPALIXstSUWeGnF4WptkAfc34sQZm42DsQIDAQAB"; + +- public static String[] versions = { "BusyBox 1.20.2", "BusyBox 1.20.1", "Custom Version..."}; ++ public static String[] versions = { "BusyBox 1.21.0-ARM", "BusyBox 1.21.0-ARM", "Custom Version..."}; + + public static String[] locations = { "/system/bin", "/system/xbin", "Custom Path" }; + +- public static String[] appletsString = new String("[, [[, acpid, addgroup, adduser, adjtimex, ar, arp, arping, ash, awk, basename, beep, blkid, brctl, bunzip2, bzcat, bzip2, cal, cat, catv, chat, chattr, chgrp, chmod, chown, chpasswd, chpst, chroot, chrt, chvt, cksum, clear, cmp, comm, cp, cpio, crond, crontab, cryptpw, cut, date, dc, dd, deallocvt, delgroup, deluser, depmod, devmem, df, dhcprelay, diff, dirname, dmesg, dnsd, dnsdomainname, dos2unix, dpkg, du, dumpkmap, dumpleases, echo, ed, egrep, eject, env, envdir, envuidgid, expand, expr, fakeidentd, false, fbset, fbsplash, fdflush, fdformat, fdisk, fgrep, find, findfs, flash_lock, flash_unlock, fold, free, freeramdisk, fsck, fsck.minix, fsync, ftpd, ftpget, ftpput, fuser, getopt, getty, grep, gunzip, gzip, hd, hdparm, head, hexdump, hostid, hostname, httpd, hush, hwclock, id, ifconfig, ifdown, ifenslave, ifplugd, ifup, inetd, init, inotifyd, insmod, install, ionice, ip, ipaddr, ipcalc, ipcrm, ipcs, iplink, iproute, iprule, iptunnel, kbd_mode, kill, killall, killall5, klogd, last, length, less, linux32, linux64, linuxrc, ln, loadfont, loadkmap, logger, login, logname, logread, losetup, lpd, lpq, lpr, ls, lsattr, lsmod, lzmacat, lzop, lzopcat, makemime, man, md5sum, mdev, mesg, microcom, mkdir, mkdosfs, mkfifo, mkfs.minix, mkfs.vfat, mknod, mkpasswd, mkswap, mktemp, modprobe, more, mount, mountpoint, mt, mv, nameif, nc, netstat, nice, nmeter, nohup, nslookup, od, openvt, passwd, patch, pgrep, pidof, ping, ping6, pipe_progress, pivot_root, pkill, popmaildir, printenv, printf, ps, pscan, pwd, raidautorun, rdate, rdev, readlink, readprofile, realpath, reformime, renice, reset, resize, rm, rmdir, rmmod, route, rpm, rpm2cpio, rtcwake, run-parts, runlevel, runsv, runsvdir, rx, script, scriptreplay, sed, sendmail, seq, setarch, setconsole, setfont, setkeycodes, setlogcons, setsid, setuidgid, sha1sum, sha256sum, sha512sum, showkey, slattach, sleep, softlimit, sort, split, start-stop-daemon, stat, strings, stty, sulogin, sum, sv, svlogd, swapoff, swapon, switch_root, sync, sysctl, syslogd, tac, tail, tar, taskset, tcpsvd, tee, telnet, telnetd, test, tftp, tftpd, time, timeout, top, touch, tr, traceroute, true, tty, ttysize, udhcpc, udhcpd, udpsvd, umount, uname, uncompress, unexpand, uniq, unix2dos, unlzma, unlzop, unzip, uptime, usleep, uudecode, uuencode, vconfig, vi, vlock, volname, watch, watchdog, wc, wget, which, who, whoami, xargs, yes, zcat, zcip").replace(" ", "").split(","); ++ public static String[] appletsString = new String("[, [[, ar, ash, awk, base64, basename, bbconfig, beep, blkid, brctl, bunzip2, bzcat, bzip2, cal, cat, chat, chattr, chgrp, chmod, chown, chroot, chrt, cksum, clear, cmp, comm, cp, cpio, crond, crontab, cut, date, dd, depmod, devmem, df, diff, dirname, dmesg, dnsd, dnsdomainname, dos2unix, du, echo, ed, egrep, env, expand, expr, fakeidentd, false, fdflush, fdformat, fdisk, fgrep, find, findfs, fold, free, freeramdisk, fsck, fsync, ftpd, ftpget, ftpput, fuser, getopt, grep, groups, gunzip, gzip, hd, hdparm, head, hexdump, hostname, httpd, hwclock, id, ifconfig, inetd, inotifyd, insmod, install, ionice, iostat, ip, ipaddr, ipcalc, iplink, iproute, iprule, iptunnel, kill, killall, killall5, less, ln, losetup, ls, lsattr, lsmod, lspci, lsusb, lzcat, lzma, lzop, lzopcat, man, md5sum, mesg, microcom, mkdir, mkdosfs, mke2fs, mkfifo, mkfs.ext2, mkfs.vfat, mknod, mkswap, mktemp, modinfo, modprobe, more, mount, mountpoint, mv, nanddump, nandwrite, nc, netstat, nice, nmeter, nohup, nslookup, od, patch, pgrep, pidof, ping, pkill, pmap, powertop, printenv, printf, ps, pscan, pstree, pwd, pwdx, rdate, rdev, readlink, realpath, renice, reset, resize, rm, rmdir, rmmod, route, run-parts, script, scriptreplay, sed, seq, setconsole, setkeycodes, setlogcons, setserial, setsid, setuidgid, sh, sha1sum, sha256sum, sha512sum, showkey, slattach, sleep, smemcap, sort, split, stat, strings, stty, sum, swapoff, swapon, sync, sysctl, tac, tail, tar, tee, telnet, telnetd, test, tftp, tftpd, time, timeout, top, touch, tr, traceroute, true, tty, ttysize, tunctl, tune2fs, umount, uname, uncompress, unexpand, uniq, unix2dos, unlzma, unlzop, unxz, unzip, uptime, usleep, uudecode, uuencode, vconfig, vi, watch, wc, wget, which, whoami, whois, xargs, xz, xzcat, yes, zcat, zcip").replace(" ", "").split(","); + }