[Buildroot] [PATCH] usbmount: bump to 0.0.21

[Buildroot] [PATCH] usbmount: bump to 0.0.21

[Yegor Yefremov]

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
 package/usbmount/usbmount-0.0.14.1.patch |   57 -------------------------------
 package/usbmount/usbmount.mk             |    7 ++-
 2 files changed, 4 insertions(+), 60 deletions(-)

Index: b/package/usbmount/usbmount.mk
===================================================================
--- a/package/usbmount/usbmount.mk
+++ b/package/usbmount/usbmount.mk
@@ -3,13 +3,14 @@
 # usbmount
 #
 #############################################################
-USBMOUNT_VERSION=0.0.14.1
+USBMOUNT_VERSION=0.0.21
 USBMOUNT_SOURCE:=usbmount_$(USBMOUNT_VERSION).tar.gz
-USBMOUNT_SITE:=http://usbmount.alioth.debian.org/package/
+USBMOUNT_SITE:=http://ftp.de.debian.org/debian/pool/main/u/usbmount
 USBMOUNT_DEPENDENCIES = udev lockfile-progs
 
 define USBMOUNT_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 0755 -D $(@D)/usbmount $(TARGET_DIR)/sbin/usbmount
+	$(INSTALL) -m 0755 -D $(@D)/usbmount $(TARGET_DIR)/usr/share/usbmount/usbmount
+	$(INSTALL) -m 0644 -D $(@D)/usbmount.rules $(TARGET_DIR)/lib/udev/rules.d
 	@if [ ! -f $(TARGET_DIR)/etc/usbmount/usbmount.conf ]; then \
 	        $(INSTALL) -m 0644 -D $(@D)/usbmount.conf $(TARGET_DIR)/etc/usbmount/usbmount.conf; \
 	fi
Index: b/package/usbmount/usbmount-0.0.14.1.patch
===================================================================
--- a/package/usbmount/usbmount-0.0.14.1.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -ur usbmount-0.0.14.1/usbmount usbmount-0.0.14.1-patched/usbmount
---- usbmount-0.0.14.1/usbmount	2007-01-27 05:22:14.000000000 -0600
-+++ usbmount-0.0.14.1-patched/usbmount	2007-03-15 07:25:18.000000000 -0500
-@@ -20,7 +20,7 @@
- log()
- {
-     if test $1 != debug || expr "$VERBOSE" : "[yY]" > /dev/null; then
--	logger -p user.$1 -t "usbmount[$$]" -- "$2"
-+	echo "usbmount[$$] -- $2" >> $LOGFILE
-     fi
- }
- 
-@@ -57,11 +57,11 @@
- if test "$1" = add; then
- 
-     # Acquire lock.
--    log debug "trying to acquire lock /var/run/usbmount/.mount.lock"
--    lockfile-create --retry 3 /var/run/usbmount/.mount || \
--	{ log err "cannot acquire lock /var/run/usbmount/.mount.lock"; exit 1; }
--    trap '( lockfile-remove /var/run/usbmount/.mount )' 0
--    log debug "acquired lock /var/run/usbmount/.mount.lock"
-+    log debug "trying to acquire lock /var/run/.usbmount.lock"
-+    lockfile-create --retry 5 /var/run/.usbmount || \
-+	{ log err "cannot acquire lock /var/run/.usbmount.lock"; exit 1; }
-+    trap '( lockfile-remove /var/run/.usbmount )' 0
-+    log debug "acquired lock /var/run/.usbmount.lock"
- 
-     # Try to read from the device.  Some devices need a few seconds
-     # initialization time before they can be accessed.  Give up after
-@@ -184,6 +184,7 @@
- 		log info "executing command: run-parts /etc/usbmount/umount.d"
- 		run-parts /etc/usbmount/umount.d || :
- 	    fi
-+	    lockfile-remove /var/run/.usbmount
- 	    break
- 	fi
-     done < /proc/mounts
-diff -ur usbmount-0.0.14.1/usbmount.conf usbmount-0.0.14.1-patched/usbmount.conf
---- usbmount-0.0.14.1/usbmount.conf	2005-04-08 09:05:10.000000000 -0500
-+++ usbmount-0.0.14.1-patched/usbmount.conf	2007-03-15 07:21:33.000000000 -0500
-@@ -17,7 +17,7 @@
- # sure all data is written to the medium before you remove it (e.g. run the #
- # "sync" command in a terminal window).  Otherwise, you *WILL* lose data!   #
- #############################################################################
--FILESYSTEMS="ext2 ext3"
-+FILESYSTEMS="ext2 ext3 msdos vfat"
- 
- # Mount options: Options passed to the mount command with the -o flag.
- # WARNING!  Removing "sync" from the options is a very bad idea and
-@@ -35,3 +35,7 @@
- # If set to "yes", more information will be logged via the syslog
- # facility.
- VERBOSE="no"
-+
-+# Location of the log file when verbose is Yes
-+LOGFILE="/var/log/usbmount.log"
-+

