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@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Alex Kiernan
2019-12-29 14:32:59 +00:00
committed by Khem Raj
parent a721c091a8
commit 1ec35f4dcc
@@ -104,7 +104,7 @@ do_install_append_class-native() {
create_wrapper ${D}${bindir}/ostree OSTREE_GRUB2_EXEC="${STAGING_LIBDIR_NATIVE}/ostree/ostree-grub-generator" create_wrapper ${D}${bindir}/ostree OSTREE_GRUB2_EXEC="${STAGING_LIBDIR_NATIVE}/ostree/ostree-grub-generator"
} }
PACKAGES += " \ PACKAGE_BEFORE_PN = " \
${PN}-dracut \ ${PN}-dracut \
${PN}-grub \ ${PN}-grub \
${PN}-mkinitcpio \ ${PN}-mkinitcpio \
@@ -112,22 +112,11 @@ PACKAGES += " \
${PN}-trivial-httpd \ ${PN}-trivial-httpd \
" "
FILES_${PN} = " \ FILES_${PN} += " \
${bindir}/ostree \ ${nonarch_libdir}/${BPN} \
${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 \
${nonarch_libdir}/tmpfiles.d \ ${nonarch_libdir}/tmpfiles.d \
${systemd_unitdir}/system \
${systemd_unitdir}/system-generators \
" "
FILES_${PN}-dracut = " \ FILES_${PN}-dracut = " \
${sysconfdir}/dracut.conf.d \ ${sysconfdir}/dracut.conf.d \
@@ -142,7 +131,7 @@ FILES_${PN}-mkinitcpio = " \
${libdir}/initcpio \ ${libdir}/initcpio \
" "
FILES_${PN}-switchroot = " \ FILES_${PN}-switchroot = " \
${nonarch_libdir}/ostree/ostree-prepare-root \ ${nonarch_libdir}/${BPN}/ostree-prepare-root \
${systemd_unitdir}/system/ostree-prepare-root.service \ ${systemd_unitdir}/system/ostree-prepare-root.service \
" "
FILES_${PN}-trivial-httpd = " \ FILES_${PN}-trivial-httpd = " \