diff options
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-configure-whether-to-use-SELinux.patch | 35 | ||||
-rw-r--r-- | meta/recipes-core/base-passwd/base-passwd_3.6.2.bb (renamed from meta/recipes-core/base-passwd/base-passwd_3.6.1.bb) | 3 |
2 files changed, 1 insertions, 37 deletions
diff --git a/meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-configure-whether-to-use-SELinux.patch b/meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-configure-whether-to-use-SELinux.patch deleted file mode 100644 index 2cc6174e2a..0000000000 --- a/meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-configure-whether-to-use-SELinux.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From 25e3bf09bbbb04aa930ea0fd9f28809a24fb7194 Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Kjellerstedt <pkj@axis.com> | ||
3 | Date: Sun, 2 Oct 2022 17:47:29 +0200 | ||
4 | Subject: [PATCH] Make it possible to configure whether to use SELinux or not | ||
5 | |||
6 | Upstream-Status: Backport [https://salsa.debian.org/debian/base-passwd/-/commit/396c41bb35e03c5dcc727aa9f74218a45874ac1f] | ||
7 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | ||
8 | --- | ||
9 | configure.ac | 13 ++++++++++++- | ||
10 | 1 file changed, 12 insertions(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/configure.ac b/configure.ac | ||
13 | index 589df88..e46403b 100644 | ||
14 | --- a/configure.ac | ||
15 | +++ b/configure.ac | ||
16 | @@ -13,7 +13,18 @@ AC_SYS_LARGEFILE | ||
17 | |||
18 | dnl Scan for things we need | ||
19 | AC_CHECK_FUNCS([putgrent]) | ||
20 | -AC_CHECK_LIB([selinux], [is_selinux_enabled]) | ||
21 | + | ||
22 | +dnl Check for SELinux | ||
23 | +AC_MSG_CHECKING([whether to enable SELinux support]) | ||
24 | +AC_ARG_ENABLE([selinux], | ||
25 | + [AS_HELP_STRING([--disable-selinux], [disable support for SELinux])], | ||
26 | + [], | ||
27 | + [enable_selinux=yes]) | ||
28 | +AC_MSG_RESULT($enable_selinux) | ||
29 | +AS_IF([test "x$enable_selinux" != xno], | ||
30 | + [AC_CHECK_LIB([selinux], [is_selinux_enabled], [], | ||
31 | + [AC_MSG_ERROR( | ||
32 | + [SELinux support not available (use --disable-selinux to disable)])])]) | ||
33 | |||
34 | dnl Check for debconf | ||
35 | AC_MSG_CHECKING([whether to enable debconf support]) | ||
diff --git a/meta/recipes-core/base-passwd/base-passwd_3.6.1.bb b/meta/recipes-core/base-passwd/base-passwd_3.6.2.bb index 44bcfb0199..bb4b49e6ab 100644 --- a/meta/recipes-core/base-passwd/base-passwd_3.6.1.bb +++ b/meta/recipes-core/base-passwd/base-passwd_3.6.2.bb | |||
@@ -11,12 +11,11 @@ SRC_URI = "https://launchpad.net/debian/+archive/primary/+files/${BPN}_${PV}.tar | |||
11 | file://0003-Remove-for-root-since-we-do-not-have-an-etc-shadow.patch \ | 11 | file://0003-Remove-for-root-since-we-do-not-have-an-etc-shadow.patch \ |
12 | file://0004-Add-an-input-group-for-the-dev-input-devices.patch \ | 12 | file://0004-Add-an-input-group-for-the-dev-input-devices.patch \ |
13 | file://0005-Add-kvm-group.patch \ | 13 | file://0005-Add-kvm-group.patch \ |
14 | file://0006-Make-it-possible-to-configure-whether-to-use-SELinux.patch \ | ||
15 | file://0007-Add-wheel-group.patch \ | 14 | file://0007-Add-wheel-group.patch \ |
16 | file://0001-base-passwd-Add-the-sgx-group.patch \ | 15 | file://0001-base-passwd-Add-the-sgx-group.patch \ |
17 | " | 16 | " |
18 | 17 | ||
19 | SRC_URI[sha256sum] = "6ff369be59d586ba63c0c5fcb00f75f9953fe49db88bc6c6428f2c92866f79af" | 18 | SRC_URI[sha256sum] = "06dc78352bf38a8df76ff295e15ab5654cdefe41e62368b15bfcbbab8e4ec2a0" |
20 | 19 | ||
21 | # the package is taken from launchpad; that source is static and goes stale | 20 | # the package is taken from launchpad; that source is static and goes stale |
22 | # so we check the latest upstream from a directory that does get updated | 21 | # so we check the latest upstream from a directory that does get updated |