diff options
| author | Jeff Hatch <jhatch@multitech.com> | 2020-06-15 12:01:01 -0500 |
|---|---|---|
| committer | Jeff Hatch <jhatch@multitech.com> | 2020-06-15 12:01:01 -0500 |
| commit | 612ffa7c85d856c9706064e62448a3debe5c3379 (patch) | |
| tree | 7ce893519ee65180783ef3c248bd04c6f3f817c5 /recipes-core/base-files/base-files_3.0.14.bbappend | |
| parent | 0a3f99fc26efa34e65d0105ae18888bd750e5ab6 (diff) | |
| parent | a117c7a2ccc99c9903764658fc3640e06ffe4661 (diff) | |
| download | meta-mlinux-612ffa7c85d856c9706064e62448a3debe5c3379.tar.gz meta-mlinux-612ffa7c85d856c9706064e62448a3debe5c3379.tar.bz2 meta-mlinux-612ffa7c85d856c9706064e62448a3debe5c3379.zip | |
Merge branch 'udev-rules-refactoring' to better reflect architecture dependencies in architecture specific layers.
Diffstat (limited to 'recipes-core/base-files/base-files_3.0.14.bbappend')
| -rw-r--r-- | recipes-core/base-files/base-files_3.0.14.bbappend | 10 |
1 files changed, 9 insertions, 1 deletions
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 } |