summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin Ouyang <Xin.Ouyang@windriver.com>2012-02-17 17:26:05 +0800
committerXin Ouyang <Xin.Ouyang@windriver.com>2012-02-17 17:26:05 +0800
commit36400ed07ce4ef0a04c9d870cdd02452eb37ac67 (patch)
tree1a54afe259f03f8c08a96d785aeae6bd6ba70f02
parent190aab31464252838b93065a3dc2e058e0d00200 (diff)
downloadmeta-selinux-36400ed07ce4ef0a04c9d870cdd02452eb37ac67.tar.gz
Fix build issue for null MAKEFLAGS passed to oe_runmake.
EXTRA_OEMAKE is typically: -e MAKEFLAGS= Because of "MAKEFLAGS= ", ENV variables will not pass to subdirs. This may cause some selinux packages build failed while cross-building, so we redefine EXTRA_OEMAKE here.
-rw-r--r--recipes-security/selinux/checkpolicy_2.1.8.bb9
-rw-r--r--recipes-security/selinux/selinux_git.inc6
2 files changed, 6 insertions, 9 deletions
diff --git a/recipes-security/selinux/checkpolicy_2.1.8.bb b/recipes-security/selinux/checkpolicy_2.1.8.bb
index 2ab24f6..8c5b788 100644
--- a/recipes-security/selinux/checkpolicy_2.1.8.bb
+++ b/recipes-security/selinux/checkpolicy_2.1.8.bb
@@ -16,15 +16,6 @@ EXTRA_OEMAKE += "LEX='flex'"
16 16
17BBCLASSEXTEND = "native" 17BBCLASSEXTEND = "native"
18 18
19do_compile() {
20 oe_runmake checkpolicy checkmodule \
21 INCLUDEDIR='${STAGING_INCDIR}' \
22 LIBDIR='${STAGING_LIBDIR}'
23 oe_runmake -C test \
24 INCLUDEDIR='${STAGING_INCDIR}' \
25 LIBDIR='${STAGING_LIBDIR}'
26}
27
28do_install_append() { 19do_install_append() {
29 install test/dismod ${D}/${bindir}/sedismod 20 install test/dismod ${D}/${bindir}/sedismod
30 install test/dispol ${D}/${bindir}/sedispol 21 install test/dispol ${D}/${bindir}/sedispol
diff --git a/recipes-security/selinux/selinux_git.inc b/recipes-security/selinux/selinux_git.inc
index 233b5ba..516ddb7 100644
--- a/recipes-security/selinux/selinux_git.inc
+++ b/recipes-security/selinux/selinux_git.inc
@@ -4,6 +4,12 @@ SRC_URI = "git://oss.tresys.com/git/selinux.git;protocol=http"
4SRC_URI[md5sum] = "4ec64a0d24aaa77c80b86e74d271e464" 4SRC_URI[md5sum] = "4ec64a0d24aaa77c80b86e74d271e464"
5SRC_URI[sha256sum] = "9c8a8643c9a4dd0eb76fcda1420d636b750b84b27656c6f8bc6886a829d7e520" 5SRC_URI[sha256sum] = "9c8a8643c9a4dd0eb76fcda1420d636b750b84b27656c6f8bc6886a829d7e520"
6 6
7
8# EXTRA_OEMAKE is typically: -e MAKEFLAGS=
9# "MAKEFLAGS= " causes problems as ENV variables will not pass to subdirs, so
10# we redefine EXTRA_OEMAKE here
11EXTRA_OEMAKE = "-e"
12
7do_compile() { 13do_compile() {
8 oe_runmake all \ 14 oe_runmake all \
9 INCLUDEDIR='${STAGING_INCDIR}' \ 15 INCLUDEDIR='${STAGING_INCDIR}' \