summaryrefslogtreecommitdiff
path: root/recipes-core
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2017-08-16 16:01:13 -0500
committerJohn Klug <john.klug@multitech.com>2017-08-16 16:01:13 -0500
commit41b0a8e202a1ed05bdf061eb33d0bf3c18d61106 (patch)
treed7b0e0bb538e8b73d151ee2a15b3b1180a6f8773 /recipes-core
parent82766143f4e215475517dc7d28e44d0363f58828 (diff)
downloadmeta-mlinux-atmel-41b0a8e202a1ed05bdf061eb33d0bf3c18d61106.tar.gz
meta-mlinux-atmel-41b0a8e202a1ed05bdf061eb33d0bf3c18d61106.tar.bz2
meta-mlinux-atmel-41b0a8e202a1ed05bdf061eb33d0bf3c18d61106.zip
Upward compatibility for udev and /media
Diffstat (limited to 'recipes-core')
-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/fstab12
-rw-r--r--recipes-core/base-files/base-files_3.0.14.bbappend12
-rw-r--r--recipes-core/udev/udev-extraconf/mount.patch17
-rw-r--r--recipes-core/udev/udev-extraconf_%.bbappend3
5 files changed, 24 insertions, 20 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
+}
diff --git a/recipes-core/udev/udev-extraconf/mount.patch b/recipes-core/udev/udev-extraconf/mount.patch
index 5468295..16e0672 100644
--- a/recipes-core/udev/udev-extraconf/mount.patch
+++ b/recipes-core/udev/udev-extraconf/mount.patch
@@ -1,6 +1,6 @@
diff -Naru old/mount.sh new/mount.sh
---- old/mount.sh 2017-07-13 14:38:01.497487772 -0500
-+++ new/mount.sh 2017-07-19 17:18:08.749856242 -0500
+--- old/mount.sh 2017-08-16 15:14:20.386456313 -0500
++++ new/mount.sh 2017-08-16 15:21:28.898443627 -0500
@@ -4,7 +4,6 @@
#
# Attempt to mount any added block devices and umount any removed devices
@@ -9,7 +9,18 @@ diff -Naru old/mount.sh new/mount.sh
MOUNT="/bin/mount"
PMOUNT="/usr/bin/pmount"
UMOUNT="/bin/umount"
-@@ -66,7 +65,11 @@
+@@ -21,6 +20,10 @@
+ name="`basename "$DEVNAME"`"
+
+ ! test -d "/run/media/$name" && mkdir -p "/run/media/$name"
++ if [ "$name" = mmcblk0p1 ] ;
++ then
++ ln -sf /run/media/$name /run/media/card
++ fi
+ # Silent util-linux's version of mounting auto
+ if [ "x`readlink $MOUNT`" = "x/bin/mount.util-linux" ] ;
+ then
+@@ -66,7 +69,11 @@
if [ -x "$PMOUNT" ]; then
$PMOUNT $DEVNAME 2> /dev/null
elif [ -x $MOUNT ]; then
diff --git a/recipes-core/udev/udev-extraconf_%.bbappend b/recipes-core/udev/udev-extraconf_%.bbappend
index 6d4804d..708a07c 100644
--- a/recipes-core/udev/udev-extraconf_%.bbappend
+++ b/recipes-core/udev/udev-extraconf_%.bbappend
@@ -1,2 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+PR = "m1"
+
+SRC_URI += "file://mount.patch"