diff options
| author | Jeff Hatch <jhatch@multitech.com> | 2020-06-04 14:22:33 -0500 |
|---|---|---|
| committer | Jeff Hatch <jhatch@multitech.com> | 2020-06-04 14:22:33 -0500 |
| commit | 44b321b521cf857f6cf3cd8bb7ba8baf8dae1182 (patch) | |
| tree | bc36b243d8f4ef9535c7c500b9ffcb96885df61e /recipes-core/base-files/base-files_3.0.14.bbappend | |
| parent | 683182b8eb2fa4cee10369d068d88084864d8be9 (diff) | |
| parent | 432af19f672a64228e1b70b0b25abb5a0ee7ee30 (diff) | |
| download | meta-mlinux-44b321b521cf857f6cf3cd8bb7ba8baf8dae1182.tar.gz meta-mlinux-44b321b521cf857f6cf3cd8bb7ba8baf8dae1182.tar.bz2 meta-mlinux-44b321b521cf857f6cf3cd8bb7ba8baf8dae1182.zip | |
Merge branch 'test-split'
Merge changes for the move to Yocto Thud
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 } |