From c98e9828a2feceeed8c193cf1e5e13e719b43f0e Mon Sep 17 00:00:00 2001 From: Michael Mrozek Date: Mon, 7 Mar 2011 01:21:18 +0100 Subject: [PATCH] mount.sh: Changed rmdir back to rm -r, as it caused troubles with SD Card naming --- recipes/udev/files/omap3-pandora/mount.sh | 2 +- recipes/udev/udev-151/omap3-pandora/mount.sh | 2 +- recipes/udev/udev_151.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/udev/files/omap3-pandora/mount.sh b/recipes/udev/files/omap3-pandora/mount.sh index 6ae14207f5..21440eeca4 100644 --- a/recipes/udev/files/omap3-pandora/mount.sh +++ b/recipes/udev/files/omap3-pandora/mount.sh @@ -36,7 +36,7 @@ rm_dir() { # We do not want to rm -r populated directories if test "`find "$1" | wc -l | tr -d " "`" -lt 2 -a -d "$1" then - ! test -z "$1" && rmdir "$1" + ! test -z "$1" && rm -r "$1" else logger "mount.sh/automount" "Not removing non-empty directory [$1]" fi diff --git a/recipes/udev/udev-151/omap3-pandora/mount.sh b/recipes/udev/udev-151/omap3-pandora/mount.sh index dcca1f2cbe..f29df04cee 100755 --- a/recipes/udev/udev-151/omap3-pandora/mount.sh +++ b/recipes/udev/udev-151/omap3-pandora/mount.sh @@ -52,7 +52,7 @@ rm_dir() { # We do not want to rm -r populated directories if test "`find "$1" | wc -l | tr -d " "`" -lt 2 -a -d "$1" then - ! test -z "$1" && rmdir "$1" + ! test -z "$1" && rm -r "$1" else logger "mount.sh/automount" "Not removing non-empty directory [$1]" fi diff --git a/recipes/udev/udev_151.bb b/recipes/udev/udev_151.bb index 62805c22bc..89f98312dd 100644 --- a/recipes/udev/udev_151.bb +++ b/recipes/udev/udev_151.bb @@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod the hotplug package and requires a kernel not older than 2.6.12." LICENSE = "GPLv2+" -PR = "r18" +PR = "r19" # Untested DEFAULT_PREFERENCE = "-1" -- 2.39.5