Skip to contentSkip to conversation

selinux: uprev to 20161014

PATCH New [email protected] 1 participant 10 messages Jan 5, 2017

lore
Share & tools
lore

[email protected]

author
#0 lore raw

cover selinux: uprev to 20161014

From: Wenzong Fan <[email protected]>

Uprev selinux packages to 2.6 (20161014) and fix build issues.

The following changes since commit 02602ac9c1f3e61f11d90053c578575254fa6323:

iproute2: make packageconfig selinux work (2016-11-01 09:20:37 -0400)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib wenzong/selinux-2.6
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/selinux-2.6

Wenzong Fan (9):
selinux: uprev include file to 20161014
libsepol: uprev to 2.6 (20161014)
libselinux: uprev to 2.6 (20161014)
libsemanage: uprev to 2.6 (20161014)
checkpolicy: uprev to 2.6 (20161014)
policycoreutils: uprev to 2.6 (20161014)
sepolgen: uprev to 2.6 (20161014)
secilc: uprev to 2.6 (20161014)
selinux_common: remove EXTRA_OEMAKE = "-e"

 recipes-security/selinux/checkpolicy_2.5.bb        |  7 --
 recipes-security/selinux/checkpolicy_2.6.bb        |  7 ++
 recipes-security/selinux/libselinux.inc            | 11 +---
 .../libselinux-make-O_CLOEXEC-optional.patch       | 77 +++++++++++-----------
 .../libselinux-only-mount-proc-if-necessary.patch  | 54 ---------------
 ...bselinux-procattr-return-einval-for-0-pid.patch | 47 -------------
 ...inux-procattr-return-error-on-invalid-pid.patch | 40 -----------
 .../{libselinux_2.5.bb => libselinux_2.6.bb}       |  9 +--
 .../{libsemanage_2.5.bb => libsemanage_2.6.bb}     |  6 +-
 .../selinux/{libsepol_2.5.bb => libsepol_2.6.bb}   |  6 +-
 ...-process-ValueError-for-sepolicy-seobject.patch | 34 +++++-----
 ...licycoreutils_2.5.bb => policycoreutils_2.6.bb} |  7 +-
 recipes-security/selinux/secilc_2.5.bb             |  7 --
 recipes-security/selinux/secilc_2.6.bb             |  7 ++
 .../{selinux_20160223.inc => selinux_20161014.inc} |  2 +-
 recipes-security/selinux/selinux_common.inc        |  5 --
 recipes-security/selinux/sepolgen_1.2.3.bb         |  7 --
 recipes-security/selinux/sepolgen_2.6.bb           |  7 ++
 18 files changed, 93 insertions(+), 247 deletions(-)
 delete mode 100644 recipes-security/selinux/checkpolicy_2.5.bb
 create mode 100644 recipes-security/selinux/checkpolicy_2.6.bb
 delete mode 100644 recipes-security/selinux/libselinux/libselinux-only-mount-proc-if-necessary.patch
 delete mode 100644 recipes-security/selinux/libselinux/libselinux-procattr-return-einval-for-0-pid.patch
 delete mode 100644 recipes-security/selinux/libselinux/libselinux-procattr-return-error-on-invalid-pid.patch
 rename recipes-security/selinux/{libselinux_2.5.bb => libselinux_2.6.bb} (54%)
 rename recipes-security/selinux/{libsemanage_2.5.bb => libsemanage_2.6.bb} (78%)
 rename recipes-security/selinux/{libsepol_2.5.bb => libsepol_2.6.bb} (49%)
 rename recipes-security/selinux/{policycoreutils_2.5.bb => policycoreutils_2.6.bb} (68%)
 delete mode 100644 recipes-security/selinux/secilc_2.5.bb
 create mode 100644 recipes-security/selinux/secilc_2.6.bb
 rename recipes-security/selinux/{selinux_20160223.inc => selinux_20161014.inc} (84%)
 delete mode 100644 recipes-security/selinux/sepolgen_1.2.3.bb
 create mode 100644 recipes-security/selinux/sepolgen_2.6.bb
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 1/9 selinux: uprev include file to 20161014

From: Wenzong Fan <[email protected]>

