CaROS/meta-selinux
3
0
Fork 0
mirror of git://git.yoctoproject.org/meta-selinux synced 2026-01-01 13:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

checkpolicy: uprev to 2.7 (20170804)

Browse Source 
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>
This commit is contained in:
Wenzong Fan 2017-09-04 22:59:42 -07:00 committed by Mark Hatle
parent b00974f7b4
commit 43adb0c69a
5 changed files with 9 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
recipes-security/selinux/checkpolicy.inc
View File

@ -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

46
recipes-security/selinux/checkpolicy/checkpolicy-Do-not-link-against-libfl.patch
View File

@ -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.Lu@windriver.com>
Signed-off-by: Shrikant Bobade <Shrikant_Bobade@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

7
recipes-security/selinux/checkpolicy_2.6.bb
View File

@ -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"

7
recipes-security/selinux/checkpolicy_2.7.bb Normal file
View File

@ -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"

3
recipes-security/selinux/checkpolicy_git.bb
View File

@ -1,5 +1,4 @@
PR = "r99"
PV = "2.2+git${SRCPV}"
PV = "2.7+git${SRCPV}"
include selinux_git.inc
include ${BPN}.inc