diff options
| author | Xin Ouyang <Xin.Ouyang@windriver.com> | 2012-04-27 16:04:13 +0800 |
|---|---|---|
| committer | Xin Ouyang <Xin.Ouyang@windriver.com> | 2012-04-27 16:04:13 +0800 |
| commit | a435febae2022a9e3c582882aa5ce4a65e4d9f0f (patch) | |
| tree | ee7c05f5da2f7d3e53b96fc963c5498e84a0c64c | |
| parent | 4fcefe71fdb2c96e3db2cadc08635a5cab63f1dd (diff) | |
| download | meta-selinux-a435febae2022a9e3c582882aa5ce4a65e4d9f0f.tar.gz | |
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.
| -rw-r--r-- | recipes-core/sysvinit/sysvinit_2.88dsf.bbappend | 2 |
1 files changed, 2 insertions, 0 deletions
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 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" |
| 2 | 2 | ||
| 3 | B = "${S}" | ||
| 4 | |||
| 3 | SRC_URI += "file://sysvinit-fix-is_selinux_enabled.patch" | 5 | SRC_URI += "file://sysvinit-fix-is_selinux_enabled.patch" |
| 4 | 6 | ||
| 5 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" | 7 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" |