summaryrefslogtreecommitdiff
path: root/packages/busybox
diff options
context:
space:
mode:
Diffstat (limited to 'packages/busybox')
-rw-r--r--packages/busybox/busybox-1.13.2/slugos/defconfig2
-rw-r--r--packages/busybox/busybox_1.11.3.bb3
-rw-r--r--packages/busybox/busybox_1.13.2.bb3
-rw-r--r--packages/busybox/busybox_1.7.2.bb3
-rw-r--r--packages/busybox/busybox_1.9.2.bb3
-rw-r--r--packages/busybox/files/busybox-appletlib-dependency.patch11
6 files changed, 20 insertions, 5 deletions
diff --git a/packages/busybox/busybox-1.13.2/slugos/defconfig b/packages/busybox/busybox-1.13.2/slugos/defconfig
index fd89ef68b4..8926d1126a 100644
--- a/packages/busybox/busybox-1.13.2/slugos/defconfig
+++ b/packages/busybox/busybox-1.13.2/slugos/defconfig
@@ -196,7 +196,7 @@ CONFIG_FEATURE_MV_LONG_OPTIONS=y
CONFIG_NICE=y
CONFIG_NOHUP=y
CONFIG_OD=y
-CONFIG_PRINTENV=y
+# CONFIG_PRINTENV is not set
CONFIG_PRINTF=y
CONFIG_PWD=y
CONFIG_READLINK=y
diff --git a/packages/busybox/busybox_1.11.3.bb b/packages/busybox/busybox_1.11.3.bb
index 305a0b6c14..bd03aa8cf6 100644
--- a/packages/busybox/busybox_1.11.3.bb
+++ b/packages/busybox/busybox_1.11.3.bb
@@ -1,5 +1,5 @@
require busybox.inc
-PR = "r14"
+PR = "r15"
SRC_URI = "\
http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
@@ -7,6 +7,7 @@ SRC_URI = "\
file://udhcpscript.patch;patch=1 \
file://B921600.patch;patch=1 \
file://fdisk_lineedit_segfault.patch;patch=1 \
+ file://busybox-appletlib-dependency.patch;patch=1 \
file://busybox-cron \
file://busybox-httpd \
file://busybox-udhcpd \
diff --git a/packages/busybox/busybox_1.13.2.bb b/packages/busybox/busybox_1.13.2.bb
index e8f37a002b..cc2cb2b39e 100644
--- a/packages/busybox/busybox_1.13.2.bb
+++ b/packages/busybox/busybox_1.13.2.bb
@@ -1,5 +1,5 @@
require busybox.inc
-PR = "r15"
+PR = "r16"
SRC_URI = "\
http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
@@ -13,6 +13,7 @@ SRC_URI = "\
file://udhcpc-fix-nfsroot.patch;patch=1 \
file://B921600.patch;patch=1 \
file://get_header_tar.patch;patch=1 \
+ file://busybox-appletlib-dependency.patch;patch=1 \
file://find-touchscreen.sh \
file://busybox-cron \
file://busybox-httpd \
diff --git a/packages/busybox/busybox_1.7.2.bb b/packages/busybox/busybox_1.7.2.bb
index 9d6e01c3d0..87d336b7ac 100644
--- a/packages/busybox/busybox_1.7.2.bb
+++ b/packages/busybox/busybox_1.7.2.bb
@@ -1,5 +1,5 @@
require busybox.inc
-PR = "r12"
+PR = "r13"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://busybox-cron \
@@ -12,6 +12,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://syslog \
file://syslog.conf \
file://udhcpscript.patch;patch=1 \
+ file://busybox-appletlib-dependency.patch;patch=1 \
file://umount.busybox \
file://run_parts.c"
diff --git a/packages/busybox/busybox_1.9.2.bb b/packages/busybox/busybox_1.9.2.bb
index eb8d37286f..e9aa820498 100644
--- a/packages/busybox/busybox_1.9.2.bb
+++ b/packages/busybox/busybox_1.9.2.bb
@@ -1,11 +1,12 @@
require busybox.inc
-PR = "r5"
+PR = "r6"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://udhcpscript.patch;patch=1 \
file://adduser-longops.patch;patch=1 \
file://sort-z-nul.patch;patch=1;status=upstream \
file://topmem.patch;patch=1 \
+ file://busybox-appletlib-dependency.patch;patch=1 \
file://busybox-cron \
file://busybox-httpd \
file://busybox-udhcpd \
diff --git a/packages/busybox/files/busybox-appletlib-dependency.patch b/packages/busybox/files/busybox-appletlib-dependency.patch
new file mode 100644
index 0000000000..85a61e8cf5
--- /dev/null
+++ b/packages/busybox/files/busybox-appletlib-dependency.patch
@@ -0,0 +1,11 @@
+--- a/libbb/Kbuild 2008-11-09 20:28:09.000000000 +0300
++++ b/libbb/Kbuild 2009-02-17 17:41:48.718747865 +0300
+@@ -147,3 +147,8 @@ lib-$(CONFIG_PGREP) += xregcomp.o
+ lib-$(CONFIG_PKILL) += xregcomp.o
+ lib-$(CONFIG_DEVFSD) += xregcomp.o
+ lib-$(CONFIG_FEATURE_FIND_REGEX) += xregcomp.o
++
++libbb/appletlib.o: include/usage_compressed.h include/applet_tables.h
++
++include/usage_compressed.h include/applet_tables.h:
++ $(Q)$(MAKE) $(build)=applets $@