[Buildroot] [PATCH] usbmount: bump to 0.0.21

[Peter Korsgaard]

>>>>> "Yegor" == Yegor Yefremov <yegor_sub1@visionsystems.de> writes:

 Yegor> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
 Yegor> ---
 Yegor>  package/usbmount/usbmount-0.0.14.1.patch |   57 -------------------------------
 Yegor>  package/usbmount/usbmount.mk             |    7 ++-
 Yegor>  2 files changed, 4 insertions(+), 60 deletions(-)

Committed with some changes, thanks.

First of all you forgot to remove the BR2_PACKAGE_UDEV_VOLUME_ID select,
which was the reason for the version bump in the first place.

 Yegor> Index: b/package/usbmount/usbmount.mk
 Yegor> ===================================================================
 Yegor> --- a/package/usbmount/usbmount.mk
 Yegor> +++ b/package/usbmount/usbmount.mk
 Yegor> @@ -3,13 +3,14 @@
 Yegor>  # usbmount
 Yegor>  #
 Yegor>  #############################################################
 Yegor> -USBMOUNT_VERSION=0.0.14.1
 Yegor> +USBMOUNT_VERSION=0.0.21
 Yegor>  USBMOUNT_SOURCE:=usbmount_$(USBMOUNT_VERSION).tar.gz
 Yegor> -USBMOUNT_SITE:=http://usbmount.alioth.debian.org/package/
 Yegor> +USBMOUNT_SITE:=http://ftp.de.debian.org/debian/pool/main/u/usbmount

We have a BR2_DEBIAN_MIRROR setting that should be used.


 Yegor>  USBMOUNT_DEPENDENCIES = udev lockfile-progs
 
 Yegor>  define USBMOUNT_INSTALL_TARGET_CMDS
 Yegor> -	$(INSTALL) -m 0755 -D $(@D)/usbmount $(TARGET_DIR)/sbin/usbmount
 Yegor> +	$(INSTALL) -m 0755 -D $(@D)/usbmount $(TARGET_DIR)/usr/share/usbmount/usbmount
 Yegor> +	$(INSTALL) -m 0644 -D $(@D)/usbmount.rules $(TARGET_DIR)/lib/udev/rules.d

You need to provide the destination file name when you use install -D


 Yegor>  	@if [ ! -f $(TARGET_DIR)/etc/usbmount/usbmount.conf ]; then \
 Yegor>  	        $(INSTALL) -m 0644 -D $(@D)/usbmount.conf $(TARGET_DIR)/etc/usbmount/usbmount.conf; \
 Yegor>  	fi

You forgot to update the uninstall step.

The script uses blkid, which we currently don't have enabled in the
default busybox config. I'll fix that.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH] usbmount: bump to 0.0.21

[Yegor Yefremov]

