diff mbox series

[meta-oe] snapper: use nonarch_libdir in FILES

Message ID 20241103221343.138008-1-f_l_k@t-online.de
State Accepted
Headers show
Series [meta-oe] snapper: use nonarch_libdir in FILES | expand

Commit Message

Markus Volk Nov. 3, 2024, 10:13 p.m. UTC
This avoids an 'installed vs.shipped' issue for multilib

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 meta-oe/recipes-support/snapper/snapper_0.11.2.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Martin Jansa Nov. 7, 2024, 6:51 a.m. UTC | #1
We might need to keep
${libdir}/pam_snapper
in FILES as pam_snapper respects configured libdir and causes:

I'm sorry that I've noticed this only after this was merged.

ERROR: QA Issue: snapper: Files/directories were installed but not
shipped in any package:
  /usr/lib64/security/pam_snapper.so
Please set FILES such that these items are packaged. Alternatively if
they are unneeded, avoid installing them or delete them within
do_install.
snapper: 1 installed and not shipped files. [installed-vs-shipped]

On Sun, Nov 3, 2024 at 11:11 PM Markus Volk via lists.openembedded.org
<f_l_k=t-online.de@lists.openembedded.org> wrote:
>
> This avoids an 'installed vs.shipped' issue for multilib
>
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> ---
>  meta-oe/recipes-support/snapper/snapper_0.11.2.bb | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta-oe/recipes-support/snapper/snapper_0.11.2.bb b/meta-oe/recipes-support/snapper/snapper_0.11.2.bb
> index 840c60730..d8987eead 100644
> --- a/meta-oe/recipes-support/snapper/snapper_0.11.2.bb
> +++ b/meta-oe/recipes-support/snapper/snapper_0.11.2.bb
> @@ -30,12 +30,12 @@ export RMBIN = "${bindir}/rm"
>  export TOUCHBIN = "${bindir}/touch"
>  export CPBIN = "${bindir}/cp"
>
> -
>  do_install:append() {
>         install -d ${D}${sysconfdir}/sysconfig
>         install -m0644 ${S}/data/default-config ${D}${sysconfdir}/sysconfig/snapper
>  }
>
> -FILES:${PN} += "${libdir}/pam_snapper ${libdir}/systemd ${libdir}/security ${datadir}"
> +FILES:${PN} += "${nonarch_libdir} ${systemd_system_unitdir} ${datadir}"
> +
>  # bash is needed for the testsuite
>  RDEPENDS:${PN} = "bash diffutils util-linux util-linux-mount"
> --
> 2.47.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#113400): https://lists.openembedded.org/g/openembedded-devel/message/113400
> Mute This Topic: https://lists.openembedded.org/mt/109375234/3617156
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [martin.jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/snapper/snapper_0.11.2.bb b/meta-oe/recipes-support/snapper/snapper_0.11.2.bb
index 840c60730..d8987eead 100644
--- a/meta-oe/recipes-support/snapper/snapper_0.11.2.bb
+++ b/meta-oe/recipes-support/snapper/snapper_0.11.2.bb
@@ -30,12 +30,12 @@  export RMBIN = "${bindir}/rm"
 export TOUCHBIN = "${bindir}/touch"
 export CPBIN = "${bindir}/cp"
 
-
 do_install:append() {
 	install -d ${D}${sysconfdir}/sysconfig
 	install -m0644 ${S}/data/default-config ${D}${sysconfdir}/sysconfig/snapper
 }
 
-FILES:${PN} += "${libdir}/pam_snapper ${libdir}/systemd ${libdir}/security ${datadir}"
+FILES:${PN} += "${nonarch_libdir} ${systemd_system_unitdir} ${datadir}"
+
 # bash is needed for the testsuite
 RDEPENDS:${PN} = "bash diffutils util-linux util-linux-mount"