busybox: add latest upstream patch & reorder patches

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

7 files changed, 76 insertions, 6 deletions

diff --git a/patches/busybox-1.20.2/0005-include-sys-resource.h-where-needed.patch b/patches/busybox-1.20.2/0001-include-sys-resource.h-where-needed.patch
index 1f9431fd2..1f9431fd2 100644
--- a/patches/busybox-1.20.2/0005-include-sys-resource.h-where-needed.patch
+++ b/patches/busybox-1.20.2/0001-include-sys-resource.h-where-needed.patch
diff --git a/patches/busybox-1.20.2/0002-build-system-use-pkg-config-to-look-up-selinux-libs.patch b/patches/busybox-1.20.2/0002-build-system-use-pkg-config-to-look-up-selinux-libs.patch
new file mode 100644
index 000000000..6dd977d2c
--- /dev/null
+++ b/patches/busybox-1.20.2/0002-build-system-use-pkg-config-to-look-up-selinux-libs.patch
@@ -0,0 +1,63 @@
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 20 Oct 2012 15:01:26 -0400
+Subject: [PATCH] build system: use pkg-config to look up selinux libs
+
+Newer versions of libselinux has started linking against more libs.
+Rather than continuing hardcoding things, switch to using pkg-config
+to query for its dependencies.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile       |    1 +
+ Makefile.flags |   12 +++++++++++-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index fccde4a..3a0a5e1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -297,6 +297,7 @@ NM		= $(CROSS_COMPILE)nm
+ STRIP		= $(CROSS_COMPILE)strip
+ OBJCOPY		= $(CROSS_COMPILE)objcopy
+ OBJDUMP		= $(CROSS_COMPILE)objdump
++PKG_CONFIG	?= $(CROSS_COMPILE)pkg-config
+ AWK		= awk
+ GENKSYMS	= scripts/genksyms/genksyms
+ DEPMOD		= /sbin/depmod
+diff --git a/Makefile.flags b/Makefile.flags
+index c43c8dc..15dcc1f 100644
+--- a/Makefile.flags
++++ b/Makefile.flags
+@@ -74,6 +74,12 @@ ARCH_FPIC ?= -fpic
+ ARCH_FPIE ?= -fpie
+ ARCH_PIE ?= -pie
+ 
++# Usage: $(eval $(call pkg_check_modules,VARIABLE-PREFIX,MODULES))
++define pkg_check_modules
++$(1)_CFLAGS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --cflags $(2))
++$(1)_LIBS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs $(2))
++endef
++
+ ifeq ($(CONFIG_BUILD_LIBBUSYBOX),y)
+ # on i386: 14% smaller libbusybox.so
+ # (code itself is 9% bigger, we save on relocs/PLT/GOT)
+@@ -85,6 +91,7 @@ endif
+ 
+ ifeq ($(CONFIG_STATIC),y)
+ CFLAGS_busybox += -static
++PKG_CONFIG_FLAGS += --static
+ endif
+ 
+ ifeq ($(CONFIG_PIE),y)
+@@ -127,7 +134,10 @@ LDLIBS += pam pam_misc pthread
+ endif
+ 
+ ifeq ($(CONFIG_SELINUX),y)
+-LDLIBS += selinux sepol
++SELINUX_PC_MODULES = libselinux libsepol
++$(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES)))
++CPPFLAGS += $(SELINUX_CFLAGS)
++LDLIBS += $(if $(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$(SELINUX_PC_MODULES:lib%=%))
+ endif
+ 
+ ifeq ($(CONFIG_EFENCE),y)
diff --git a/patches/busybox-1.20.2/0002-Fix-compilation-on-Darwin.patch b/patches/busybox-1.20.2/0100-Fix-compilation-on-Darwin.patch
index a6a6d7808..a6a6d7808 100644
--- a/patches/busybox-1.20.2/0002-Fix-compilation-on-Darwin.patch
+++ b/patches/busybox-1.20.2/0100-Fix-compilation-on-Darwin.patch
diff --git a/patches/busybox-1.20.2/0004-get_linux_version_code-don-t-fail-on-Linux-version-s.patch b/patches/busybox-1.20.2/0101-get_linux_version_code-don-t-fail-on-Linux-version-s.patch
index dca55058c..dca55058c 100644
--- a/patches/busybox-1.20.2/0004-get_linux_version_code-don-t-fail-on-Linux-version-s.patch
+++ b/patches/busybox-1.20.2/0101-get_linux_version_code-don-t-fail-on-Linux-version-s.patch
diff --git a/patches/busybox-1.20.2/0001-reactivate-check-for-tty.patch b/patches/busybox-1.20.2/0200-reactivate-check-for-tty.patch
index a44f6b6f9..a44f6b6f9 100644
--- a/patches/busybox-1.20.2/0001-reactivate-check-for-tty.patch
+++ b/patches/busybox-1.20.2/0200-reactivate-check-for-tty.patch
diff --git a/patches/busybox-1.20.2/0003-Fix-the-format-warning-when-building-applets-usage_p.patch b/patches/busybox-1.20.2/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
index 8c0b36a66..1622f1014 100644
--- a/patches/busybox-1.20.2/0003-Fix-the-format-warning-when-building-applets-usage_p.patch
+++ b/patches/busybox-1.20.2/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
@@ -1,6 +1,9 @@
 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:
 
diff --git a/patches/busybox-1.20.2/series b/patches/busybox-1.20.2/series
index eb7cfb111..00e1687ee 100644
--- a/patches/busybox-1.20.2/series
+++ b/patches/busybox-1.20.2/series
@@ -1,8 +1,12 @@
 # generated by git-ptx-patches
 #tag:base --start-number 1
-0001-reactivate-check-for-tty.patch
-0002-Fix-compilation-on-Darwin.patch
-0003-Fix-the-format-warning-when-building-applets-usage_p.patch
-0004-get_linux_version_code-don-t-fail-on-Linux-version-s.patch
-0005-include-sys-resource.h-where-needed.patch
-# 08fb26216d522c9b1a701c2776df0e38  - git-ptx-patches magic
+#tag:upstream-stable --start-number 1
+0001-include-sys-resource.h-where-needed.patch
+0002-build-system-use-pkg-config-to-look-up-selinux-libs.patch
+#tag:upstream-master --start-number 100
+0100-Fix-compilation-on-Darwin.patch
+0101-get_linux_version_code-don-t-fail-on-Linux-version-s.patch
+#tag:ptx --start-number 200
+0200-reactivate-check-for-tty.patch
+0201-Fix-the-format-warning-when-building-applets-usage_p.patch
+# 4d2e7fce40a805b04514304f1b2eb017  - git-ptx-patches magic