From 076cf94e6d2e4c7597c92abe3a2d09e90f78ae52 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Wed, 5 Sep 2018 08:18:12 +0800
Subject: selinux: uprev inc files to 2.8 (20180524)

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
---
 recipes-security/selinux/selinux_20170804.inc | 5 -----
 recipes-security/selinux/selinux_20180524.inc | 5 +++++
 recipes-security/selinux/selinux_common.inc   | 9 +++++----
 3 files changed, 10 insertions(+), 9 deletions(-)
 delete mode 100644 recipes-security/selinux/selinux_20170804.inc
 create mode 100644 recipes-security/selinux/selinux_20180524.inc

(limited to 'recipes-security/selinux')

diff --git a/recipes-security/selinux/selinux_20170804.inc b/recipes-security/selinux/selinux_20170804.inc
deleted file mode 100644
index 1c11208..0000000
--- a/recipes-security/selinux/selinux_20170804.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-SELINUX_RELEASE = "20170804"
-
-SRC_URI = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${SELINUX_RELEASE}/${BPN}-${PV}.tar.gz"
-
-include selinux_common.inc
diff --git a/recipes-security/selinux/selinux_20180524.inc b/recipes-security/selinux/selinux_20180524.inc
new file mode 100644
index 0000000..b36b333
--- /dev/null
+++ b/recipes-security/selinux/selinux_20180524.inc
@@ -0,0 +1,5 @@
+SELINUX_RELEASE = "20180524"
+
+SRC_URI = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${SELINUX_RELEASE}/${BPN}-${PV}.tar.gz"
+
+include selinux_common.inc
diff --git a/recipes-security/selinux/selinux_common.inc b/recipes-security/selinux/selinux_common.inc
index e4c23a1..383f62d 100644
--- a/recipes-security/selinux/selinux_common.inc
+++ b/recipes-security/selinux/selinux_common.inc
@@ -9,8 +9,9 @@ do_compile() {
 do_install() {
     oe_runmake install \
             DESTDIR="${D}" \
-            PREFIX="${D}/${prefix}" \
-            INCLUDEDIR="${D}/${includedir}" \
-            LIBDIR="${D}/${libdir}" \
-            SHLIBDIR="${D}/${base_libdir}"
+            PREFIX="${prefix}" \
+            INCLUDEDIR="${includedir}" \
+            LIBDIR="${libdir}" \
+            SHLIBDIR="${base_libdir}" \
+            SYSTEMDDIR="${systemd_unitdir}"
 }
-- 
cgit v1.2.3-54-g00ecf