From: Wenzong Fan <wenzong....@windriver.com> 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....@windriver.com> --- recipes-security/selinux/checkpolicy.inc | 3 +- .../checkpolicy-Do-not-link-against-libfl.patch | 46 ---------------------- recipes-security/selinux/checkpolicy_2.6.bb | 7 ---- recipes-security/selinux/checkpolicy_2.7.bb | 7 ++++ 4 files changed, 8 insertions(+), 55 deletions(-) delete mode 100644 recipes-security/selinux/checkpolicy/checkpolicy-Do-not-link-against-libfl.patch delete mode 100644 recipes-security/selinux/checkpolicy_2.6.bb create mode 100644 recipes-security/selinux/checkpolicy_2.7.bb 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+" DEPENDS += "libsepol bison-native flex-native" -SRC_URI += "file://checkpolicy-Do-not-link-against-libfl.patch" - EXTRA_OEMAKE += "PREFIX=${D}" EXTRA_OEMAKE += "LEX='flex'" +EXTRA_OEMAKE += "LIBSEPOLA=${STAGING_LIBDIR}/libsepol.a" do_install_append() { 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 @@ -checkpolicy: Don't link against libfl - -In policy_scan.l file, we have already removed all references to yywrap by -adding "%option noyywrap" statements to each flex source file that doesn't -override yywrap. After this, we no longer need to link against libfl and so -no longer get errors about undefined references to yylex. - -Upstream-status: Pending - -Signed-off-by: Chong Lu <chong...@windriver.com> -Signed-off-by: Shrikant Bobade <shrikant_bob...@mentor.com>ΒΆ - ---- - Makefile | 2 +- - test/Makefile | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index e5fae3d..14ac70e 100644 ---- a/Makefile -+++ b/Makefile -@@ -19,7 +19,7 @@ CHECKOBJS = y.tab.o lex.yy.o queue.o module_compiler.o parse_util.o \ - CHECKPOLOBJS = $(CHECKOBJS) checkpolicy.o - CHECKMODOBJS = $(CHECKOBJS) checkmodule.o - --LDLIBS=$(LIBDIR)/libsepol.a -lfl -+LDLIBS=$(LIBDIR)/libsepol.a - - GENERATED=lex.yy.c y.tab.c y.tab.h - -diff --git a/test/Makefile b/test/Makefile -index 63b4d24..0f19a8a 100644 ---- a/test/Makefile -+++ b/test/Makefile -@@ -9,7 +9,7 @@ INCLUDEDIR ?= $(PREFIX)/include - CFLAGS ?= -g -Wall -W -Werror -O2 -pipe - override CFLAGS += -I$(INCLUDEDIR) - --LDLIBS=-lfl $(LIBDIR)/libsepol.a -L$(LIBDIR) -+LDLIBS=$(LIBDIR)/libsepol.a -L$(LIBDIR) - - all: dispol dismod - --- -1.7.9.5 - 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 @@ -include selinux_20161014.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" - -SRC_URI[md5sum] = "2b581f8fe8eb8f55f111088e15d76c3a" -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 @@ +include selinux_20170804.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" + +SRC_URI[md5sum] = "5c718eaad4d3015bd5665ffde77b50fd" +SRC_URI[sha256sum] = "5413479f1dcde866c19896b4dbfec315d822aa431606e1d03c944408984c3201" -- 2.13.0 -- _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto