From 8b3efbf23d2aae1fa21fa813751bfa2fa85f95da Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Tue, 14 Apr 2020 15:41:43 +0800
Subject: setools: upgrade 4.2.2 -> 4.3.0

Remove __pycache__ directories when do_install.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
---
 recipes-security/setools/setools_4.2.2.bb | 35 -----------------------------
 recipes-security/setools/setools_4.3.0.bb | 37 +++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 35 deletions(-)
 delete mode 100644 recipes-security/setools/setools_4.2.2.bb
 create mode 100644 recipes-security/setools/setools_4.3.0.bb

diff --git a/recipes-security/setools/setools_4.2.2.bb b/recipes-security/setools/setools_4.2.2.bb
deleted file mode 100644
index 6e5a950..0000000
--- a/recipes-security/setools/setools_4.2.2.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-SUMMARY = "Policy analysis tools for SELinux"
-DESCRIPTION = "\
-SETools is a collection of graphical tools, command-line tools, and \
-libraries designed to facilitate SELinux policy analysis. \
-\n\
-This meta-package depends upon the main packages necessary to run \
-SETools."
-SECTION = "base"
-LICENSE = "GPLv2 & LGPLv2.1"
-
-S = "${WORKDIR}/git"
-SRC_URI = "git://github.com/SELinuxProject/${BPN}.git;branch=4.2 \
-           file://setools4-fixes-for-cross-compiling.patch \
-"
-
-SRCREV = "15bffa7823b9a999f9d51533785ade18fe44df08"
-
-LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=83a5eb6974c11f30785e90d0eeccf40c \
-                    file://${S}/COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://${S}/COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c"
-
-DEPENDS += "bison-native flex-native swig-native python3 python3-cython-native libsepol"
-
-RDEPENDS_${PN} += "python3-networkx python3-decorator python3-setuptools \
-                   python3-logging python3-json libselinux-python"
-
-RPROVIDES_${PN} += "${PN}-console"
-
-inherit setuptools3
-
-do_install_append() {
-	# Need PyQt5 support, disable gui tools
-	rm -f ${D}${bindir}/apol
-	rm -rf ${D}${libdir}/${PYTHON_DIR}/site-packages/setoolsgui
-}
diff --git a/recipes-security/setools/setools_4.3.0.bb b/recipes-security/setools/setools_4.3.0.bb
new file mode 100644
index 0000000..ec73f7c
--- /dev/null
+++ b/recipes-security/setools/setools_4.3.0.bb
@@ -0,0 +1,37 @@
+SUMMARY = "Policy analysis tools for SELinux"
+DESCRIPTION = "\
+SETools is a collection of graphical tools, command-line tools, and \
+libraries designed to facilitate SELinux policy analysis. \
+\n\
+This meta-package depends upon the main packages necessary to run \
+SETools."
+SECTION = "base"
+LICENSE = "GPLv2 & LGPLv2.1"
+
+S = "${WORKDIR}/git"
+SRC_URI = "git://github.com/SELinuxProject/${BPN}.git;branch=4.3 \
+           file://setools4-fixes-for-cross-compiling.patch \
+"
+
+SRCREV = "a57ad3cdb669a39f785c4e85d63416a469c8d445"
+
+LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=83a5eb6974c11f30785e90d0eeccf40c \
+                    file://${S}/COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://${S}/COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c"
+
+DEPENDS += "bison-native flex-native swig-native python3 python3-cython-native libsepol libselinux"
+
+RDEPENDS_${PN} += "python3-networkx python3-decorator python3-setuptools \
+                   python3-logging python3-json libselinux-python"
+
+RPROVIDES_${PN} += "${PN}-console"
+
+inherit setuptools3
+
+do_install_append() {
+	# Need PyQt5 support, disable gui tools
+	rm -f ${D}${bindir}/apol
+	rm -rf ${D}${libdir}/${PYTHON_DIR}/site-packages/setoolsgui
+	rm -rf ${D}${libdir}/${PYTHON_DIR}/site-packages/setools/__pycache__
+	rm -rf ${D}${libdir}/${PYTHON_DIR}/site-packages/setools/*/__pycache__
+}
-- 
cgit v1.2.3-54-g00ecf