Commit ba2a0cf5 authored by Yegor Yefremov's avatar Yegor Yefremov Committed by Peter Korsgaard
Browse files

usbmount: bump to 0.0.22 



FSTYPE detection bug was fixed upstream, so delete relevant patch

Signed-off-by: default avatarYegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 2c103509

package/usbmount/usbmount-fstype-detection-fix.patch

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
newer blkid version shows two parameter with TYPE within:



/dev/sda1: VERSION="0.0" TYPE="ext2" USAGE="filesystem" PART_ENTRY_SCHEME="dos"

PART_ENTRY_TYPE="0xc" PART_ENTRY_FLAGS="0x80" PART_ENTRY_NUMBER="1"



change regular expression to take " TYPE" only



Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>

---

 usbmount |    2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)



Index: b/usbmount

===================================================================

--- a/usbmount

+++ b/usbmount

@@ -88,7 +88,7 @@

     #   FIXME: improvement: implement mounting by label (notice that labels

     #   can contain spaces, which makes things a little bit less comfortable).

     DEVINFO=$(/sbin/blkid -p $DEVNAME)

-    FSTYPE=$(echo "$DEVINFO" | sed 's/.*TYPE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')

+    FSTYPE=$(echo "$DEVINFO" | sed 's/.* TYPE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')

     UUID=$(echo "$DEVINFO"   | sed 's/.*UUID="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')

     USAGE=$(echo "$DEVINFO"  | sed 's/.*USAGE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')

package/usbmount/usbmount.mk

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# usbmount

#

#############################################################

USBMOUNT_VERSION = 0.0.21

USBMOUNT_VERSION = 0.0.22

USBMOUNT_SOURCE = usbmount_$(USBMOUNT_VERSION).tar.gz

USBMOUNT_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/u/usbmount

USBMOUNT_DEPENDENCIES = udev lockfile-progs util-linux