On Thu, Jul 21, 2011 at 10:39 PM, Peter Korsgaard <jacmet@uclibc.org> wrote:
>>>>>> "Yegor" == Yegor Yefremov <yegor_sub1@visionsystems.de> writes:
>
> ?Yegor> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
> ?Yegor> ---
> ?Yegor> ?package/usbmount/usbmount-0.0.14.1.patch | ? 57 -------------------------------
> ?Yegor> ?package/usbmount/usbmount.mk ? ? ? ? ? ? | ? ?7 ++-
> ?Yegor> ?2 files changed, 4 insertions(+), 60 deletions(-)
>
> Committed with some changes, thanks.
>
> First of all you forgot to remove the BR2_PACKAGE_UDEV_VOLUME_ID select,
> which was the reason for the version bump in the first place.
>
> ?Yegor> Index: b/package/usbmount/usbmount.mk
> ?Yegor> ===================================================================
> ?Yegor> --- a/package/usbmount/usbmount.mk
> ?Yegor> +++ b/package/usbmount/usbmount.mk
> ?Yegor> @@ -3,13 +3,14 @@
> ?Yegor> ?# usbmount
> ?Yegor> ?#
> ?Yegor> ?#############################################################
> ?Yegor> -USBMOUNT_VERSION=0.0.14.1
> ?Yegor> +USBMOUNT_VERSION=0.0.21
> ?Yegor> ?USBMOUNT_SOURCE:=usbmount_$(USBMOUNT_VERSION).tar.gz
> ?Yegor> -USBMOUNT_SITE:=http://usbmount.alioth.debian.org/package/
> ?Yegor> +USBMOUNT_SITE:=http://ftp.de.debian.org/debian/pool/main/u/usbmount
>
> We have a BR2_DEBIAN_MIRROR setting that should be used.
>
>
> ?Yegor> ?USBMOUNT_DEPENDENCIES = udev lockfile-progs
>
> ?Yegor> ?define USBMOUNT_INSTALL_TARGET_CMDS
> ?Yegor> - ? ? ? $(INSTALL) -m 0755 -D $(@D)/usbmount $(TARGET_DIR)/sbin/usbmount
> ?Yegor> + ? ? ? $(INSTALL) -m 0755 -D $(@D)/usbmount $(TARGET_DIR)/usr/share/usbmount/usbmount
> ?Yegor> + ? ? ? $(INSTALL) -m 0644 -D $(@D)/usbmount.rules $(TARGET_DIR)/lib/udev/rules.d
>
> You need to provide the destination file name when you use install -D
>
>
> ?Yegor> ? ? ? ? @if [ ! -f $(TARGET_DIR)/etc/usbmount/usbmount.conf ]; then \
> ?Yegor> ? ? ? ? ? ? ? ? $(INSTALL) -m 0644 -D $(@D)/usbmount.conf $(TARGET_DIR)/etc/usbmount/usbmount.conf; \
> ?Yegor> ? ? ? ? fi
>
> You forgot to update the uninstall step.
>
> The script uses blkid, which we currently don't have enabled in the
> default busybox config. I'll fix that.

Peter, sorry for the unfinished patch. It was more intended so solve
the problems I pointed out in my answer to the udev patch.

"The usbmount.mk file is not installing the usbmount.rules file, so
udev knows nothing about this script. I bumped the package to the
newest version and instructed the installer to put rules files to
/lib/udev/rules.d/ but still it is not working. I'm not the biggest
udev expert yet, so if someone could take a look at the patch I will
send, it would really help. The package itself should depend on
util-linux, so it has nothing to do with volume_id any more."

busybox's blkid won't help, cause it doesn't provide enough info for
the script. Or do I see it wrong. So we need util-linx to do the job.
I've also sent a patch to bump to e newer version. I'm trying to
understand how usbmount work in Debian, perhaps I'll find out, what
I'm missing.

Yegor

[Buildroot] [PATCH] usbmount: bump to 0.0.21

[Yegor Yefremov]

