Skip to contentSkip to conversation

usbmount: bump to 0.0.21

PATCH New Yegor Yefremov 3 participants 5 messages Jul 20, 2011 – Jul 22, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usbmount: bump to 0.0.21

---
 package/usbmount/usbmount-0.0.14.1.patch |   57 -------------------------------
 package/usbmount/usbmount.mk             |    7 ++-
 2 files changed, 4 insertions(+), 60 deletions(-)
package/usbmount/usbmount.mk +4 -3
Index: 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
package/usbmount/usbmount-0.0.14.1.patch deleted +0 -57

57 lines not on this page · raw message

#1 lore raw

PATCH 1/1 usbmount: bump to 0.0.21

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yegor" == Yegor Yefremov <[email protected]> writes:

Yegor> Signed-off-by: Yegor Yefremov <[email protected]> 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.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 usbmount: bump to 0.0.21

Quoted 40 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yegor" == Yegor Yefremov <[email protected]> writes:

?Yegor> Signed-off-by: Yegor Yefremov <[email protected]>
?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

Quoted 8 lines

?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

#3 lore raw

PATCH 1/1 usbmount: bump to 0.0.21

Quoted 61 lines · Yegor Yefremov
Quoted 40 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yegor" == Yegor Yefremov <[email protected]> writes:

?Yegor> Signed-off-by: Yegor Yefremov <[email protected]>
?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

Quoted 8 lines

?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."

Quoted 5 lines

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

#4 lore raw

PATCH 1/1 usbmount: bump to 0.0.21

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yegor" == Yegor Yefremov <[email protected]> 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.

Signature · 1 line
Bye, Peter Korsgaard