diff options
Diffstat (limited to 'patches/busybox-1.24.2')
5 files changed, 143 insertions, 0 deletions
diff --git a/patches/busybox-1.24.2/0200-reactivate-check-for-tty.patch b/patches/busybox-1.24.2/0200-reactivate-check-for-tty.patch new file mode 100644 index 000000000..55869e9fe --- /dev/null +++ b/patches/busybox-1.24.2/0200-reactivate-check-for-tty.patch @@ -0,0 +1,28 @@ +From: Marc Kleine-Budde <mkl@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 <mkl@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.24.2/0201-Fix-the-format-warning-when-building-applets-usage_p.patch b/patches/busybox-1.24.2/0201-Fix-the-format-warning-when-building-applets-usage_p.patch new file mode 100644 index 000000000..98ad36e1d --- /dev/null +++ b/patches/busybox-1.24.2/0201-Fix-the-format-warning-when-building-applets-usage_p.patch @@ -0,0 +1,30 @@ +From: Dinny Wu <dinny.wu@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.wu@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.24.2/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch b/patches/busybox-1.24.2/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch new file mode 100644 index 000000000..d3027e0c2 --- /dev/null +++ b/patches/busybox-1.24.2/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch @@ -0,0 +1,23 @@ +From: Marc Kleine-Budde <mkl@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 <mkl@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.24.2/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch b/patches/busybox-1.24.2/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch new file mode 100644 index 000000000..08f12b500 --- /dev/null +++ b/patches/busybox-1.24.2/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch @@ -0,0 +1,52 @@ +From: Marc Kleine-Budde <mkl@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 <mkl@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.24.2/series b/patches/busybox-1.24.2/series new file mode 100644 index 000000000..84c80aa6e --- /dev/null +++ b/patches/busybox-1.24.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 |