diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /meta-openembedded/meta-oe/recipes-support/gradm | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/gradm')
3 files changed, 139 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch b/meta-openembedded/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch new file mode 100644 index 0000000000..09a60127a4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch @@ -0,0 +1,26 @@ +From d67e93ada37d7237983fd10894c18b92f4243d50 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 18 Mar 2017 08:51:45 -0700 +Subject: [PATCH] Makefile: Append instead of overriding LDFLAGS + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 28557ff..deed94c 100644 +--- a/Makefile ++++ b/Makefile +@@ -29,7 +29,7 @@ OPT_FLAGS := -O2 + # for older versions of grsecurity, comment the above line and uncomment the below: + #OPT_FLAGS := $(shell if [ "`uname -m`" != "sparc64" ] && [ "`uname -m`" != "x86_64" ]; then echo "-O2" ; else echo "-O2 -m64" ; fi) + CFLAGS := $(OPT_FLAGS) -fPIE -Wcast-qual -DGRSEC_DIR=\"$(GRSEC_DIR)\" -D_LARGEFILE64_SOURCE +-LDFLAGS= -pie ++LDFLAGS+= -pie + INSTALL = /usr/bin/install -c + + # FHS +-- +2.12.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/gradm/gradm/0001-Makefile-remove-strip.patch b/meta-openembedded/meta-oe/recipes-support/gradm/gradm/0001-Makefile-remove-strip.patch new file mode 100644 index 0000000000..f0c697c7b5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/gradm/gradm/0001-Makefile-remove-strip.patch @@ -0,0 +1,61 @@ +From fbf7b9e5a8e2978acd5b0a7a8311912a080ee9b9 Mon Sep 17 00:00:00 2001 +From: Qian Lei <qianl.fnst@cn.fujitsu.com> +Date: Thu, 18 Dec 2014 11:09:01 +0800 +Subject: [PATCH] Makefile: remove strip + +Avoid QA error by removing strip from Makefile + +[...] +ERROR: QA Issue: File '/sbin/gradm' from gradm was already stripped, +this will prevent future debugging! [already-stripped] +ERROR: QA Issue: File '/sbin/grlearn' from gradm was already stripped, +this will prevent future debugging! [already-stripped] +[...] + +Upstream-Status: Pending + +Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com> + +--- + Makefile | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index 6c33fee..3570a4e 100644 +--- a/Makefile ++++ b/Makefile +@@ -24,7 +24,6 @@ MKNOD=/bin/mknod + #CC=/usr/bin/diet /usr/bin/gcc + CC=/usr/bin/gcc + FIND=/usr/bin/find +-STRIP=/usr/bin/strip + LIBS := $(shell if [ "`uname -m`" != "sparc64" -a "`uname -m`" != "x86_64" ]; then echo "-lfl" ; else echo "" ; fi) + OPT_FLAGS := -O2 + # for older versions of grsecurity, comment the above line and uncomment the below: +@@ -140,15 +139,12 @@ install: $(GRADM_BIN) gradm.8 policy grlearn + @mkdir -p $(DESTDIR)/sbin + @echo "Installing gradm..." + @$(INSTALL) -m 0755 $(GRADM_BIN) $(DESTDIR)/sbin +- @$(STRIP) $(DESTDIR)/sbin/$(GRADM_BIN) + @if [ -f $(GRADM_PAM) ] ; then \ + echo "Installing gradm_pam..." ; \ + $(INSTALL) -m 4755 $(GRADM_PAM) $(DESTDIR)/sbin ; \ +- $(STRIP) $(DESTDIR)/sbin/$(GRADM_PAM) ; \ + fi + @echo "Installing grlearn..." + @$(INSTALL) -m 0700 grlearn $(DESTDIR)/sbin +- @$(STRIP) $(DESTDIR)/sbin/grlearn + @mkdir -p -m 700 $(DESTDIR)$(GRSEC_DIR) + @if [ ! -f $(DESTDIR)$(GRSEC_DIR)/policy ] ; then \ + if [ -f $(DESTDIR)$(GRSEC_DIR)/acl ] ; then \ +@@ -168,6 +164,7 @@ install: $(GRADM_BIN) gradm.8 policy grlearn + $(MKNOD) -m 0622 $(DESTDIR)/dev/grsec c 1 13 ; \ + fi \ + fi ++ @mkdir -p $(DESTDIR)/etc/udev/rules.d + @if [ -d $(DESTDIR)/etc/udev/rules.d ] ; then \ + echo "ACTION!=\"add|change\", GOTO=\"permissions_end\"" > $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \ + echo "KERNEL==\"grsec\", MODE=\"0622\"" >> $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \ +-- +1.8.3.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/gradm/gradm_3.1.bb b/meta-openembedded/meta-oe/recipes-support/gradm/gradm_3.1.bb new file mode 100644 index 0000000000..1a4261a9ea --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/gradm/gradm_3.1.bb @@ -0,0 +1,52 @@ +SUMMARY = "Administration program for the grsecurity RBAC syste" +DESCRIPTION = "\ +gradm is the userspace RBAC parsing and authentication program for \ +grsecurity grsecurity aims to be a complete security system. gradm \ +performs several tasks for the RBAC system including authenticated \ +via a password to the kernel and parsing rules to be passed to the \ +kernel" +HOMEPAGE = "http://grsecurity.net/index.php" +SECTION = "admin" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4641e94ec96f98fabc56ff9cc48be14b" +DEPENDS = "flex-native bison-native ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" + +SRC_URI = "http://grsecurity.net/stable/${BP}-201507191652.tar.gz \ + file://0001-Makefile-remove-strip.patch \ + file://0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch \ + " +SRC_URI[md5sum] = "ecec72d3a9b6d84c00eda97957b707b6" +SRC_URI[sha256sum] = "2f14c357bf0459e502a4e108b76c3f6240aa484762d07bb1687796b9b9297a50" + +S = "${WORKDIR}/gradm" + +inherit autotools-brokensep + +do_compile() { + oe_runmake 'CC=${CC}' \ + 'OPT_FLAGS=${CFLAGS}' \ + 'LLEX=${STAGING_BINDIR_NATIVE}/lex' \ + 'FLEX=${STAGING_BINDIR_NATIVE}/flex' \ + 'BISON=${STAGING_BINDIR_NATIVE}/bison' \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', ' ', 'nopam', d)} +} + +do_install() { + oe_runmake 'CC=${CC}' \ + 'DESTDIR=${D}' \ + 'LLEX=${STAGING_BINDIR_NATIVE}/lex' \ + 'FLEX=${STAGING_BINDIR_NATIVE}/flex' \ + 'BISON=${STAGING_BINDIR_NATIVE}/bison' \ + install + + # The device nodes are generated by postinstall or udev + rm -rf ${D}/dev +} + +pkg_postinst_${PN}() { + # make sure running on the target + if [ x"$D" != "x" ]; then + exit 1 + fi + /bin/mknod -m 0622 /dev/grsec c 1 13 +} |