diff options
author | Wenzong Fan <wenzong.fan@windriver.com> | 2017-09-04 22:59:42 -0700 |
---|---|---|
committer | Mark Hatle <mark.hatle@windriver.com> | 2017-09-13 19:48:39 -0500 |
commit | 43adb0c69a147c58b650b7da78a77f0e5e21a642 (patch) | |
tree | 7b0d5126a428c289fad262402a327352c05ee302 | |
parent | b00974f7b431e192ad81bfd7b4e323123c3007ff (diff) | |
download | meta-selinux-43adb0c69a147c58b650b7da78a77f0e5e21a642.tar.gz |
checkpolicy: uprev to 2.7 (20170804)
Remove patch that included by new version:
- checkpolicy-Do-not-link-against-libfl.patch
Specify LIBSEPOLA to fix build error:
make[1]: *** No rule to make target `/usr/lib/libsepol.a'
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Update checkpolicy_git.bb
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
5 files changed, 9 insertions, 57 deletions
diff --git a/recipes-security/selinux/checkpolicy.inc b/recipes-security/selinux/checkpolicy.inc index efcd821..878c656 100644 --- a/recipes-security/selinux/checkpolicy.inc +++ b/recipes-security/selinux/checkpolicy.inc | |||
@@ -11,10 +11,9 @@ LICENSE = "GPLv2+" | |||
11 | 11 | ||
12 | DEPENDS += "libsepol bison-native flex-native" | 12 | DEPENDS += "libsepol bison-native flex-native" |
13 | 13 | ||
14 | SRC_URI += "file://checkpolicy-Do-not-link-against-libfl.patch" | ||
15 | |||
16 | EXTRA_OEMAKE += "PREFIX=${D}" | 14 | EXTRA_OEMAKE += "PREFIX=${D}" |
17 | EXTRA_OEMAKE += "LEX='flex'" | 15 | EXTRA_OEMAKE += "LEX='flex'" |
16 | EXTRA_OEMAKE += "LIBSEPOLA=${STAGING_LIBDIR}/libsepol.a" | ||
18 | 17 | ||
19 | do_install_append() { | 18 | do_install_append() { |
20 | install test/dismod ${D}/${bindir}/sedismod | 19 | install test/dismod ${D}/${bindir}/sedismod |
diff --git a/recipes-security/selinux/checkpolicy/checkpolicy-Do-not-link-against-libfl.patch b/recipes-security/selinux/checkpolicy/checkpolicy-Do-not-link-against-libfl.patch deleted file mode 100644 index e19209e..0000000 --- a/recipes-security/selinux/checkpolicy/checkpolicy-Do-not-link-against-libfl.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | checkpolicy: Don't link against libfl | ||
2 | |||
3 | In policy_scan.l file, we have already removed all references to yywrap by | ||
4 | adding "%option noyywrap" statements to each flex source file that doesn't | ||
5 | override yywrap. After this, we no longer need to link against libfl and so | ||
6 | no longer get errors about undefined references to yylex. | ||
7 | |||
8 | Upstream-status: Pending | ||
9 | |||
10 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | ||
11 | Signed-off-by: Shrikant Bobade <Shrikant_Bobade@mentor.com>ΒΆ | ||
12 | |||
13 | --- | ||
14 | Makefile | 2 +- | ||
15 | test/Makefile | 2 +- | ||
16 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/Makefile b/Makefile | ||
19 | index e5fae3d..14ac70e 100644 | ||
20 | --- a/Makefile | ||
21 | +++ b/Makefile | ||
22 | @@ -19,7 +19,7 @@ CHECKOBJS = y.tab.o lex.yy.o queue.o module_compiler.o parse_util.o \ | ||
23 | CHECKPOLOBJS = $(CHECKOBJS) checkpolicy.o | ||
24 | CHECKMODOBJS = $(CHECKOBJS) checkmodule.o | ||
25 | |||
26 | -LDLIBS=$(LIBDIR)/libsepol.a -lfl | ||
27 | +LDLIBS=$(LIBDIR)/libsepol.a | ||
28 | |||
29 | GENERATED=lex.yy.c y.tab.c y.tab.h | ||
30 | |||
31 | diff --git a/test/Makefile b/test/Makefile | ||
32 | index 63b4d24..0f19a8a 100644 | ||
33 | --- a/test/Makefile | ||
34 | +++ b/test/Makefile | ||
35 | @@ -9,7 +9,7 @@ INCLUDEDIR ?= $(PREFIX)/include | ||
36 | CFLAGS ?= -g -Wall -W -Werror -O2 -pipe | ||
37 | override CFLAGS += -I$(INCLUDEDIR) | ||
38 | |||
39 | -LDLIBS=-lfl $(LIBDIR)/libsepol.a -L$(LIBDIR) | ||
40 | +LDLIBS=$(LIBDIR)/libsepol.a -L$(LIBDIR) | ||
41 | |||
42 | all: dispol dismod | ||
43 | |||
44 | -- | ||
45 | 1.7.9.5 | ||
46 | |||
diff --git a/recipes-security/selinux/checkpolicy_2.6.bb b/recipes-security/selinux/checkpolicy_2.6.bb deleted file mode 100644 index f67c150..0000000 --- a/recipes-security/selinux/checkpolicy_2.6.bb +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | include selinux_20161014.inc | ||
2 | include ${BPN}.inc | ||
3 | |||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" | ||
5 | |||
6 | SRC_URI[md5sum] = "2b581f8fe8eb8f55f111088e15d76c3a" | ||
7 | SRC_URI[sha256sum] = "0bebd18688ca8027b1b3b4ff1532c0626f1fe49883ae6cb74d9d385940e74157" | ||
diff --git a/recipes-security/selinux/checkpolicy_2.7.bb b/recipes-security/selinux/checkpolicy_2.7.bb new file mode 100644 index 0000000..90b8109 --- /dev/null +++ b/recipes-security/selinux/checkpolicy_2.7.bb | |||
@@ -0,0 +1,7 @@ | |||
1 | include selinux_20170804.inc | ||
2 | include ${BPN}.inc | ||
3 | |||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" | ||
5 | |||
6 | SRC_URI[md5sum] = "5c718eaad4d3015bd5665ffde77b50fd" | ||
7 | SRC_URI[sha256sum] = "5413479f1dcde866c19896b4dbfec315d822aa431606e1d03c944408984c3201" | ||
diff --git a/recipes-security/selinux/checkpolicy_git.bb b/recipes-security/selinux/checkpolicy_git.bb index 5b6ba4b..6d1d23a 100644 --- a/recipes-security/selinux/checkpolicy_git.bb +++ b/recipes-security/selinux/checkpolicy_git.bb | |||
@@ -1,5 +1,4 @@ | |||
1 | PR = "r99" | 1 | PV = "2.7+git${SRCPV}" |
2 | PV = "2.2+git${SRCPV}" | ||
3 | 2 | ||
4 | include selinux_git.inc | 3 | include selinux_git.inc |
5 | include ${BPN}.inc | 4 | include ${BPN}.inc |