diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-01-28 21:34:22 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-02-05 18:54:17 +0100 |
| commit | 683cf9b34b9059e733c1029b659c616df8302cf7 (patch) | |
| tree | 0c9170b696386aaefa41337dee47da0f78cab9e8 /patches | |
| parent | 9413659c0fe77dfb58ec46bb946023e2bc266016 (diff) | |
| download | ptxdist-683cf9b34b9059e733c1029b659c616df8302cf7.tar.gz ptxdist-683cf9b34b9059e733c1029b659c616df8302cf7.tar.xz | |
busybox: fix linking problem with activated SELinux
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/busybox-1.20.2/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch | 23 | ||||
| -rw-r--r-- | patches/busybox-1.20.2/series | 3 |
2 files changed, 25 insertions, 1 deletions
diff --git a/patches/busybox-1.20.2/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch b/patches/busybox-1.20.2/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch new file mode 100644 index 000000000..681aec55d --- /dev/null +++ b/patches/busybox-1.20.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 15dcc1f..7b04b89 100644 +--- a/Makefile.flags ++++ b/Makefile.flags +@@ -137,6 +137,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.20.2/series b/patches/busybox-1.20.2/series index 00e1687ee..5fd514a81 100644 --- a/patches/busybox-1.20.2/series +++ b/patches/busybox-1.20.2/series @@ -9,4 +9,5 @@ #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 +0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch +# 02e24253ac98ca59e1fffacb31293da0 - git-ptx-patches magic |