zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kauth: simpilfy

Browse Source 
* Use builtin switch to build native tools
* Mere native/target into one recipe

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2022-09-04 22:32:39 +02:00
parent 42db6df89d
commit e67a14430b
4 changed files with 27 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
recipes-kde/kf5/tier2/kauth/files/0001-Force-build-of-kauth-policy-gen-for-native-build.patch
View File

@@ -1,66 +0,0 @@
From d9f5af1ef8fd0dbeca62e553a7f4974f713c93cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Mon, 11 Dec 2017 19:49:13 +0100
Subject: [PATCH] Force build of kauth-policy-gen for native build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/CMakeLists.txt | 4 ++--
src/ConfigureChecks.cmake | 14 ++++----------
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2676316..822c573 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -122,7 +122,7 @@ endif()
# Compile only if fake backend has not been selected
-if (NOT "${KAUTH_BACKEND_NAME}" STREQUAL "FAKE")
+if (True)
# KAUTH_POLICY_GEN_SRCS has been generated from ConfigureChecks.cmake
add_executable(kauth-policy-gen ${KAUTH_POLICY_GEN_SRCS})
add_executable(KF5::kauth-policy-gen ALIAS kauth-policy-gen)
@@ -134,7 +134,7 @@ if (NOT "${KAUTH_BACKEND_NAME}" STREQUAL "FAKE")
# KAUTH_POLICY_GEN_LIBRARIES has been generated from ConfigureChecks.cmake
target_link_libraries( kauth-policy-gen PRIVATE ${KAUTH_POLICY_GEN_LIBRARIES} )
- install( TARGETS kauth-policy-gen EXPORT KF5AuthToolsTargets DESTINATION ${KAUTH_HELPER_INSTALL_DIR})
+ install( TARGETS kauth-policy-gen DESTINATION ${KAUTH_HELPER_INSTALL_DIR})
endif ()
# KAuth backend plugin
diff --git a/src/ConfigureChecks.cmake b/src/ConfigureChecks.cmake
index 49658f3..65ad31f 100644
--- a/src/ConfigureChecks.cmake
+++ b/src/ConfigureChecks.cmake
@@ -117,16 +117,10 @@ set(KAUTH_POLICY_GEN_SRCS
policy-gen/policy-gen.cpp)
set(KAUTH_POLICY_GEN_LIBRARIES)
-if(KAUTH_BACKEND_NAME STREQUAL "OSX")
- set(KAUTH_POLICY_GEN_SRCS ${KAUTH_POLICY_GEN_SRCS}
- backends/mac/kauth-policy-gen-mac.cpp)
- set(KAUTH_POLICY_GEN_LIBRARIES ${KAUTH_POLICY_GEN_LIBRARIES} ${CORE_FOUNDATION_LIBRARY} ${SECURITY_LIBRARY} Qt${QT_MAJOR_VERSION}::Core)
-elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT${QT_MAJOR_VERSION}-1")
- set(KAUTH_POLICY_GEN_SRCS ${KAUTH_POLICY_GEN_SRCS}
- backends/polkit-1/kauth-policy-gen-polkit1.cpp)
- set(KAUTH_POLICY_GEN_LIBRARIES ${KAUTH_POLICY_GEN_LIBRARIES}
- Qt${QT_MAJOR_VERSION}::Core)
-endif()
+set(KAUTH_POLICY_GEN_SRCS ${KAUTH_POLICY_GEN_SRCS}
+ backends/polkit-1/kauth-policy-gen-polkit1.cpp)
+set(KAUTH_POLICY_GEN_LIBRARIES ${KAUTH_POLICY_GEN_LIBRARIES}
+ Qt${QT_MAJOR_VERSION}::Core)
########################
# Helper backend probing
--
2.34.1

9
recipes-kde/kf5/tier2/kauth/kauth-native.bb
View File

@@ -1,9 +0,0 @@
require ${BPN}.inc
inherit native
DEPENDS += "kcoreaddons-native"
SRC_URI += "file://0001-Force-build-of-kauth-policy-gen-for-native-build.patch"
EXTRA_OECMAKE += "-DKAUTH_BUILD_CODEGENERATOR_ONLY=ON"

32
recipes-kde/kf5/tier2/kauth/kauth.bb
View File

@@ -1,16 +1,38 @@
require ${BPN}.inc
SUMMARY = "Abstraction to system policy and authentication features"
LICENSE = "BSD-3-Clause & LGPL-2.0-or-later & LGPL-2.1-or-later"
LIC_FILES_CHKSUM = " \
file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
"
inherit cmake_lib features_check
inherit kde-kf5 cmake_lib features_check
DEPENDS += "${BPN}-native kcoreaddons polkit-qt-1"
REQUIRED_DISTRO_FEATURES:class-target = "polkit"
REQUIRED_DISTRO_FEATURES = "polkit"
EXTRA_OECMAKE += "-DKAUTH_BACKEND_NAME=POLKITQT5-1"
PV = "${KF5_VERSION}"
SRC_URI[sha256sum] = "d74dc553b3628657241d6e7129b17a38e5fd3b26b21de000390382c871ca42f5"
DEPENDS += "kcoreaddons"
DEPENDS:append:class-target = " \
${BPN}-native \
polkit-qt-1 \
"
EXTRA_OECMAKE += " \
-DAUTOTESTS=OFF \
-DKAUTH_BACKEND_NAME=POLKITQT5-1 \
"
EXTRA_OECMAKE:append:class-native = " -DKAUTH_BUILD_CODEGENERATOR_ONLY=ON"
EXTRA_OECMAKE:append:class-target = " -DKAUTH_BUILD_CODEGENERATOR_ONLY=OFF"
# executables
CMAKE_ALIGN_SYSROOT[1] = "KF5Auth, -s${_IMPORT_PREFIX}/libexec/kauth/kauth-policy-gen, -s${KDE_PATH_EXTERNAL_HOST_LIBEXECS}/kauth/kauth-policy-gen"
CMAKE_ALIGN_SYSROOT:class-native[1] = "ignore"
FILES:${PN} += " \
${datadir}/dbus-1 \
${OE_QMAKE_PATH_PLUGINS} \
"
BBCLASSEXTEND = "native"

14
recipes-kde/kf5/tier2/kauth/kauth.inc
View File

@@ -1,14 +0,0 @@
SUMMARY = "Abstraction to system policy and authentication features"
LICENSE = "BSD-3-Clause & LGPL-2.0-or-later & LGPL-2.1-or-later"
LIC_FILES_CHKSUM = " \
file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
"
inherit kde-kf5
PV = "${KF5_VERSION}"
SRC_URI[sha256sum] = "d74dc553b3628657241d6e7129b17a38e5fd3b26b21de000390382c871ca42f5"
EXTRA_OECMAKE += "-DAUTOTESTS=OFF"