mirrors/meta-security
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-security synced 2026-07-16 15:57:21 +00:00
Code Issues Projects Releases Wiki Activity

openscap: update to tip to fix new build issue.

Browse Source 
drop patch now included.

Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2024-03-19 07:07:13 -04:00
parent bb9321264a
commit 60021acffb
2 changed files with 3 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes-compliance/openscap/files/0001-Replace-distutils.sysconfig-with-sysconfig.patch
-57
View File
@@ -1,57 +0,0 @@
From 9a8e01f8421f92f40b4cbff6cf055538e9a0b0ae Mon Sep 17 00:00:00 2001
From: Evgeny Kolesnikov <ekolesni@redhat.com>
Date: Thu, 25 Jan 2024 21:37:05 +0100
Subject: [PATCH] Replace distutils.sysconfig with sysconfig
Upstream-Status: Backport
[https://github.com/OpenSCAP/openscap/commit/9a8e01f8421f92f40b4cbff6cf055538e9a0b0ae]
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
docs/developer/developer.adoc | 2 +-
swig/python3/CMakeLists.txt | 2 +-
utils/CMakeLists.txt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/developer/developer.adoc b/docs/developer/developer.adoc
index 77c6d5161..e923069cc 100644
--- a/docs/developer/developer.adoc
+++ b/docs/developer/developer.adoc
@@ -113,7 +113,7 @@ On Ubuntu 18.04 and potentially other distro, the python3 dist-packages path is
If the following command:
----
-$ python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
+$ python3 -c "import sysconfig; print(sysconfig.get_path('platlib'))"
----
returns "/usr/local/lib/python3/dist-packages" instead of a path like
diff --git a/swig/python3/CMakeLists.txt b/swig/python3/CMakeLists.txt
index 2594cf000..5f301326c 100644
--- a/swig/python3/CMakeLists.txt
+++ b/swig/python3/CMakeLists.txt
@@ -26,7 +26,7 @@ add_custom_target(python3_compile ALL DEPENDS ${PYTHON_COMPILED_FILES})
if(NOT PYTHON_SITE_PACKAGES_INSTALL_DIR)
execute_process(COMMAND
- ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}'))"
+ ${PYTHON_EXECUTABLE} -c "import sysconfig; print(sysconfig.get_path('platlib'))"
OUTPUT_VARIABLE PYTHON_SITE_PACKAGES_INSTALL_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE
)
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 93ce1f2a9..9347c2976 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -91,7 +91,7 @@ if(ENABLE_OSCAP_UTIL_DOCKER)
if(NOT PYTHON_SITE_PACKAGES_INSTALL_DIR)
execute_process(COMMAND
- ${OSCAP_DOCKER_PYTHON} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(False, False, prefix='${CMAKE_INSTALL_PREFIX}'))"
+ ${OSCAP_DOCKER_PYTHON} -c "import sysconfig; print(sysconfig.get_path('purelib'))"
OUTPUT_VARIABLE PYTHON_SITE_PACKAGES_INSTALL_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE
)
--
2.25.1
recipes-compliance/openscap/openscap_1.3.9.bb
+3 -5
View File
@@ -9,11 +9,9 @@ LICENSE = "LGPL-2.1-only"
DEPENDS = "dbus acl bzip2 pkgconfig gconf procps curl libxml2 libxslt libcap swig libpcre xmlsec1" DEPENDS = "dbus acl bzip2 pkgconfig gconf procps curl libxml2 libxslt libcap swig libpcre xmlsec1"
DEPENDS:class-native = "pkgconfig-native swig-native curl-native libxml2-native libxslt-native libcap-native libpcre-native xmlsec1-native" DEPENDS:class-native = "pkgconfig-native swig-native curl-native libxml2-native libxslt-native libcap-native libpcre-native xmlsec1-native"
#Jun 22th, 2023 #March 18th, 2024
SRCREV = "9b3e7563575f7e5b419f8a09999b40f30e3e7c29" SRCREV = "0e7f654570971c1acee6dd3f34b17121372d6152"
SRC_URI = "git://github.com/OpenSCAP/openscap.git;branch=maint-1.3;protocol=https \ SRC_URI = "git://github.com/OpenSCAP/openscap.git;branch=maint-1.3;protocol=https "
file://0001-Replace-distutils.sysconfig-with-sysconfig.patch \
"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"