[oe-commits] [meta-openembedded] 01/16: ostree: Tidy FILES_${PN} using PACKAGE_BEFORE_PN
git at git.openembedded.org
git at git.openembedded.org
Tue Dec 31 08:08:27 UTC 2019
This is an automated email from the git hooks/post-receive script.
khem pushed a commit to branch master-next
in repository meta-openembedded.
commit 1ec35f4dccd31096951b7c3bfd4fdfac85f76022
Author: Alex Kiernan <alex.kiernan at gmail.com>
AuthorDate: Sun Dec 29 14:32:59 2019 +0000
ostree: Tidy FILES_${PN} using PACKAGE_BEFORE_PN
Use PACKAGE_BEFORE_PN to pick files out of the install tree before
FILES_${PN} gets there, so we can just list necessary additions rather
than everything.
Signed-off-by: Alex Kiernan <alex.kiernan at gmail.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
meta-oe/recipes-extended/ostree/ostree_2019.6.bb | 23 ++++++-----------------
1 file changed, 6 insertions(+), 17 deletions(-)
diff --git a/meta-oe/recipes-extended/ostree/ostree_2019.6.bb b/meta-oe/recipes-extended/ostree/ostree_2019.6.bb
index 19955e9..bcf511b 100644
--- a/meta-oe/recipes-extended/ostree/ostree_2019.6.bb
+++ b/meta-oe/recipes-extended/ostree/ostree_2019.6.bb
@@ -104,7 +104,7 @@ do_install_append_class-native() {
create_wrapper ${D}${bindir}/ostree OSTREE_GRUB2_EXEC="${STAGING_LIBDIR_NATIVE}/ostree/ostree-grub-generator"
}
-PACKAGES += " \
+PACKAGE_BEFORE_PN = " \
${PN}-dracut \
${PN}-grub \
${PN}-mkinitcpio \
@@ -112,22 +112,11 @@ PACKAGES += " \
${PN}-trivial-httpd \
"
-FILES_${PN} = " \
- ${bindir}/ostree \
- ${bindir}/rofiles-fuse \
- ${datadir}/${BPN} \
- ${datadir}/gir-1.0 \
- ${nonarch_libdir}/${BPN}/ostree-remount \
- ${libdir}/girepository-1.0 \
- ${libdir}/lib*${SOLIBS} \
- ${libdir}/ostree/ostree-grub-generator \
- ${libdir}/tmpfiles.d/ostree-tmpfiles.conf \
- ${sysconfdir}/ostree/remotes.d \
- ${systemd_unitdir}/system-generators/ostree-system-generator \
- ${systemd_unitdir}/system/ostree-finalize-staged.path \
- ${systemd_unitdir}/system/ostree-finalize-staged.service \
- ${systemd_unitdir}/system/ostree-remount.service \
+FILES_${PN} += " \
+ ${nonarch_libdir}/${BPN} \
${nonarch_libdir}/tmpfiles.d \
+ ${systemd_unitdir}/system \
+ ${systemd_unitdir}/system-generators \
"
FILES_${PN}-dracut = " \
${sysconfdir}/dracut.conf.d \
@@ -142,7 +131,7 @@ FILES_${PN}-mkinitcpio = " \
${libdir}/initcpio \
"
FILES_${PN}-switchroot = " \
- ${nonarch_libdir}/ostree/ostree-prepare-root \
+ ${nonarch_libdir}/${BPN}/ostree-prepare-root \
${systemd_unitdir}/system/ostree-prepare-root.service \
"
FILES_${PN}-trivial-httpd = " \
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list