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

policycoreutils: fix installed-but-not-shipped on updated recipes

Browse Source 
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Joe MacDonald 2018-09-07 16:24:46 -04:00
parent ad1917ecca
commit 8cc9c17d40
3 changed files with 1 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,8 +9,6 @@ LICENSE = "GPLv2+"
SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
file://policycoreutils-fixfiles-de-bashify.patch \
file://policycoreutils-fix-fixfiles-install-path.patch \
file://policycoreutils-fix-load_policy-install-path.patch \
"
PAM_SRC_URI = "file://pam.d/newrole \
@ -130,6 +128,7 @@ EXTRA_OEMAKE += "\
${@bb.utils.contains('PACKAGECONFIG', 'audit', 'AUDITH=y', 'AUDITH=', d)} \
INOTIFYH=n \
PREFIX=${D} \
SBINDIR=${base_sbindir} \
"
BBCLASSEXTEND = "native"

29
recipes-security/selinux/policycoreutils/policycoreutils-fix-fixfiles-install-path.patch
View File

@ -1,29 +0,0 @@
From 0546ad883d98799972034f8e0fdc6ca2a7319b07 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Tue, 4 Sep 2018 14:14:45 +0800
Subject: [PATCH] policycoreutils: fix fixfiles install path
Change path from /usr/sbin to /sbin for backward compatibility
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
scripts/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/Makefile b/scripts/Makefile
index afe5dc4..f7a9e34 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -1,6 +1,6 @@
# Installation directories.
PREFIX ?= /usr
-SBINDIR ?= $(PREFIX)/sbin
+SBINDIR ?= /sbin
MANDIR ?= $(PREFIX)/share/man
.PHONY: all
--
2.7.4

29
recipes-security/selinux/policycoreutils/policycoreutils-fix-load_policy-install-path.patch
View File

@ -1,29 +0,0 @@
From 46077df498b8bb54964506f03fd95390aaaaa392 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Tue, 4 Sep 2018 14:41:13 +0800
Subject: [PATCH] policycoreutils: fix load_policy install path
Change path from /usr/sbin to /sbin for backward compatibility
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
load_policy/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/load_policy/Makefile b/load_policy/Makefile
index 568d5d4..7fbd077 100644
--- a/load_policy/Makefile
+++ b/load_policy/Makefile
@@ -1,6 +1,6 @@
# Installation directories.
PREFIX ?= /usr
-SBINDIR ?= $(PREFIX)/sbin
+SBINDIR ?= /sbin
MANDIR ?= $(PREFIX)/share/man
LOCALEDIR ?= $(DESTDIR)$(PREFIX)/share/locale
--
2.7.4