From b00be59bbc49535097c450b6b8c5fc10c1efd6dd Mon Sep 17 00:00:00 2001 From: John Klug Date: Wed, 11 Nov 2020 18:48:27 -0600 Subject: Merge multiarch project to: added missing index file 2020 June 11 --- recipes-core/base-files/base-files_3.0.14.bbappend | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'recipes-core/base-files/base-files_3.0.14.bbappend') diff --git a/recipes-core/base-files/base-files_3.0.14.bbappend b/recipes-core/base-files/base-files_3.0.14.bbappend index d7431ad..3ff14ba 100644 --- a/recipes-core/base-files/base-files_3.0.14.bbappend +++ b/recipes-core/base-files/base-files_3.0.14.bbappend @@ -1,9 +1,17 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PR = "m1" +PR = "m2" + +CONFFILES_${PN}_remove = "${sysconfdir}/fstab" +FILES_${PN}_remove = "${sysconfdir}/fstab" do_install_append() { if [ -d ${D}/media ] ; then rmdir ${D}/media # So the next line does not nest the media link inside of media fi ln -snf /run/media ${D}/media + set -x + if [ -f ${D}/${sysconfdir}/fstab ] ; then + rm ${D}/${sysconfdir}/fstab + fi + set +x } -- cgit v1.2.3