From 018714a5214f46a3fc99e712df308ffbe033b59b Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Sat, 13 Mar 2021 13:50:43 +0800
Subject: semodule-utils: 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/semodule-utils.inc    | 26 ---------------------
 recipes-security/selinux/semodule-utils_3.1.bb |  7 ------
 recipes-security/selinux/semodule-utils_3.2.bb | 31 ++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 33 deletions(-)
 delete mode 100644 recipes-security/selinux/semodule-utils.inc
 delete mode 100644 recipes-security/selinux/semodule-utils_3.1.bb
 create mode 100644 recipes-security/selinux/semodule-utils_3.2.bb

diff --git a/recipes-security/selinux/semodule-utils.inc b/recipes-security/selinux/semodule-utils.inc
deleted file mode 100644
index 23cbd14..0000000
--- a/recipes-security/selinux/semodule-utils.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "Utilities to manipulate SELinux policy module package"
-DESCRIPTION = "\
-The utilities to create, expand, link and show the dependencies between \
-the SELinux policy module packages."
-
-SECTION = "base"
-LICENSE = "GPLv2+"
-
-DEPENDS += "libsepol"
-RDEPENDS_${PN}-dev = ""
-
-EXTRA_OEMAKE += "LIBSEPOLA=${STAGING_LIBDIR}/libsepol.a"
-
-PACKAGES =+ "\
-        ${PN}-semodule-expand \
-        ${PN}-semodule-link \
-        ${PN}-semodule-package \
-"
-FILES_${PN}-semodule-expand += "${bindir}/semodule_expand"
-FILES_${PN}-semodule-link += "${bindir}/semodule_link"
-FILES_${PN}-semodule-package += "\
-        ${bindir}/semodule_package \
-        ${bindir}/semodule_unpackage \
-"
-
-BBCLASSEXTEND = "native"
diff --git a/recipes-security/selinux/semodule-utils_3.1.bb b/recipes-security/selinux/semodule-utils_3.1.bb
deleted file mode 100644
index 02a63f8..0000000
--- a/recipes-security/selinux/semodule-utils_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] = "d9520d0cdef3d1be412155dc72ec2936"
-SRC_URI[sha256sum] = "0cc37f9cec751d9c2abb5f2b228b060567e973cb47c19b53b8a4a7378baaa853"
diff --git a/recipes-security/selinux/semodule-utils_3.2.bb b/recipes-security/selinux/semodule-utils_3.2.bb
new file mode 100644
index 0000000..7773d5b
--- /dev/null
+++ b/recipes-security/selinux/semodule-utils_3.2.bb
@@ -0,0 +1,31 @@
+SUMMARY = "Utilities to manipulate SELinux policy module package"
+DESCRIPTION = "\
+The utilities to create, expand, link and show the dependencies between \
+the SELinux policy module packages."
+SECTION = "base"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=393a5ca445f6965873eca0259a17f833"
+
+require selinux_common.inc
+
+DEPENDS += "libsepol"
+RDEPENDS_${PN}-dev = ""
+
+EXTRA_OEMAKE += "LIBSEPOLA=${STAGING_LIBDIR}/libsepol.a"
+
+S = "${WORKDIR}/git/semodule-utils"
+
+PACKAGES =+ "\
+        ${PN}-semodule-expand \
+        ${PN}-semodule-link \
+        ${PN}-semodule-package \
+"
+
+FILES_${PN}-semodule-expand += "${bindir}/semodule_expand"
+FILES_${PN}-semodule-link += "${bindir}/semodule_link"
+FILES_${PN}-semodule-package += "\
+        ${bindir}/semodule_package \
+        ${bindir}/semodule_unpackage \
+"
+
+BBCLASSEXTEND = "native"
-- 
cgit v1.2.3-54-g00ecf