diff options
| author | John Klug <john.klug@multitech.com> | 2017-08-16 16:01:13 -0500 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2017-08-16 16:01:13 -0500 |
| commit | 41b0a8e202a1ed05bdf061eb33d0bf3c18d61106 (patch) | |
| tree | d7b0e0bb538e8b73d151ee2a15b3b1180a6f8773 /recipes-core/base-files | |
| parent | 82766143f4e215475517dc7d28e44d0363f58828 (diff) | |
| download | meta-mlinux-41b0a8e202a1ed05bdf061eb33d0bf3c18d61106.tar.gz meta-mlinux-41b0a8e202a1ed05bdf061eb33d0bf3c18d61106.tar.bz2 meta-mlinux-41b0a8e202a1ed05bdf061eb33d0bf3c18d61106.zip | |
Upward compatibility for udev and /media
Diffstat (limited to 'recipes-core/base-files')
| -rw-r--r-- | recipes-core/base-files/base-files/mlinux/fstab (renamed from recipes-core/base-files/base-files/mtcap/fstab) | 0 | ||||
| -rw-r--r-- | recipes-core/base-files/base-files/mtcdt/fstab | 12 | ||||
| -rw-r--r-- | recipes-core/base-files/base-files_3.0.14.bbappend | 12 |
3 files changed, 7 insertions, 17 deletions
diff --git a/recipes-core/base-files/base-files/mtcap/fstab b/recipes-core/base-files/base-files/mlinux/fstab index 01b5f38..01b5f38 100644 --- a/recipes-core/base-files/base-files/mtcap/fstab +++ b/recipes-core/base-files/base-files/mlinux/fstab diff --git a/recipes-core/base-files/base-files/mtcdt/fstab b/recipes-core/base-files/base-files/mtcdt/fstab deleted file mode 100644 index ed71d2f..0000000 --- a/recipes-core/base-files/base-files/mtcdt/fstab +++ /dev/null @@ -1,12 +0,0 @@ -rootfs / auto defaults 1 1 -proc /proc proc defaults 0 0 -devpts /dev/pts devpts mode=0620,gid=5 0 0 -usbdevfs /proc/bus/usb usbdevfs noauto 0 0 -tmpfs /run tmpfs mode=0755,nodev,nosuid,strictatime 0 0 -tmpfs /var/volatile tmpfs defaults 0 0 - -/dev/mtdblock6 /var/config jffs2 defaults 0 0 -/dev/mtdblock7 /var/oem jffs2 defaults,ro 0 0 - -# SD card -/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 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 b9a4231..d7431ad 100644 --- a/recipes-core/base-files/base-files_3.0.14.bbappend +++ b/recipes-core/base-files/base-files_3.0.14.bbappend @@ -1,7 +1,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +PR = "m1" -media_card="/media/card" -media_card_mtcap="" - -# add SD card dir -dirs755_append = " ${media_card}" +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 +} |