Signed-off-by: Clemens Gruber <clemens.gru...@pqgruber.com>
---
.../0200-reactivate-check-for-tty.patch | 28 ------------
...mat-warning-when-building-applets-usage_p.patch | 30 -------------
...ystem-only-pass-real-libs-to-SELINUX_LIBS.patch | 23 ----------
...link-honour-SKIP_STRIP-and-don-t-strip-if.patch | 52 ----------------------
patches/busybox-1.23.1/series | 10 -----
.../0200-reactivate-check-for-tty.patch | 28 ++++++++++++
...mat-warning-when-building-applets-usage_p.patch | 30 +++++++++++++
...ystem-only-pass-real-libs-to-SELINUX_LIBS.patch | 23 ++++++++++
...link-honour-SKIP_STRIP-and-don-t-strip-if.patch | 52 ++++++++++++++++++++++
patches/busybox-1.23.2/series | 10 +++++
rules/busybox.make | 4 +-
11 files changed, 145 insertions(+), 145 deletions(-)
delete mode 100644 patches/busybox-1.23.1/0200-reactivate-check-for-tty.patch
delete mode 100644
patches/busybox-1.23.1/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
delete mode 100644
patches/busybox-1.23.1/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
delete mode 100644
patches/busybox-1.23.1/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
delete mode 100644 patches/busybox-1.23.1/series
create mode 100644 patches/busybox-1.23.2/0200-reactivate-check-for-tty.patch
create mode 100644
patches/busybox-1.23.2/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
create mode 100644
patches/busybox-1.23.2/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
create mode 100644
patches/busybox-1.23.2/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
create mode 100644 patches/busybox-1.23.2/series
diff --git a/patches/busybox-1.23.1/0200-reactivate-check-for-tty.patch
b/patches/busybox-1.23.1/0200-reactivate-check-for-tty.patch
deleted file mode 100644
index 55869e9..0000000
--- a/patches/busybox-1.23.1/0200-reactivate-check-for-tty.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Marc Kleine-Budde <m...@pengutronix.de>
-Date: Fri, 6 Nov 2009 09:19:58 +0100
-Subject: [PATCH] reactivate check for tty
-
-The busybox crew switched of the test for a tty in silentoldconfig,
-we use this feature to break when oldconfig needs interaction
-in automated build.
-
-This patch reactivates this feature.
-
-Signed-off-by: Marc Kleine-Budde <m...@pengutronix.de>
----
- scripts/kconfig/conf.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
-index ea2446a89814..8b70f99e7633 100644
---- a/scripts/kconfig/conf.c
-+++ b/scripts/kconfig/conf.c
-@@ -498,7 +498,7 @@ int main(int ac, char **av)
- break;
- case 's':
- input_mode = ask_silent;
-- valid_stdin = isatty(0); //bbox: && isatty(1) &&
isatty(2);
-+ valid_stdin = isatty(0) && isatty(1) && isatty(2);
- break;
- case 'd':
- input_mode = set_default;
diff --git
a/patches/busybox-1.23.1/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
b/patches/busybox-1.23.1/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
deleted file mode 100644
index 98ad36e..0000000
---
a/patches/busybox-1.23.1/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Dinny Wu <dinny...@gmail.com>
-Date: Thu, 26 Jul 2012 14:12:51 +0000
-Subject: [PATCH] Fix the format warning when building applets/usage_pod.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When compiling busybox with gcc 4.6.3, it shows below warning:
-
-applets/usage_pod.c: In function ‘main’:
-applets/usage_pod.c:74:3: warning: format not a string literal and no format
arguments [-Wformat-security]
-
-Signed-off-by: Dinny Wu <dinny...@gmail.com>
----
- applets/usage_pod.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/applets/usage_pod.c b/applets/usage_pod.c
-index 0b1c4aadb8c4..a67e8b4ac348 100644
---- a/applets/usage_pod.c
-+++ b/applets/usage_pod.c
-@@ -71,7 +71,7 @@ int main(void)
- } else {
- printf(", ");
- }
-- printf(usage_array[i].aname);
-+ printf("%s", usage_array[i].aname);
- col += len2;
- }
- printf("\n\n");
diff --git
a/patches/busybox-1.23.1/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
b/patches/busybox-1.23.1/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
deleted file mode 100644
index d3027e0..0000000
---
a/patches/busybox-1.23.1/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Marc Kleine-Budde <m...@pengutronix.de>
-Date: Mon, 28 Jan 2013 14:21:07 +0100
-Subject: [PATCH] build system: only pass real libs to SELINUX_LIBS
-
-The busybox make system will fail otherwise.
-
-Signed-off-by: Marc Kleine-Budde <m...@pengutronix.de>
----
- Makefile.flags | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile.flags b/Makefile.flags
-index 307afa7f5212..d68c9c4e97c6 100644
---- a/Makefile.flags
-+++ b/Makefile.flags
-@@ -141,6 +141,7 @@ ifeq ($(CONFIG_SELINUX),y)
- SELINUX_PC_MODULES = libselinux libsepol
- $(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES)))
- CPPFLAGS += $(SELINUX_CFLAGS)
-+SELINUX_LIBS := $(filter -l%,$(SELINUX_LIBS))
- LDLIBS += $(if
$(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$(SELINUX_PC_MODULES:lib%=%))
- endif
-
diff --git
a/patches/busybox-1.23.1/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
b/patches/busybox-1.23.1/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
deleted file mode 100644
index 08f12b5..0000000
---
a/patches/busybox-1.23.1/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Marc Kleine-Budde <m...@pengutronix.de>
-Date: Mon, 4 Feb 2013 14:39:00 +0100
-Subject: [PATCH] scripts/trylink: honour SKIP_STRIP and don't strip if
- requested to
-
-Signed-off-by: Marc Kleine-Budde <m...@pengutronix.de>
----
- scripts/trylink | 17 ++++++++++++++---
- 1 file changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/scripts/trylink b/scripts/trylink
-index 5da494fbba4c..66e66139b5bd 100755
---- a/scripts/trylink
-+++ b/scripts/trylink
-@@ -241,7 +241,12 @@ if test "$CONFIG_BUILD_LIBBUSYBOX" = y; then
- cat $EXE.out
- exit 1
- }
-- $STRIP -s --remove-section=.note --remove-section=.comment $EXE -o
"$sharedlib_dir/libbusybox.so.$BB_VER"
-+ if test "$SKIP_STRIP" = "y"; then
-+ cp $EXE "$sharedlib_dir/libbusybox.so.$BB_VER"
-+ else
-+ $STRIP -s --remove-section=.note --remove-section=.comment $EXE -o
"$sharedlib_dir/libbusybox.so.$BB_VER"
-+ fi
-+
- chmod a+x "$sharedlib_dir/libbusybox.so.$BB_VER"
- echo "libbusybox: $sharedlib_dir/libbusybox.so.$BB_VER"
- fi
-@@ -262,7 +267,11 @@ if test "$CONFIG_FEATURE_SHARED_BUSYBOX" = y; then
- cat $EXE.out
- exit 1
- }
-- $STRIP -s --remove-section=.note --remove-section=.comment $EXE -o
"$sharedlib_dir/busybox"
-+ if test "$SKIP_STRIP" = "y"; then
-+ cp $EXE "$sharedlib_dir/busybox"
-+ else
-+ $STRIP -s --remove-section=.note --remove-section=.comment $EXE -o
"$sharedlib_dir/busybox"
-+ fi
- echo "busybox linked against libbusybox: $sharedlib_dir/busybox"
- fi
-
-@@ -299,7 +308,9 @@ int main(int argc, char **argv)
- exit 1
- }
- rm -- "$sharedlib_dir/applet.c" $EXE.out
-- $STRIP -s --remove-section=.note --remove-section=.comment $EXE
-+ if test "$SKIP_STRIP" != "y"; then
-+ $STRIP -s --remove-section=.note --remove-section=.comment $EXE
-+ fi
- # Let user see that we do something - list the names of created
binaries:
- echo "$EXE"
-
diff --git a/patches/busybox-1.23.1/series b/patches/busybox-1.23.1/series
deleted file mode 100644
index 84c80aa..0000000
--- a/patches/busybox-1.23.1/series
+++ /dev/null
@@ -1,10 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-#tag:upstream-stable --start-number 1
-#tag:upstream-master --start-number 100
-#tag:ptx --start-number 200
-0200-reactivate-check-for-tty.patch
-0201-Fix-the-format-warning-when-building-applets-usage_p.patch
-0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
-0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
-# 0036b420b1a49106a872780e90251289 - git-ptx-patches magic
diff --git a/patches/busybox-1.23.2/0200-reactivate-check-for-tty.patch
b/patches/busybox-1.23.2/0200-reactivate-check-for-tty.patch
new file mode 100644
index 0000000..55869e9
--- /dev/null
+++ b/patches/busybox-1.23.2/0200-reactivate-check-for-tty.patch
@@ -0,0 +1,28 @@
+From: Marc Kleine-Budde <m...@pengutronix.de>
+Date: Fri, 6 Nov 2009 09:19:58 +0100
+Subject: [PATCH] reactivate check for tty
+
+The busybox crew switched of the test for a tty in silentoldconfig,
+we use this feature to break when oldconfig needs interaction
+in automated build.
+
+This patch reactivates this feature.
+
+Signed-off-by: Marc Kleine-Budde <m...@pengutronix.de>
+---
+ scripts/kconfig/conf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
+index ea2446a89814..8b70f99e7633 100644
+--- a/scripts/kconfig/conf.c
++++ b/scripts/kconfig/conf.c
+@@ -498,7 +498,7 @@ int main(int ac, char **av)
+ break;
+ case 's':
+ input_mode = ask_silent;
+- valid_stdin = isatty(0); //bbox: && isatty(1) &&
isatty(2);
++ valid_stdin = isatty(0) && isatty(1) && isatty(2);
+ break;
+ case 'd':
+ input_mode = set_default;
diff --git
a/patches/busybox-1.23.2/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
b/patches/busybox-1.23.2/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
new file mode 100644
index 0000000..98ad36e
--- /dev/null
+++
b/patches/busybox-1.23.2/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
@@ -0,0 +1,30 @@
+From: Dinny Wu <dinny...@gmail.com>
+Date: Thu, 26 Jul 2012 14:12:51 +0000
+Subject: [PATCH] Fix the format warning when building applets/usage_pod.c
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When compiling busybox with gcc 4.6.3, it shows below warning:
+
+applets/usage_pod.c: In function ‘main’:
+applets/usage_pod.c:74:3: warning: format not a string literal and no format
arguments [-Wformat-security]
+
+Signed-off-by: Dinny Wu <dinny...@gmail.com>
+---
+ applets/usage_pod.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/applets/usage_pod.c b/applets/usage_pod.c
+index 0b1c4aadb8c4..a67e8b4ac348 100644
+--- a/applets/usage_pod.c
++++ b/applets/usage_pod.c
+@@ -71,7 +71,7 @@ int main(void)
+ } else {
+ printf(", ");
+ }
+- printf(usage_array[i].aname);
++ printf("%s", usage_array[i].aname);
+ col += len2;
+ }
+ printf("\n\n");
diff --git
a/patches/busybox-1.23.2/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
b/patches/busybox-1.23.2/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
new file mode 100644
index 0000000..d3027e0
--- /dev/null
+++
b/patches/busybox-1.23.2/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
@@ -0,0 +1,23 @@
+From: Marc Kleine-Budde <m...@pengutronix.de>
+Date: Mon, 28 Jan 2013 14:21:07 +0100
+Subject: [PATCH] build system: only pass real libs to SELINUX_LIBS
+
+The busybox make system will fail otherwise.
+
+Signed-off-by: Marc Kleine-Budde <m...@pengutronix.de>
+---
+ Makefile.flags | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.flags b/Makefile.flags
+index 307afa7f5212..d68c9c4e97c6 100644
+--- a/Makefile.flags
++++ b/Makefile.flags
+@@ -141,6 +141,7 @@ ifeq ($(CONFIG_SELINUX),y)
+ SELINUX_PC_MODULES = libselinux libsepol
+ $(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES)))
+ CPPFLAGS += $(SELINUX_CFLAGS)
++SELINUX_LIBS := $(filter -l%,$(SELINUX_LIBS))
+ LDLIBS += $(if
$(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$(SELINUX_PC_MODULES:lib%=%))
+ endif
+
diff --git
a/patches/busybox-1.23.2/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
b/patches/busybox-1.23.2/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
new file mode 100644
index 0000000..08f12b5
--- /dev/null
+++
b/patches/busybox-1.23.2/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
@@ -0,0 +1,52 @@
+From: Marc Kleine-Budde <m...@pengutronix.de>
+Date: Mon, 4 Feb 2013 14:39:00 +0100
+Subject: [PATCH] scripts/trylink: honour SKIP_STRIP and don't strip if
+ requested to
+
+Signed-off-by: Marc Kleine-Budde <m...@pengutronix.de>
+---
+ scripts/trylink | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/trylink b/scripts/trylink
+index 5da494fbba4c..66e66139b5bd 100755
+--- a/scripts/trylink
++++ b/scripts/trylink
+@@ -241,7 +241,12 @@ if test "$CONFIG_BUILD_LIBBUSYBOX" = y; then
+ cat $EXE.out
+ exit 1
+ }
+- $STRIP -s --remove-section=.note --remove-section=.comment $EXE -o
"$sharedlib_dir/libbusybox.so.$BB_VER"
++ if test "$SKIP_STRIP" = "y"; then
++ cp $EXE "$sharedlib_dir/libbusybox.so.$BB_VER"
++ else
++ $STRIP -s --remove-section=.note --remove-section=.comment $EXE -o
"$sharedlib_dir/libbusybox.so.$BB_VER"
++ fi
++
+ chmod a+x "$sharedlib_dir/libbusybox.so.$BB_VER"
+ echo "libbusybox: $sharedlib_dir/libbusybox.so.$BB_VER"
+ fi
+@@ -262,7 +267,11 @@ if test "$CONFIG_FEATURE_SHARED_BUSYBOX" = y; then
+ cat $EXE.out
+ exit 1
+ }
+- $STRIP -s --remove-section=.note --remove-section=.comment $EXE -o
"$sharedlib_dir/busybox"
++ if test "$SKIP_STRIP" = "y"; then
++ cp $EXE "$sharedlib_dir/busybox"
++ else
++ $STRIP -s --remove-section=.note --remove-section=.comment $EXE -o
"$sharedlib_dir/busybox"
++ fi
+ echo "busybox linked against libbusybox: $sharedlib_dir/busybox"
+ fi
+
+@@ -299,7 +308,9 @@ int main(int argc, char **argv)
+ exit 1
+ }
+ rm -- "$sharedlib_dir/applet.c" $EXE.out
+- $STRIP -s --remove-section=.note --remove-section=.comment $EXE
++ if test "$SKIP_STRIP" != "y"; then
++ $STRIP -s --remove-section=.note --remove-section=.comment $EXE
++ fi
+ # Let user see that we do something - list the names of created
binaries:
+ echo "$EXE"
+
diff --git a/patches/busybox-1.23.2/series b/patches/busybox-1.23.2/series
new file mode 100644
index 0000000..84c80aa
--- /dev/null
+++ b/patches/busybox-1.23.2/series
@@ -0,0 +1,10 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+#tag:upstream-stable --start-number 1
+#tag:upstream-master --start-number 100
+#tag:ptx --start-number 200
+0200-reactivate-check-for-tty.patch
+0201-Fix-the-format-warning-when-building-applets-usage_p.patch
+0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
+0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
+# 0036b420b1a49106a872780e90251289 - git-ptx-patches magic
diff --git a/rules/busybox.make b/rules/busybox.make
index 3073ac5..60191c2 100644
--- a/rules/busybox.make
+++ b/rules/busybox.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_BUSYBOX) += busybox
#
# Paths and names
#
-BUSYBOX_VERSION := 1.23.1
-BUSYBOX_MD5 := 5c94d6301a964cd91619bd4d74605245
+BUSYBOX_VERSION := 1.23.2
+BUSYBOX_MD5 := 7925683d7dd105aabe9b6b618d48cc73
BUSYBOX := busybox-$(BUSYBOX_VERSION)
BUSYBOX_SUFFIX := tar.bz2
BUSYBOX_URL := http://www.busybox.net/downloads/$(BUSYBOX).$(BUSYBOX_SUFFIX)
--
2.4.3
--
ptxdist mailing list
ptxdist@pengutronix.de
