fvwm: Package extra files and man pages
PATCH 1/2 fvwm: Package extra files and man pages
From: Khem Raj <[email protected]>
Avoids using installed-vs-shipped
Signed-off-by Khem Raj <[email protected]>
(cherry picked from commit 566049b4f1ddc049c1f89a5838d1a71bb429faa3)
Signed-off-by Armin Kuster <[email protected]>
--- meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb +12 -6
@@ -88,6 +88,8 @@ do_install_append() { # as well) PACKAGES = " \ ${PN} \ + ${PN}-extra \ + ${PN}-doc \ ${PN}-dbg \ "
@@ -98,12 +100,16 @@ FILES_${PN} = " \ ${datadir}/fvwm/ConfigFvwmDefaults \ " -RDEPENDS_${PN} = " \ - xuser-account \ +FILES_${PN}-extra = " \ + ${bindir} \ + ${libexecdir} \ + ${sysconfdir}/xdg/fvwm \ +" +FILES_${PN}-doc = " \ + ${mandir} \ + ${datadir}/fvwm \ " -# by default a lot of stuff is installed and it's not easy to control what to -# install, so install everything, but skip the check -INSANE_SKIP_${PN} = " \ - installed-vs-shipped \ +RDEPENDS_${PN} = " \ + xuser-account \ "
Signature · 1 line
2.25.1
PATCH 2/2 fvwm: Fix build time paths in target perl/python scripts
From: Khem Raj <[email protected]>
Add rdeps as needed
Fixes shebang-size QA warnings
Signed-off-by Khem Raj <[email protected]>
(cherry picked from commit 8cc64128c70c5b6a41b050332abb1d73a10ef4fa)
Signed-off-by Armin Kuster <[email protected]>
--- meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb | 7 +++++++ 1 file changed, 7 insertions(+)
meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb +7 -0
@@ -82,6 +82,9 @@ do_install_append() { install -d -m 0755 ${D}/${datadir}/fvwm touch ${D}/${datadir}/fvwm/ConfigFvwmDefaults + sed -i -e 's:${STAGING_BINDIR_NATIVE}/perl-native/perl:${USRBINPATH}/env perl:g' ${D}${bindir}/fvwm-* + sed -i -e 's:${STAGING_BINDIR_NATIVE}/perl-native/perl:${USRBINPATH}/env perl:g' ${D}${libexecdir}/fvwm/*/Fvwm* + sed -i -e 's:${STAGING_BINDIR_NATIVE}/python3-native/python3:${USRBINPATH}/env python3:g' ${D}${bindir}/fvwm-menu-desktop } # the only needed packages (note: locale packages are automatically generated
@@ -113,3 +116,7 @@ FILES_${PN}-doc = " \ RDEPENDS_${PN} = " \ xuser-account \ " +RDEPENDS_${PN}-extra += "\ + perl \ + python3-core \ +"
Signature · 1 line
2.25.1