summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlex Stewart <alex.stewart@ni.com>2022-02-22 17:44:57 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-02-25 12:41:24 +0000
commitfc2b2c7927acc8047d71433342e73912b93405f7 (patch)
treebac7a9a6f645c4a64a0ff761ff4f512793e663d2 /meta
parent72f997c928d7bae457583331bb798cb0012fb7f0 (diff)
downloadpoky-fc2b2c7927acc8047d71433342e73912b93405f7.tar.gz
sudo: add /etc/sudoers to sudo-lib conffiles
When OE-core commit 788c95c3bb8ede0d3d6a8f125743ac47c0b3f00e created the `sudo-lib` subpackage, /etc/sudoers was moved from `sudo` to `sudo-lib`. The commit didn't update the `CONFFILES:${PN}` assignment in sudo.inc, however. So the `sudo` base package continued to advertise conffile ownership of /etc/sudoers, though it did not contain it. Move the CONFFILES assignment to the sudo.bb file, since it is packaging-related. Change the package owner to the `sudo-lib` subpackage, since it is the rightful file-owner. (From OE-Core rev: 7d688f0ece8fa7e3118cde0c79bbcc56048a2bb5) Signed-off-by: Alex Stewart <alex.stewart@ni.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/sudo/sudo.inc2
-rw-r--r--meta/recipes-extended/sudo/sudo_1.9.9.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index 05d030c2e9..8947c46129 100644
--- a/meta/recipes-extended/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
@@ -24,8 +24,6 @@ PACKAGECONFIG ??= ""
24PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" 24PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib"
25PACKAGECONFIG[pam-wheel] = ",,,pam-plugin-wheel" 25PACKAGECONFIG[pam-wheel] = ",,,pam-plugin-wheel"
26 26
27CONFFILES:${PN} = "${sysconfdir}/sudoers"
28
29EXTRA_OECONF = "--with-editor=${base_bindir}/vi --with-env-editor" 27EXTRA_OECONF = "--with-editor=${base_bindir}/vi --with-env-editor"
30 28
31EXTRA_OECONF:append:libc-musl = " --disable-hardening " 29EXTRA_OECONF:append:libc-musl = " --disable-hardening "
diff --git a/meta/recipes-extended/sudo/sudo_1.9.9.bb b/meta/recipes-extended/sudo/sudo_1.9.9.bb
index f1c0339bb3..d7d71bb364 100644
--- a/meta/recipes-extended/sudo/sudo_1.9.9.bb
+++ b/meta/recipes-extended/sudo/sudo_1.9.9.bb
@@ -48,6 +48,8 @@ do_install:append () {
48FILES:${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/*.la \ 48FILES:${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/*.la \
49 ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la" 49 ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la"
50 50
51CONFFILES:${PN}-lib = "${sysconfdir}/sudoers"
52
51SUDO_PACKAGES = "${PN}-sudo\ 53SUDO_PACKAGES = "${PN}-sudo\
52 ${PN}-lib" 54 ${PN}-lib"
53 55