On Thu, Jul 21, 2011 at 11:27 PM, Yegor Yefremov
<yegorslists@googlemail.com> wrote:
> On Thu, Jul 21, 2011 at 10:39 PM, Peter Korsgaard <jacmet@uclibc.org> wrote:
>>>>>>> "Yegor" == Yegor Yefremov <yegor_sub1@visionsystems.de> writes:
>>
>> ?Yegor> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
>> ?Yegor> ---
>> ?Yegor> ?package/usbmount/usbmount-0.0.14.1.patch | ? 57 -------------------------------
>> ?Yegor> ?package/usbmount/usbmount.mk ? ? ? ? ? ? | ? ?7 ++-
>> ?Yegor> ?2 files changed, 4 insertions(+), 60 deletions(-)
>>
>> Committed with some changes, thanks.
>>
>> First of all you forgot to remove the BR2_PACKAGE_UDEV_VOLUME_ID select,
>> which was the reason for the version bump in the first place.
>>
>> ?Yegor> Index: b/package/usbmount/usbmount.mk
>> ?Yegor> ===================================================================
>> ?Yegor> --- a/package/usbmount/usbmount.mk
>> ?Yegor> +++ b/package/usbmount/usbmount.mk
>> ?Yegor> @@ -3,13 +3,14 @@
>> ?Yegor> ?# usbmount
>> ?Yegor> ?#
>> ?Yegor> ?#############################################################
>> ?Yegor> -USBMOUNT_VERSION=0.0.14.1
>> ?Yegor> +USBMOUNT_VERSION=0.0.21
>> ?Yegor> ?USBMOUNT_SOURCE:=usbmount_$(USBMOUNT_VERSION).tar.gz
>> ?Yegor> -USBMOUNT_SITE:=http://usbmount.alioth.debian.org/package/
>> ?Yegor> +USBMOUNT_SITE:=http://ftp.de.debian.org/debian/pool/main/u/usbmount
>>
>> We have a BR2_DEBIAN_MIRROR setting that should be used.
>>
>>
>> ?Yegor> ?USBMOUNT_DEPENDENCIES = udev lockfile-progs
>>
>> ?Yegor> ?define USBMOUNT_INSTALL_TARGET_CMDS
>> ?Yegor> - ? ? ? $(INSTALL) -m 0755 -D $(@D)/usbmount $(TARGET_DIR)/sbin/usbmount
>> ?Yegor> + ? ? ? $(INSTALL) -m 0755 -D $(@D)/usbmount $(TARGET_DIR)/usr/share/usbmount/usbmount
>> ?Yegor> + ? ? ? $(INSTALL) -m 0644 -D $(@D)/usbmount.rules $(TARGET_DIR)/lib/udev/rules.d
>>
>> You need to provide the destination file name when you use install -D
>>
>>
>> ?Yegor> ? ? ? ? @if [ ! -f $(TARGET_DIR)/etc/usbmount/usbmount.conf ]; then \
>> ?Yegor> ? ? ? ? ? ? ? ? $(INSTALL) -m 0644 -D $(@D)/usbmount.conf $(TARGET_DIR)/etc/usbmount/usbmount.conf; \
>> ?Yegor> ? ? ? ? fi
>>
>> You forgot to update the uninstall step.
>>
>> The script uses blkid, which we currently don't have enabled in the
>> default busybox config. I'll fix that.
>
> Peter, sorry for the unfinished patch. It was more intended so solve
> the problems I pointed out in my answer to the udev patch.
>
> "The usbmount.mk file is not installing the usbmount.rules file, so
> udev knows nothing about this script. I bumped the package to the
> newest version and instructed the installer to put rules files to
> /lib/udev/rules.d/ but still it is not working. I'm not the biggest
> udev expert yet, so if someone could take a look at the patch I will
> send, it would really help. The package itself should depend on
> util-linux, so it has nothing to do with volume_id any more."
>
> busybox's blkid won't help, cause it doesn't provide enough info for
> the script. Or do I see it wrong. So we need util-linx to do the job.
> I've also sent a patch to bump to e newer version. I'm trying to
> understand how usbmount work in Debian, perhaps I'll find out, what
> I'm missing.

I've found some issues with usbmount script and newest util-linux
blkid. Will try to fix them.

udev has also some issues, so I'll repost the patches next week.

Yegor

[Buildroot] [PATCH] usbmount: bump to 0.0.21

[Peter Korsgaard]

>>>>> "Yegor" == Yegor Yefremov <yegorslists@googlemail.com> writes:

Hi,

 Yegor> I've found some issues with usbmount script and newest
 Yegor> util-linux blkid. Will try to fix them.

 Yegor> udev has also some issues, so I'll repost the patches next week.

Ok, thanks.

-- 
Bye, Peter Korsgaard