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

Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>

3 files changed, 1 insertions, 60 deletions

diff --git a/recipes-security/selinux/policycoreutils.inc b/recipes-security/selinux/policycoreutils.inc
index e1dd45b..98000de 100644
--- a/recipes-security/selinux/policycoreutils.inc
+++ b/recipes-security/selinux/policycoreutils.inc
@@ -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"
diff --git a/recipes-security/selinux/policycoreutils/policycoreutils-fix-fixfiles-install-path.patch b/recipes-security/selinux/policycoreutils/policycoreutils-fix-fixfiles-install-path.patch
deleted file mode 100644
index 96d2075..0000000
--- a/recipes-security/selinux/policycoreutils/policycoreutils-fix-fixfiles-install-path.patch
+++ /dev/null
@@ -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
-
diff --git a/recipes-security/selinux/policycoreutils/policycoreutils-fix-load_policy-install-path.patch b/recipes-security/selinux/policycoreutils/policycoreutils-fix-load_policy-install-path.patch
deleted file mode 100644
index 2136781..0000000
--- a/recipes-security/selinux/policycoreutils/policycoreutils-fix-load_policy-install-path.patch
+++ /dev/null
@@ -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
-