Skip to content

Commit 2d58f58

Browse files
MarkusVolkrpurdie
authored andcommitted
libsecret: add pam support depending on DISTRO_FEATURE
pam module has been ported from gnome-keyring to libsecret [https://gitlab.gnome.org/GNOME/libsecret/-/commit/9a37dc839a9be1670afeb647d9f82b6ef1cd0893] Add a PACKAGECONFIG for pam and enable it if pam is in DISTRO_FEATURES Add a patch that disables the pam test, because it would require pam_wrapper recipe [https://gitlab.com/cwrap/pam_wrapper] (From OE-Core rev: fd73530e5f7ab0309dc8931425c98e18607ddd9e) Signed-off-by: Markus Volk <[email protected]> Signed-off-by: Mathieu Dubois-Briand <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
1 parent 4d5983b commit 2d58f58

File tree

2 files changed

+74
-0
lines changed

2 files changed

+74
-0
lines changed
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
From a028d36dc7b8d0bc33e674d2a0427b171aef2d32 Mon Sep 17 00:00:00 2001
2+
From: Markus Volk <[email protected]>
3+
Date: Wed, 20 Nov 2024 16:30:07 +0100
4+
Subject: [PATCH] pam/meson.build: disable tests
5+
6+
Otherwise a recipe for pam_wrapper would be required:
7+
https://gitlab.com/cwrap/pam_wrapper
8+
9+
Signed-off-by: Markus Volk <[email protected]>
10+
11+
Upstream-Status: Inappropriate [oe-specific]
12+
---
13+
pam/meson.build | 42 +++++++++++++++++++++---------------------
14+
1 file changed, 21 insertions(+), 21 deletions(-)
15+
16+
diff --git a/pam/meson.build b/pam/meson.build
17+
index 8413b58..06d41c4 100644
18+
--- a/pam/meson.build
19+
+++ b/pam/meson.build
20+
@@ -19,27 +19,27 @@ pam_gnome_keyring = shared_library('pam_gnome_keyring',
21+
)
22+
23+
# pam tests
24+
-pam_wrapper = dependency('pam_wrapper', required: true)
25+
-libpamtest = dependency('libpamtest', required: true)
26+
+#pam_wrapper = dependency('pam_wrapper', required: true)
27+
+#libpamtest = dependency('libpamtest', required: true)
28+
29+
-subdir('servicedir')
30+
+#subdir('servicedir')
31+
32+
-test_bin = executable('pam_test',
33+
- sources: [
34+
- 'test-pam.c',
35+
- ],
36+
- dependencies: [
37+
- libpamtest,
38+
- glib_deps,
39+
- ],
40+
-)
41+
+#test_bin = executable('pam_test',
42+
+# sources: [
43+
+# 'test-pam.c',
44+
+# ],
45+
+# dependencies: [
46+
+# libpamtest,
47+
+# glib_deps,
48+
+# ],
49+
+#)
50+
51+
-test('pam-test',
52+
- test_bin,
53+
- env: {
54+
- 'LD_PRELOAD': 'libpam_wrapper.so',
55+
- 'PAM_WRAPPER': '1',
56+
- 'PAM_WRAPPER_DEBUGLEVEL': '5',
57+
- 'PAM_WRAPPER_SERVICE_DIR': meson.current_build_dir() + '/servicedir',
58+
- },
59+
-)
60+
+#test('pam-test',
61+
+# test_bin,
62+
+# env: {
63+
+# 'LD_PRELOAD': 'libpam_wrapper.so',
64+
+# 'PAM_WRAPPER': '1',
65+
+# 'PAM_WRAPPER_DEBUGLEVEL': '5',
66+
+# 'PAM_WRAPPER_SERVICE_DIR': meson.current_build_dir() + '/servicedir',
67+
+# },
68+
+#)
69+
--
70+
2.47.0
71+

meta/recipes-gnome/libsecret/libsecret_0.21.4.bb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,14 @@ inherit gnomebase gi-docgen vala gobject-introspection manpages
1313

1414
DEPENDS += "glib-2.0 libgcrypt gettext-native"
1515

16+
SRC_URI += "file://0001-pam-disable-tests.patch"
1617
SRC_URI[archive.sha256sum] = "163d08d783be6d4ab9a979ceb5a4fecbc1d9660d3c34168c581301cd53912b20"
1718

1819
GTKDOC_MESON_OPTION = 'gtk_doc'
1920

21+
PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
2022
PACKAGECONFIG[manpages] = "-Dmanpage=true,-Dmanpage=false,libxslt-native xmlto-native"
23+
PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam"
2124

2225
# http://errors.yoctoproject.org/Errors/Details/20228/
2326
ARM_INSTRUCTION_SET:armv4 = "arm"

0 commit comments

Comments
 (0)