Signed-off-by Wenzong Fan <[email protected]>
---
 recipes-security/selinux/{selinux_20160223.inc => selinux_20161014.inc} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename recipes-security/selinux/{selinux_20160223.inc => selinux_20161014.inc} (84%)
recipes-security/selinux/selinux_20161014.inc renamed from recipes-security/selinux/selinux_20160223.inc +1 -1
similarity index 84%
rename from recipes-security/selinux/selinux_20160223.inc
rename to recipes-security/selinux/selinux_20161014.inc
index 4c1ef6b..c97e35b 100644
@@ -1,4 +1,4 @@
-SELINUX_RELEASE = "20160223"
+SELINUX_RELEASE = "20161014"
 
 SRC_URI = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${SELINUX_RELEASE}/${BPN}-${PV}.tar.gz"
Signature · 1 line
2.7.4
author
#2 lore raw

PATCH 2/9 libsepol: uprev to 2.6 (20161014)

In reply to [email protected]

From: Wenzong Fan <[email protected]>

Signed-off-by Wenzong Fan <[email protected]>
---
 recipes-security/selinux/{libsepol_2.5.bb => libsepol_2.6.bb} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename recipes-security/selinux/{libsepol_2.5.bb => libsepol_2.6.bb} (49%)
recipes-security/selinux/libsepol_2.6.bb renamed from recipes-security/selinux/libsepol_2.5.bb +3 -3
similarity index 49%
rename from recipes-security/selinux/libsepol_2.5.bb
rename to recipes-security/selinux/libsepol_2.6.bb
index f96b59a..e593fe9 100644
@@ -1,9 +1,9 @@
-include selinux_20160223.inc
+include selinux_20161014.inc
 include ${BPN}.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
 
-SRC_URI[md5sum] = "5b18e0e1e50bdf648c2c42241c42052c"
-SRC_URI[sha256sum] = "2bdeec56d0a08b082b93b40703b4b3329cc5562152f7254d8f6ef6b56afe850a"
+SRC_URI[md5sum] = "dc1dfd31aea4c6e4b521f3aa2bddf7de"
+SRC_URI[sha256sum] = "d856d6506054f52abeaa3543ea2f2344595a3dc05d0d873ed7f724f7a16b1874"
 
 SRC_URI += "file://0001-src-Makefile-fix-includedir-in-libsepol.pc.patch"
Signature · 1 line
2.7.4
author
#3 lore raw

PATCH 3/9 libselinux: uprev to 2.6 (20161014)

In reply to [email protected]

From: Wenzong Fan <[email protected]>

* rebase patch:
- libselinux-make-O_CLOEXEC-optional.patch

* cleanup patches:
- libselinux-only-mount-proc-if-necessary.patch
- libselinux-procattr-return-einval-for-0-pid.patch
- libselinux-procattr-return-error-on-invalid-pid.patch

* other fixes:
- remove useless variables according to latest Makefile
- update FILES_${PN}-python to match the installed file:

    '${libdir}/python2.7/site-packages/_selinux.so'.
Signed-off-by Wenzong Fan <[email protected]>
---
 recipes-security/selinux/libselinux.inc            | 11 +---
 .../libselinux-make-O_CLOEXEC-optional.patch       | 77 +++++++++++-----------
 .../libselinux-only-mount-proc-if-necessary.patch  | 54 ---------------
 ...bselinux-procattr-return-einval-for-0-pid.patch | 47 -------------
 ...inux-procattr-return-error-on-invalid-pid.patch | 40 -----------
 .../{libselinux_2.5.bb => libselinux_2.6.bb}       |  9 +--
 6 files changed, 44 insertions(+), 194 deletions(-)
 delete mode 100644 recipes-security/selinux/libselinux/libselinux-only-mount-proc-if-necessary.patch
 delete mode 100644 recipes-security/selinux/libselinux/libselinux-procattr-return-einval-for-0-pid.patch
 delete mode 100644 recipes-security/selinux/libselinux/libselinux-procattr-return-error-on-invalid-pid.patch
 rename recipes-security/selinux/{libselinux_2.5.bb => libselinux_2.6.bb} (54%)
recipes-security/selinux/libselinux.inc +3 -8
index d571a7c..ad00d10 100644
@@ -10,7 +10,7 @@ inherit lib_package pythonnative
 DEPENDS += "libsepol python libpcre swig-native"
 
 PACKAGES += "${PN}-python"
-FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/selinux/*"
+FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*"
 FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/selinux/.debug/*"
 
 def get_policyconfigarch(d):

@@ -27,17 +27,12 @@ do_compile_append() {
     oe_runmake pywrap -j1 \
             INCLUDEDIR='${STAGING_INCDIR}' \
             LIBDIR='${STAGING_LIBDIR}' \
-            PYLIBVER='python${PYTHON_BASEVERSION}' \
-            PYINC='-I${STAGING_INCDIR}/$(PYLIBVER)' \
-            PYLIB='-L${STAGING_LIBDIR}/$(PYLIBVER) -l$(PYLIBVER)' \
-            PYTHONLIBDIR='${PYLIB}'
+            PYINC='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}'
 }
 
 do_install_append() {
     oe_runmake install-pywrap swigify \
-            DESTDIR=${D} \
-            PYLIBVER='python${PYTHON_BASEVERSION}' \
-            PYLIBDIR='${D}/${libdir}/$(PYLIBVER)'
+            PYSITEDIR=${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages
     rm -rf ${D}${base_sbindir}
 }
recipes-security/selinux/libselinux/libselinux-make-O_CLOEXEC-optional.patch +38 -39

100 lines not on this page · raw message

recipes-security/selinux/libselinux/libselinux-only-mount-proc-if-necessary.patch deleted +0 -54

54 lines not on this page · raw message

recipes-security/selinux/libselinux/libselinux-procattr-return-einval-for-0-pid.patch deleted +0 -47

47 lines not on this page · raw message

recipes-security/selinux/libselinux/libselinux-procattr-return-error-on-invalid-pid.patch deleted +0 -40
deleted file mode 100644
index 0717d67..0000000
@@ -1,40 +0,0 @@
-From f77021d720f12767576c25d751c75cacd7478614 Mon Sep 17 00:00:00 2001
-From: dcashman <[email protected]>
-Date: Tue, 23 Feb 2016 12:23:59 -0800
-Subject: libselinux: procattr: return error on invalid pid_t
- input.
-
-Signed-off-by: Daniel Cashman <[email protected]>
----
- src/procattr.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/procattr.c b/src/procattr.c
-index 527a0a5..c20f003 100644
---- a/src/procattr.c
-+++ b/src/procattr.c
-@@ -70,9 +70,9 @@ static int openattr(pid_t pid, const char *attr, int flags)
- 	char *path;
- 	pid_t tid;
- 
--	if (pid > 0)
-+	if (pid > 0) {
- 		rc = asprintf(&path, "/proc/%d/attr/%s", pid, attr);
--	else {
-+	} else if (pid == 0) {
- 		rc = asprintf(&path, "/proc/thread-self/attr/%s", attr);
- 		if (rc < 0)
- 			return -1;
-@@ -82,6 +82,9 @@ static int openattr(pid_t pid, const char *attr, int flags)
- 		free(path);
- 		tid = gettid();
- 		rc = asprintf(&path, "/proc/self/task/%d/attr/%s", tid, attr);
-+	} else {
-+		errno = EINVAL;
-+		return -1;
- 	}
- 	if (rc < 0)
- 		return -1;
--- 
-2.4.3
-
recipes-security/selinux/libselinux_2.6.bb renamed from recipes-security/selinux/libselinux_2.5.bb +3 -6
similarity index 54%
rename from recipes-security/selinux/libselinux_2.5.bb
rename to recipes-security/selinux/libselinux_2.6.bb
index 0284494..b9ad231 100644
@@ -1,18 +1,15 @@
-include selinux_20160223.inc
+include selinux_20161014.inc
 include ${BPN}.inc
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0"
 
-SRC_URI[md5sum] = "d1399f5c2fd2fbe0e9603d5143b30367"
-SRC_URI[sha256sum] = "94c9e97706280bedcc288f784f67f2b9d3d6136c192b2c9f812115edba58514f"
+SRC_URI[md5sum] = "0e066ba6d6e590ba4b53eed64905d901"
+SRC_URI[sha256sum] = "4ea2dde50665c202253ba5caac7738370ea0337c47b251ba981c60d24e1a118a"
 
 SRC_URI += "\
         file://libselinux-drop-Wno-unused-but-set-variable.patch \
         file://libselinux-make-O_CLOEXEC-optional.patch \
         file://libselinux-make-SOCK_CLOEXEC-optional.patch \
         file://libselinux-define-FD_CLOEXEC-as-necessary.patch \
-        file://libselinux-procattr-return-einval-for-0-pid.patch \
-        file://libselinux-procattr-return-error-on-invalid-pid.patch \
-        file://libselinux-only-mount-proc-if-necessary.patch \
         file://0001-src-Makefile-fix-includedir-in-libselinux.pc.patch \
         "
Signature · 1 line
2.7.4
author
#4 lore raw

PATCH 4/9 libsemanage: uprev to 2.6 (20161014)

In reply to [email protected]

From: Wenzong Fan <[email protected]>

Signed-off-by Wenzong Fan <[email protected]>
---
 recipes-security/selinux/{libsemanage_2.5.bb => libsemanage_2.6.bb} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename recipes-security/selinux/{libsemanage_2.5.bb => libsemanage_2.6.bb} (78%)
recipes-security/selinux/libsemanage_2.6.bb renamed from recipes-security/selinux/libsemanage_2.5.bb +3 -3
similarity index 78%
rename from recipes-security/selinux/libsemanage_2.5.bb
rename to recipes-security/selinux/libsemanage_2.6.bb
index 27cbe7d..6361181 100644
@@ -1,10 +1,10 @@
-include selinux_20160223.inc
+include selinux_20161014.inc
 include ${BPN}.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
 
-SRC_URI[md5sum] = "eb030c863de1a6b3e2614a5c043c1641"
-SRC_URI[sha256sum] = "46e2f36254369b6e91d1eea0460c262b139361b055a3a67d3ceea2d8ef72e006"
+SRC_URI[md5sum] = "666a48c4058c07f2b07ede9eaf210c5f"
+SRC_URI[sha256sum] = "4f81541047290b751f2ffb926fcd381c186f22db18d9fe671b0b4a6a54e8cfce"
 
 SRC_URI += "\
 	file://libsemanage-Fix-execve-segfaults-on-Ubuntu.patch \
Signature · 1 line
2.7.4
author
#5 lore raw

PATCH 5/9 checkpolicy: uprev to 2.6 (20161014)

In reply to [email protected]

From: Wenzong Fan <[email protected]>

Signed-off-by Wenzong Fan <[email protected]>
---
 recipes-security/selinux/checkpolicy_2.5.bb | 7 -------
 recipes-security/selinux/checkpolicy_2.6.bb | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 recipes-security/selinux/checkpolicy_2.5.bb
 create mode 100644 recipes-security/selinux/checkpolicy_2.6.bb
recipes-security/selinux/checkpolicy_2.5.bb deleted +0 -7
deleted file mode 100644
index c603d52..0000000
@@ -1,7 +0,0 @@
-include selinux_20160223.inc
-include ${BPN}.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
-
-SRC_URI[md5sum] = "a8099a2a36de32327abf681159027c58"
-SRC_URI[sha256sum] = "33af9f3eb19135a7e6536ecd3fbb9686323000016cd51eb88346346ed7546001"
\ No newline at end of file
recipes-security/selinux/checkpolicy_2.6.bb new file +7 -0
new file mode 100644
index 0000000..f67c150
@@ -0,0 +1,7 @@
+include selinux_20161014.inc
+include ${BPN}.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
+
+SRC_URI[md5sum] = "2b581f8fe8eb8f55f111088e15d76c3a"
+SRC_URI[sha256sum] = "0bebd18688ca8027b1b3b4ff1532c0626f1fe49883ae6cb74d9d385940e74157"
Signature · 1 line
2.7.4
author
#6 lore raw

PATCH 6/9 policycoreutils: uprev to 2.6 (20161014)

In reply to [email protected]

From: Wenzong Fan <[email protected]>

* rebase patch:
- policycoreutils-process-ValueError-for-sepolicy-seobject.patch

Signed-off-by Wenzong Fan <[email protected]>
---
 ...-process-ValueError-for-sepolicy-seobject.patch | 34 ++++++++++++----------
 ...licycoreutils_2.5.bb => policycoreutils_2.6.bb} |  7 ++---
 2 files changed, 21 insertions(+), 20 deletions(-)
 rename recipes-security/selinux/{policycoreutils_2.5.bb => policycoreutils_2.6.bb} (68%)
recipes-security/selinux/policycoreutils/policycoreutils-process-ValueError-for-sepolicy-seobject.patch +18 -16
index e52e1d3..1929aa5 100644
@@ -11,32 +11,31 @@ Uptream-Status: pending
 
 Signed-off-by: Wenzong Fan <[email protected]>
 ---
- semanage/semanage |    9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
+ semanage/semanage | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
 
-Index: policycoreutils-2.5/semanage/semanage
-===================================================================
---- policycoreutils-2.5.orig/semanage/semanage	2016-02-25 13:38:39.947975015 -0500
-+++ policycoreutils-2.5/semanage/semanage	2016-02-25 13:40:50.627974607 -0500
-@@ -24,9 +24,15 @@
- #
+diff --git a/semanage/semanage b/semanage/semanage
+index 19a6c51..c0083c6 100644
+--- a/semanage/semanage
++++ b/semanage/semanage
+@@ -25,8 +25,14 @@
  
+ import traceback
  import argparse
 -import seobject
  import sys
- import gettext
 +try:
-+        import seobject
-+        import sepolicy
++    import seobject
++    import sepolicy
 +except ValueError, e:
-+        print "Error: %s\n" % e
-+        sys.exit(1)
++    print "Error: %s\n" % e
++    sys.exit(1)
 +
  PROGNAME = "policycoreutils"
  try:
-     kwargs = {}
-@@ -66,9 +72,6 @@
- usage_boolean = "semanage boolean [-h] [-n] [-N] [-s STORE] ["
+     import gettext
+@@ -67,9 +73,6 @@ usage_interface_dict = {' --add': ('-t TYPE', '-r RANGE', 'interface'), ' --modi
+ usage_boolean = "semanage boolean [-h] [-n] [-N] [-S STORE] ["
  usage_boolean_dict = {' --modify': ('(', '--on', '|', '--off', ')', 'boolean'), ' --list': ('-C',), '  --extract': ('',), ' --deleteall': ('',)}
  
 -import sepolicy

@@ -45,3 +44,6 @@ Index: policycoreutils-2.5/semanage/semanage
  class CheckRole(argparse.Action):
  
      def __call__(self, parser, namespace, value, option_string=None):
+-- 
+2.7.4
+
recipes-security/selinux/policycoreutils_2.6.bb renamed from recipes-security/selinux/policycoreutils_2.5.bb +3 -4
similarity index 68%
rename from recipes-security/selinux/policycoreutils_2.5.bb
rename to recipes-security/selinux/policycoreutils_2.6.bb
index 37d3870..6a625b3 100644
@@ -1,10 +1,10 @@
-include selinux_20160223.inc
+include selinux_20161014.inc
 include ${BPN}.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 
-SRC_URI[md5sum] = "9ad9331b2133262fb3f774359a7f4761"
-SRC_URI[sha256sum] = "329382cfe9fa977678abf541dcd8fe3847cf0c83b24654c8f7322343907078a1"
+SRC_URI[md5sum] = "0358f0136e2dd9a8c9e99f181aaab1b2"
+SRC_URI[sha256sum] = "68891b376f5048edc53c6ccb2fca44da3dc7f4563f4b6894e201d70c04a05a29"
 
 SRC_URI += "\
 	file://policycoreutils-fix-sepolicy-install-path.patch \

@@ -14,5 +14,4 @@ SRC_URI += "\
 	file://policycoreutils-fix-TypeError-for-seobject.py.patch \
 	file://0001-mcstrans-fix-the-init-script.patch \
 	file://enable-mcstrans.patch \
-	file://policycoreutils-fts_flags-FTS_NOCHDIR.patch \
 	"
Signature · 1 line
2.7.4
author
#7 lore raw

PATCH 7/9 sepolgen: uprev to 2.6 (20161014)

In reply to [email protected]

From: Wenzong Fan <[email protected]>

Signed-off-by Wenzong Fan <[email protected]>
---
 recipes-security/selinux/sepolgen_1.2.3.bb | 7 -------
 recipes-security/selinux/sepolgen_2.6.bb   | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 recipes-security/selinux/sepolgen_1.2.3.bb
 create mode 100644 recipes-security/selinux/sepolgen_2.6.bb
recipes-security/selinux/sepolgen_1.2.3.bb deleted +0 -7
deleted file mode 100644
index 2d30847..0000000
@@ -1,7 +0,0 @@
-include selinux_20160223.inc
-include ${BPN}.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
-
-SRC_URI[md5sum] = "d17b4072ed14d1f8d94ffd667ddc2864"
-SRC_URI[sha256sum] = "3ee1745257fa55301070219c77978c7c9eeb9aa595ce0b6b29c3baa4687d5cf0"
recipes-security/selinux/sepolgen_2.6.bb new file +7 -0
new file mode 100644
index 0000000..7825863
@@ -0,0 +1,7 @@
+include selinux_20161014.inc
+include ${BPN}.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
+
+SRC_URI[md5sum] = "84faa46a0eb0b603e903efeed239c244"
+SRC_URI[sha256sum] = "6a327b1576d914e57ad796a541a7a9bcceefb14c445355559993de0fdb8e7a60"
Signature · 1 line
2.7.4
author
#8 lore raw

PATCH 8/9 secilc: uprev to 2.6 (20161014)

In reply to [email protected]

From: Wenzong Fan <[email protected]>

Signed-off-by Wenzong Fan <[email protected]>
---
 recipes-security/selinux/secilc_2.5.bb | 7 -------
 recipes-security/selinux/secilc_2.6.bb | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 recipes-security/selinux/secilc_2.5.bb
 create mode 100644 recipes-security/selinux/secilc_2.6.bb
recipes-security/selinux/secilc_2.5.bb deleted +0 -7
deleted file mode 100644
index 56e0086..0000000
@@ -1,7 +0,0 @@
-include selinux_20160223.inc
-include ${BPN}.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=5fb82e8deb357d4e5fd8f3fed01d2f38"
-
-SRC_URI[md5sum] = "af73267cccd0e46cb455d5702565cd41"
-SRC_URI[sha256sum] = "4303d911c06ee5c207e00f778ca786c1a6efa2554a562f5d014dbc0d2f4cc4a4"
recipes-security/selinux/secilc_2.6.bb new file +7 -0
new file mode 100644
index 0000000..0f84b0e
@@ -0,0 +1,7 @@
+include selinux_20161014.inc
+include ${BPN}.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=5fb82e8deb357d4e5fd8f3fed01d2f38"
+
+SRC_URI[md5sum] = "38c06fb8d97206a12016b4516ee23efc"
+SRC_URI[sha256sum] = "a84838c15bb7b0141238b48294b15ff0e1618107f547541a0067d1ddabcc9502"
Signature · 1 line
2.7.4
author
#9 lore raw

PATCH 9/9 selinux_common: remove EXTRA_OEMAKE = "-e"

In reply to [email protected]

From: Wenzong Fan <[email protected]>

Some variables are exported by top Makefile and updated from sub Makefile (such as PCRE_LDFLAGS, DISABLE_FLAGS ...).

The '-e' option prevents those variables from updating in the sub Makefile and causes libselinux build errors:

| label.lo:(.data.rel.ro.local+0x20): undefined reference to selabel_property_init' | label.lo:(.data.rel.ro.local+0x28): undefined reference to selabel_service_init'

oe-core also cleaned such default value from commit: aeb65386

Signed-off-by Wenzong Fan <[email protected]>
---
 recipes-security/selinux/selinux_common.inc | 5 -----
 1 file changed, 5 deletions(-)
recipes-security/selinux/selinux_common.inc +0 -5
index 7efa694..e4c23a1 100644
@@ -1,10 +1,5 @@
 HOMEPAGE = "https://github.com/SELinuxProject"
 
-# EXTRA_OEMAKE is typically: -e MAKEFLAGS=
-# "MAKEFLAGS= " causes problems as ENV variables will not pass to subdirs, so
-# we redefine EXTRA_OEMAKE here
-EXTRA_OEMAKE = "-e"
-
 do_compile() {
     oe_runmake all \
             INCLUDEDIR='${STAGING_INCDIR}' \
Signature · 1 line
2.7.4