diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2022-08-28 10:29:22 +0800 |
---|---|---|
committer | Joe MacDonald <joe@deserted.net> | 2022-08-28 13:54:58 -0400 |
commit | b452f8c085de7afc0595186c583165fdbbed8c3d (patch) | |
tree | 8fff6c1134f85f42747bc8d636432cdc2bdc28dd | |
parent | 3b8a799fa9cabdf891f082a53a29408ebfc49333 (diff) | |
download | meta-selinux-b452f8c085de7afc0595186c583165fdbbed8c3d.tar.gz |
libselinux-python: upgrade 3.3 -> 3.4
* Use libpcre2 instead of libpcre.
* Refresh patches.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
-rw-r--r-- | recipes-security/selinux/libselinux-python_3.4.bb (renamed from recipes-security/selinux/libselinux-python_3.3.bb) | 13 | ||||
-rw-r--r-- | recipes-security/selinux/libselinux/0001-Makefile-fix-python-modules-install-path-for-multili.patch | 8 | ||||
-rw-r--r-- | recipes-security/selinux/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch (renamed from recipes-security/selinux/libselinux/0001-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch) | 8 |
3 files changed, 15 insertions, 14 deletions
diff --git a/recipes-security/selinux/libselinux-python_3.3.bb b/recipes-security/selinux/libselinux-python_3.4.bb index 136f538..a850369 100644 --- a/recipes-security/selinux/libselinux-python_3.3.bb +++ b/recipes-security/selinux/libselinux-python_3.4.bb | |||
@@ -8,18 +8,20 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" | |||
8 | 8 | ||
9 | require selinux_common.inc | 9 | require selinux_common.inc |
10 | 10 | ||
11 | inherit python3native python3targetconfig pkgconfig | 11 | inherit python3targetconfig pkgconfig |
12 | 12 | ||
13 | FILESEXTRAPATHS:prepend := "${THISDIR}/libselinux:" | 13 | FILESEXTRAPATHS:prepend := "${THISDIR}/libselinux:" |
14 | SRC_URI += "\ | 14 | SRC_URI += "\ |
15 | file://0001-Makefile-fix-python-modules-install-path-for-multili.patch \ | 15 | file://0001-Makefile-fix-python-modules-install-path-for-multili.patch \ |
16 | file://0001-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch \ | 16 | file://0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch \ |
17 | " | 17 | " |
18 | 18 | ||
19 | S = "${WORKDIR}/git/libselinux" | 19 | S = "${WORKDIR}/git/libselinux" |
20 | 20 | ||
21 | DEPENDS += "python3 swig-native libpcre libsepol" | 21 | DEPENDS = "libsepol libpcre2 swig-native" |
22 | RDEPENDS:${PN} += "libselinux python3-core python3-shell" | 22 | DEPENDS:append:libc-musl = " fts" |
23 | |||
24 | RDEPENDS:${PN} = "libselinux python3-core python3-shell" | ||
23 | 25 | ||
24 | def get_policyconfigarch(d): | 26 | def get_policyconfigarch(d): |
25 | import re | 27 | import re |
@@ -28,8 +30,7 @@ def get_policyconfigarch(d): | |||
28 | target = p.sub('i386',target) | 30 | target = p.sub('i386',target) |
29 | return "ARCH=%s" % (target) | 31 | return "ARCH=%s" % (target) |
30 | 32 | ||
31 | EXTRA_OEMAKE += "${@get_policyconfigarch(d)}" | 33 | EXTRA_OEMAKE = "${@get_policyconfigarch(d)}" |
32 | EXTRA_OEMAKE += "LDFLAGS='${LDFLAGS} -lpcre' LIBSEPOLA='${STAGING_LIBDIR}/libsepol.a'" | ||
33 | EXTRA_OEMAKE:append:libc-musl = " FTS_LDLIBS=-lfts" | 34 | EXTRA_OEMAKE:append:libc-musl = " FTS_LDLIBS=-lfts" |
34 | 35 | ||
35 | FILES:${PN} = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" | 36 | FILES:${PN} = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" |
diff --git a/recipes-security/selinux/libselinux/0001-Makefile-fix-python-modules-install-path-for-multili.patch b/recipes-security/selinux/libselinux/0001-Makefile-fix-python-modules-install-path-for-multili.patch index 9dfd8d4..9750cd6 100644 --- a/recipes-security/selinux/libselinux/0001-Makefile-fix-python-modules-install-path-for-multili.patch +++ b/recipes-security/selinux/libselinux/0001-Makefile-fix-python-modules-install-path-for-multili.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 41540f5c4e3552a2806097613f016d1a2fd4754a Mon Sep 17 00:00:00 2001 | 1 | From 1ff60a36bb0bfc95ce33cf950f58e121548a3c8a Mon Sep 17 00:00:00 2001 |
2 | From: Yi Zhao <yi.zhao@windriver.com> | 2 | From: Yi Zhao <yi.zhao@windriver.com> |
3 | Date: Mon, 13 Apr 2020 12:44:23 +0800 | 3 | Date: Mon, 13 Apr 2020 12:44:23 +0800 |
4 | Subject: [PATCH] Makefile: fix python modules install path for multilib | 4 | Subject: [PATCH] Makefile: fix python modules install path for multilib |
@@ -11,10 +11,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | |||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
12 | 12 | ||
13 | diff --git a/src/Makefile b/src/Makefile | 13 | diff --git a/src/Makefile b/src/Makefile |
14 | index 190016e..dcdeb10 100644 | 14 | index 04bf4f2..81ae6a2 100644 |
15 | --- a/src/Makefile | 15 | --- a/src/Makefile |
16 | +++ b/src/Makefile | 16 | +++ b/src/Makefile |
17 | @@ -174,7 +174,7 @@ install: all | 17 | @@ -181,7 +181,7 @@ install: all |
18 | ln -sf --relative $(DESTDIR)$(SHLIBDIR)/$(LIBSO) $(DESTDIR)$(LIBDIR)/$(TARGET) | 18 | ln -sf --relative $(DESTDIR)$(SHLIBDIR)/$(LIBSO) $(DESTDIR)$(LIBDIR)/$(TARGET) |
19 | 19 | ||
20 | install-pywrap: pywrap | 20 | install-pywrap: pywrap |
@@ -24,5 +24,5 @@ index 190016e..dcdeb10 100644 | |||
24 | ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) | 24 | ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) |
25 | 25 | ||
26 | -- | 26 | -- |
27 | 2.17.1 | 27 | 2.25.1 |
28 | 28 | ||
diff --git a/recipes-security/selinux/libselinux/0001-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch b/recipes-security/selinux/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch index 0fafcef..db7d68f 100644 --- a/recipes-security/selinux/libselinux/0001-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch +++ b/recipes-security/selinux/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1542c79660484a2f2e24ee0593586dba35c3ad13 Mon Sep 17 00:00:00 2001 | 1 | From dae53d7cd4d7875f7fb7aba016a0331559044eea Mon Sep 17 00:00:00 2001 |
2 | From: Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2 | From: Thomas Petazzoni <thomas.petazzoni@bootlin.com> |
3 | Date: Fri, 25 Oct 2019 13:37:14 +0200 | 3 | Date: Fri, 25 Oct 2019 13:37:14 +0200 |
4 | Subject: [PATCH] Do not use PYCEXT, and rely on the installed file name | 4 | Subject: [PATCH] Do not use PYCEXT, and rely on the installed file name |
@@ -27,7 +27,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> | |||
27 | 1 file changed, 1 insertion(+), 2 deletions(-) | 27 | 1 file changed, 1 insertion(+), 2 deletions(-) |
28 | 28 | ||
29 | diff --git a/src/Makefile b/src/Makefile | 29 | diff --git a/src/Makefile b/src/Makefile |
30 | index dcdeb10..da6f719 100644 | 30 | index 81ae6a2..37399e1 100644 |
31 | --- a/src/Makefile | 31 | --- a/src/Makefile |
32 | +++ b/src/Makefile | 32 | +++ b/src/Makefile |
33 | @@ -15,7 +15,6 @@ INCLUDEDIR ?= $(PREFIX)/include | 33 | @@ -15,7 +15,6 @@ INCLUDEDIR ?= $(PREFIX)/include |
@@ -38,7 +38,7 @@ index dcdeb10..da6f719 100644 | |||
38 | RUBYINC ?= $(shell $(RUBY) -e 'puts "-I" + RbConfig::CONFIG["rubyarchhdrdir"] + " -I" + RbConfig::CONFIG["rubyhdrdir"]') | 38 | RUBYINC ?= $(shell $(RUBY) -e 'puts "-I" + RbConfig::CONFIG["rubyarchhdrdir"] + " -I" + RbConfig::CONFIG["rubyhdrdir"]') |
39 | RUBYLIBS ?= $(shell $(RUBY) -e 'puts "-L" + RbConfig::CONFIG["libdir"] + " -L" + RbConfig::CONFIG["archlibdir"] + " " + RbConfig::CONFIG["LIBRUBYARG_SHARED"]') | 39 | RUBYLIBS ?= $(shell $(RUBY) -e 'puts "-L" + RbConfig::CONFIG["libdir"] + " -L" + RbConfig::CONFIG["archlibdir"] + " " + RbConfig::CONFIG["LIBRUBYARG_SHARED"]') |
40 | RUBYINSTALL ?= $(shell $(RUBY) -e 'puts RbConfig::CONFIG["vendorarchdir"]') | 40 | RUBYINSTALL ?= $(shell $(RUBY) -e 'puts RbConfig::CONFIG["vendorarchdir"]') |
41 | @@ -176,7 +175,7 @@ install: all | 41 | @@ -183,7 +182,7 @@ install: all |
42 | install-pywrap: pywrap | 42 | install-pywrap: pywrap |
43 | $(PYTHON) setup.py install --prefix=$(PREFIX) --root=$(DESTDIR) --install-lib=$(PYTHONLIBDIR) $(PYTHON_SETUP_ARGS) | 43 | $(PYTHON) setup.py install --prefix=$(PREFIX) --root=$(DESTDIR) --install-lib=$(PYTHONLIBDIR) $(PYTHON_SETUP_ARGS) |
44 | install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py | 44 | install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py |
@@ -48,5 +48,5 @@ index dcdeb10..da6f719 100644 | |||
48 | install-rubywrap: rubywrap | 48 | install-rubywrap: rubywrap |
49 | test -d $(DESTDIR)$(RUBYINSTALL) || install -m 755 -d $(DESTDIR)$(RUBYINSTALL) | 49 | test -d $(DESTDIR)$(RUBYINSTALL) || install -m 755 -d $(DESTDIR)$(RUBYINSTALL) |
50 | -- | 50 | -- |
51 | 2.17.1 | 51 | 2.25.1 |
52 | 52 | ||