mirror of
https://git.yoctoproject.org/meta-security
synced 2026-07-16 15:57:21 +00:00
openscap: update to 1.3.9
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
-37
@@ -1,37 +0,0 @@
|
|||||||
From f99c3f1f516a84d33794f8e3da59adea1a12ef54 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kai Kang <kai.kang@windriver.com>
|
|
||||||
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 <kai.kang@windriver.com>
|
|
||||||
---
|
|
||||||
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
|
|
||||||
|
|
||||||
+2
-4
@@ -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"
|
DEPENDS:class-native = "pkgconfig-native swig-native curl-native libxml2-native libxslt-native libcap-native libpcre-native xmlsec1-native"
|
||||||
|
|
||||||
#Jun 22th, 2023
|
#Jun 22th, 2023
|
||||||
SRCREV = "a81c66d9bc36612dd1ca83a8c959a59e172eb4b9"
|
SRCREV = "9b3e7563575f7e5b419f8a09999b40f30e3e7c29"
|
||||||
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://0003-CMakeLists.txt-make-2-variables-configurable.patch \
|
|
||||||
"
|
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
Reference in New Issue
Block a user