Signed-off-by: Armin Kuster <[email protected]> --- ...ts.txt-make-2-variables-configurable.patch | 37 ------------------- .../{openscap_1.3.8.bb => openscap_1.3.9.bb} | 6 +-- 2 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 recipes-compliance/openscap/files/0003-CMakeLists.txt-make-2-variables-configurable.patch rename recipes-compliance/openscap/{openscap_1.3.8.bb => openscap_1.3.9.bb} (95%)
diff --git a/recipes-compliance/openscap/files/0003-CMakeLists.txt-make-2-variables-configurable.patch b/recipes-compliance/openscap/files/0003-CMakeLists.txt-make-2-variables-configurable.patch deleted file mode 100644 index 953b0d9..0000000 --- a/recipes-compliance/openscap/files/0003-CMakeLists.txt-make-2-variables-configurable.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f99c3f1f516a84d33794f8e3da59adea1a12ef54 Mon Sep 17 00:00:00 2001 -From: Kai Kang <[email protected]> -Date: Tue, 20 Jun 2023 22:42:51 +0800 -Subject: [PATCH] CMakeLists.txt: make 2 variables configurable - -Variables PREFERRED_PYTHON_PATH and PYTHON3_PATH are set with -${PYTHON_EXECUTABLE}. For cross compile, ${PYTHON_EXECUTABLE} may point -to other path rather than standard dir such as /usr/bin. Then the -generated library file contains such path which should NOT. Update to -make variables PREFERRED_PYTHON_PATH and PYTHON3_PATH configurable to -avoid such issue. - -Upstream-Status: Submitted [https://github.com/OpenSCAP/openscap/pull/1990] - -Signed-off-by: Kai Kang <[email protected]> ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5db014e77..74628cdd4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -125,8 +125,8 @@ endif() - find_package(PythonInterp 3) - find_package(PythonLibs 3) - --set(PREFERRED_PYTHON_PATH "${PYTHON_EXECUTABLE}") --set(PYTHON3_PATH "${PYTHON_EXECUTABLE}") -+set(PREFERRED_PYTHON_PATH "${PYTHON_EXECUTABLE}" CACHE PATH "Path to preferred Python") -+set(PYTHON3_PATH "${PYTHON_EXECUTABLE}" CACHE PATH "Path to Python3") - - find_package(RPM) - if(RPM_FOUND) --- -2.34.1 - diff --git a/recipes-compliance/openscap/openscap_1.3.8.bb b/recipes-compliance/openscap/openscap_1.3.9.bb similarity index 95% rename from recipes-compliance/openscap/openscap_1.3.8.bb rename to recipes-compliance/openscap/openscap_1.3.9.bb index 5abd5a6..97261df 100644 --- a/recipes-compliance/openscap/openscap_1.3.8.bb +++ b/recipes-compliance/openscap/openscap_1.3.9.bb @@ -10,10 +10,8 @@ DEPENDS = "dbus acl bzip2 pkgconfig gconf procps curl libxml2 libxslt libcap swi DEPENDS:class-native = "pkgconfig-native swig-native curl-native libxml2-native libxslt-native libcap-native libpcre-native xmlsec1-native" #Jun 22th, 2023 -SRCREV = "a81c66d9bc36612dd1ca83a8c959a59e172eb4b9" -SRC_URI = "git://github.com/OpenSCAP/openscap.git;branch=maint-1.3;protocol=https \ - file://0003-CMakeLists.txt-make-2-variables-configurable.patch \ - " +SRCREV = "9b3e7563575f7e5b419f8a09999b40f30e3e7c29" +SRC_URI = "git://github.com/OpenSCAP/openscap.git;branch=maint-1.3;protocol=https" S = "${WORKDIR}/git" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#61024): https://lists.yoctoproject.org/g/yocto/message/61024 Mute This Topic: https://lists.yoctoproject.org/mt/101424343/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
