From f1cbb574f1e98a6f5779b70f1b37eedaaa2afec3 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Sat, 13 Mar 2021 13:50:42 +0800
Subject: selinux-sandbox: update to 3.2

Merge inc file into bb file.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
---
 recipes-security/selinux/selinux-sandbox.inc    | 27 ----------------------
 recipes-security/selinux/selinux-sandbox_3.1.bb |  7 ------
 recipes-security/selinux/selinux-sandbox_3.2.bb | 30 +++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 34 deletions(-)
 delete mode 100644 recipes-security/selinux/selinux-sandbox.inc
 delete mode 100644 recipes-security/selinux/selinux-sandbox_3.1.bb
 create mode 100644 recipes-security/selinux/selinux-sandbox_3.2.bb

diff --git a/recipes-security/selinux/selinux-sandbox.inc b/recipes-security/selinux/selinux-sandbox.inc
deleted file mode 100644
index c8e335a..0000000
--- a/recipes-security/selinux/selinux-sandbox.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-SUMMARY = "Run cmd under an SELinux sandbox"
-DESCRIPTION = "\
-Run application within a tightly confined SELinux domain. The default \
-sandbox domain only allows applications the ability to read and write \
-stdin, stdout and any other file descriptors handed to it."
-
-SECTION = "base"
-LICENSE = "GPLv2+"
-
-SRC_URI += "file://sandbox-de-bashify.patch \
-"
-
-DEPENDS += "libcap-ng libselinux"
-
-RDEPENDS_${PN} += "\
-        python3-core \
-        python3-math \
-        python3-shell \
-        python3-unixadmin \
-        libselinux-python \
-        selinux-python \
-"
-
-FILES_${PN} += "\
-        ${datadir}/sandbox/sandboxX.sh \
-        ${datadir}/sandbox/start \
-"
diff --git a/recipes-security/selinux/selinux-sandbox_3.1.bb b/recipes-security/selinux/selinux-sandbox_3.1.bb
deleted file mode 100644
index 8a95044..0000000
--- a/recipes-security/selinux/selinux-sandbox_3.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require selinux_20200710.inc
-require ${BPN}.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
-
-SRC_URI[md5sum] = "d38fda12b028c06f751be9c25e309c6b"
-SRC_URI[sha256sum] = "c79b958e2f64570a59e60638fd13c15fd77c7c2bbac31c7ad4afb03718432b84"
diff --git a/recipes-security/selinux/selinux-sandbox_3.2.bb b/recipes-security/selinux/selinux-sandbox_3.2.bb
new file mode 100644
index 0000000..2c6a823
--- /dev/null
+++ b/recipes-security/selinux/selinux-sandbox_3.2.bb
@@ -0,0 +1,30 @@
+SUMMARY = "Run cmd under an SELinux sandbox"
+DESCRIPTION = "\
+Run application within a tightly confined SELinux domain. The default \
+sandbox domain only allows applications the ability to read and write \
+stdin, stdout and any other file descriptors handed to it."
+SECTION = "base"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=393a5ca445f6965873eca0259a17f833"
+
+require selinux_common.inc
+
+SRC_URI += "file://sandbox-de-bashify.patch"
+
+S = "${WORKDIR}/git/sandbox"
+
+DEPENDS += "libcap-ng libselinux"
+
+RDEPENDS_${PN} += "\
+        python3-core \
+        python3-math \
+        python3-shell \
+        python3-unixadmin \
+        libselinux-python \
+        selinux-python \
+"
+
+FILES_${PN} += "\
+        ${datadir}/sandbox/sandboxX.sh \
+        ${datadir}/sandbox/start \
+"
-- 
cgit v1.2.3-54-g00ecf