diff options
Diffstat (limited to 'external/poky/meta/recipes-core/udev')
| -rw-r--r-- | external/poky/meta/recipes-core/udev/eudev_3.2.9.bb (renamed from external/poky/meta/recipes-core/udev/eudev_3.2.7.bb) | 8 | ||||
| -rw-r--r-- | external/poky/meta/recipes-core/udev/udev-extraconf/mount.sh | 10 |
2 files changed, 14 insertions, 4 deletions
diff --git a/external/poky/meta/recipes-core/udev/eudev_3.2.7.bb b/external/poky/meta/recipes-core/udev/eudev_3.2.9.bb index 1bea4ebd..f96f8cbe 100644 --- a/external/poky/meta/recipes-core/udev/eudev_3.2.7.bb +++ b/external/poky/meta/recipes-core/udev/eudev_3.2.9.bb @@ -8,7 +8,7 @@ DEPENDS = "glib-2.0 glib-2.0-native gperf-native kmod libxslt-native util-linux" PROVIDES = "udev" -SRC_URI = "http://dev.gentoo.org/~blueness/${BPN}/${BP}.tar.gz \ +SRC_URI = "https://dev.gentoo.org/~blueness/${BPN}/${BP}.tar.gz \ file://0014-Revert-rules-remove-firmware-loading-rules.patch \ file://Revert-udev-remove-userspace-firmware-loading-suppor.patch \ file://devfs-udev.rules \ @@ -20,10 +20,10 @@ SRC_URI = "http://dev.gentoo.org/~blueness/${BPN}/${BP}.tar.gz \ file://udev.rules \ " -SRC_URI[md5sum] = "c75d99910c1791dd9430d26ab76059c0" -SRC_URI[sha256sum] = "3004614bd253c1f98558460215027aaf60d7592c70be27fd384ec01db87bf062" +SRC_URI[md5sum] = "dedfb1964f6098fe9320de827957331f" +SRC_URI[sha256sum] = "89618619084a19e1451d373c43f141b469c9fd09767973d73dd268b92074d4fc" -inherit autotools update-rc.d qemu pkgconfig distro_features_check +inherit autotools update-rc.d qemu pkgconfig features_check CONFLICT_DISTRO_FEATURES = "systemd" diff --git a/external/poky/meta/recipes-core/udev/udev-extraconf/mount.sh b/external/poky/meta/recipes-core/udev/udev-extraconf/mount.sh index 3ee67b13..b2373187 100644 --- a/external/poky/meta/recipes-core/udev/udev-extraconf/mount.sh +++ b/external/poky/meta/recipes-core/udev/udev-extraconf/mount.sh @@ -38,6 +38,12 @@ done automount_systemd() { name="`basename "$DEVNAME"`" + # Skip already mounted partitions + if [ -f /run/systemd/transient/run-media-$name.mount ]; then + logger "mount.sh/automount" "/run/media/$name already mounted" + return + fi + # Skip the partition which are already in /etc/fstab grep "^[[:space:]]*$DEVNAME" /etc/fstab && return for n in LABEL PARTLABEL UUID PARTUUID; do @@ -57,6 +63,8 @@ automount_systemd() { vfat|fat) MOUNT="$MOUNT -o umask=007,gid=`awk -F':' '/^disk/{print $3}' /etc/group`" ;; + swap) + return ;; # TODO *) ;; @@ -98,6 +106,8 @@ automount() { vfat|fat) MOUNT="$MOUNT -o umask=007,gid=`awk -F':' '/^disk/{print $3}' /etc/group`" ;; + swap) + return ;; # TODO *) ;; |