From a435febae2022a9e3c582882aa5ce4a65e4d9f0f Mon Sep 17 00:00:00 2001 From: Xin Ouyang Date: Fri, 27 Apr 2012 16:04:13 +0800 Subject: sysvinit: Fix environment variables override bug. As we have specified "-e MAKEFLAGS= " to make, environment variables will override variables in the top makefile but not subdir makefiles. Current bb uses sysvinit-xxx/src as ${B}, the environment variable CPPFLAGS would override all "CPPFLAGS" lines in sysvinit-xxx/src/Makefile. Such as "CPPFLAGS+= -DACCTON_OFF", "CPPFLAGS += $(SELINUX_DEF)" and "CPPFLAGS += -DINIT_MAIN". This causes some sections(#ifdef INIT_MAIN/WITH_SELINUX ... #endif) will never be used. --- recipes-core/sysvinit/sysvinit_2.88dsf.bbappend | 2 ++ 1 file changed, 2 insertions(+) (limited to 'recipes-core/sysvinit') diff --git a/recipes-core/sysvinit/sysvinit_2.88dsf.bbappend b/recipes-core/sysvinit/sysvinit_2.88dsf.bbappend index 7085f17..95c2f76 100644 --- a/recipes-core/sysvinit/sysvinit_2.88dsf.bbappend +++ b/recipes-core/sysvinit/sysvinit_2.88dsf.bbappend @@ -1,5 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" +B = "${S}" + SRC_URI += "file://sysvinit-fix-is_selinux_enabled.patch" DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" -- cgit v1.2.3-54-g00ecf