Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] svn commit: trunk/buildroot/package/udev
@ 2006-12-01 17:49 aldot at uclibc.org
  0 siblings, 0 replies; 21+ messages in thread
From: aldot at uclibc.org @ 2006-12-01 17:49 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2006-12-01 09:49:42 -0800 (Fri, 01 Dec 2006)
New Revision: 16746

Log:
- bump version. Thanks to Petr Stetiar.


Added:
   trunk/buildroot/package/udev/udev-100.fix_makefile.patch

Modified:
   trunk/buildroot/package/udev/init-udev
   trunk/buildroot/package/udev/udev.mk


Changeset:
Modified: trunk/buildroot/package/udev/init-udev
===================================================================
--- trunk/buildroot/package/udev/init-udev	2006-12-01 16:56:12 UTC (rev 16745)
+++ trunk/buildroot/package/udev/init-udev	2006-12-01 17:49:42 UTC (rev 16746)
@@ -27,6 +27,8 @@
 test -x $UDEV_BIN || exit 5
 UDEVSTART_BIN=/sbin/udevstart
 test -x $UDEVSTART_BIN || exit 5
+UDEVD_BIN=/sbin/udevd
+test -x $UDEVD_BIN || exit 5
 
 # Check for config file and read it
 UDEV_CONFIG=/etc/udev/udev.conf
@@ -64,7 +66,10 @@
 	echo -n "Populating $udev_root using udev... "
 	$UDEVSTART_BIN || (echo "FAIL" && exit 1)
 	mkdir $udev_root/pts $udev_root/shm
+	# start daemon
+	$UDEVD_BIN --daemon || (echo "udevd FAIL" && exit 1)
 	echo "done"
+	mount -a
 	;;
     stop)
 	# do nothing

Added: trunk/buildroot/package/udev/udev-100.fix_makefile.patch
===================================================================
--- trunk/buildroot/package/udev/udev-100.fix_makefile.patch	2006-12-01 16:56:12 UTC (rev 16745)
+++ trunk/buildroot/package/udev/udev-100.fix_makefile.patch	2006-12-01 17:49:42 UTC (rev 16746)
@@ -0,0 +1,12 @@
+diff -u udev-100/Makefile udev-100.ynezz/Makefile
+--- udev-100/Makefile	2006-09-07 11:32:45.000000000 +0200
++++ udev-100.ynezz/Makefile	2006-09-18 17:35:33.000000000 +0200
+@@ -276,6 +276,8 @@
+ install-bin:
+ 	$(INSTALL) -d $(DESTDIR)$(udevdir)
+ 	$(INSTALL_PROGRAM) -D udevd $(DESTDIR)$(sbindir)/udevd
++	$(INSTALL_PROGRAM) -D udev $(DESTDIR)$(sbindir)/udev
++	$(INSTALL_PROGRAM) -D udevstart $(DESTDIR)$(sbindir)/udevstart
+ 	$(INSTALL_PROGRAM) -D udevtrigger $(DESTDIR)$(sbindir)/udevtrigger
+ 	$(INSTALL_PROGRAM) -D udevsettle $(DESTDIR)$(sbindir)/udevsettle
+ 	$(INSTALL_PROGRAM) -D udevcontrol $(DESTDIR)$(sbindir)/udevcontrol

Modified: trunk/buildroot/package/udev/udev.mk
===================================================================
--- trunk/buildroot/package/udev/udev.mk	2006-12-01 16:56:12 UTC (rev 16745)
+++ trunk/buildroot/package/udev/udev.mk	2006-12-01 17:49:42 UTC (rev 16746)
@@ -3,7 +3,7 @@
 # udev
 #
 #############################################################
-UDEV_VERSION:=094
+UDEV_VERSION:=100
 UDEV_SOURCE:=udev-$(UDEV_VERSION).tar.bz2
 UDEV_SITE:=ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
 UDEV_CAT:=$(BZCAT)
@@ -35,7 +35,7 @@
 	touch $(UDEV_DIR)/.configured
 
 $(UDEV_DIR)/$(UDEV_BINARY): $(UDEV_DIR)/.configured
-	$(MAKE) CROSS=$(TARGET_CROSS) CC=$(TARGET_CC) LD=$(TARGET_CC) \
+	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) CC=$(TARGET_CC) LD=$(TARGET_CC)\
 		CFLAGS="$(BR2_UDEV_CFLAGS)" \
 		USE_LOG=false USE_SELINUX=false \
 		udevdir=$(UDEV_ROOT) -C $(UDEV_DIR)
@@ -45,19 +45,21 @@
 # default access controls prevent non-root tasks from running.  Many of the
 # rule files rely on PROGRAM invocations (e.g. extra /etc/udev/scripts);
 # for now we'll avoid having buildroot systems rely on them.
-UDEV_CONF:=etc/udev/frugalware/udev.rules
+UDEV_CONF:=etc/udev/frugalware/*
 
 $(TARGET_DIR)/$(UDEV_TARGET_BINARY): $(UDEV_DIR)/$(UDEV_BINARY)
 	-mkdir $(TARGET_DIR)/sys
-	install -D -m 0644 $(UDEV_DIR)/$(UDEV_CONF) \
-		$(TARGET_DIR)/etc/udev/rules.d/50-udev.rules
-	$(MAKE) CROSS=$(TARGET_CROSS) CC=$(TARGET_CC) LD=$(TARGET_CC) \
+	-mkdir $(TARGET_DIR)/etc/udev/rules.d
+	$(INSTALL) -D -m 0644 $(UDEV_DIR)/$(UDEV_CONF) \
+		$(TARGET_DIR)/etc/udev/rules.d
+	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) CC=$(TARGET_CC)  LD=$(TARGET_CC) \
 		DESTDIR=$(TARGET_DIR) \
 		CFLAGS="$(BR2_UDEV_CFLAGS)" \
 		LDFLAGS="-warn-common" \
 		USE_LOG=false USE_SELINUX=false \
 		udevdir=$(UDEV_ROOT) -C $(UDEV_DIR) install
 	$(INSTALL) -m 0755 -D package/udev/init-udev $(TARGET_DIR)/etc/init.d/S10udev
+	$(INSTALL) -m 0644 -D package/udev/udev.conf $(TARGET_DIR)/etc/udev
 
 udev: uclibc $(TARGET_DIR)/$(UDEV_TARGET_BINARY)
 

^ permalink raw reply	[flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/udev
@ 2009-02-13 19:58 jacmet at uclibc.org
  0 siblings, 0 replies; 21+ messages in thread
From: jacmet at uclibc.org @ 2009-02-13 19:58 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2009-02-13 19:57:59 +0000 (Fri, 13 Feb 2009)
New Revision: 25327

Log:
udev: options for path_id and firmware.sh

Patch by Mike Crowe.

Modified:
   trunk/buildroot/package/udev/Config.in
   trunk/buildroot/package/udev/udev.mk


Changeset:
Modified: trunk/buildroot/package/udev/Config.in
===================================================================
--- trunk/buildroot/package/udev/Config.in	2009-02-13 18:57:43 UTC (rev 25326)
+++ trunk/buildroot/package/udev/Config.in	2009-02-13 19:57:59 UTC (rev 25327)
@@ -27,4 +27,15 @@
 	help
 	  Build and install SCSI disk identification library.
 
+config BR2_PACKAGE_UDEV_PATH_ID
+	bool "udev-path_id"
+	depends on BR2_PACKAGE_UDEV_VOLUME_ID
+	help
+	  Install udev's unique device path generation program path_id.
+
+config BR2_PACKAGE_UDEV_FIRMWARE_SH
+	bool "udev-firmware_sh"
+	depends on BR2_PACKAGE_UDEV_VOLUME_ID
+	help
+	  Install udev's firmware loading script firmware.sh.
 endmenu

Modified: trunk/buildroot/package/udev/udev.mk
===================================================================
--- trunk/buildroot/package/udev/udev.mk	2009-02-13 18:57:43 UTC (rev 25326)
+++ trunk/buildroot/package/udev/udev.mk	2009-02-13 19:57:59 UTC (rev 25327)
@@ -154,6 +154,54 @@
 UDEV_DIRCLEAN_DEPS+=udev-scsi_id-dirclean
 endif
 
+#####################################################################
+ifeq ($(BR2_PACKAGE_UDEV_PATH_ID),y)
+.PHONY: udev-path_id udev-path_id-clean udev-path_id-dirclean
+
+$(TARGET_DIR)/lib/udev/path_id: $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
+	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \
+		CFLAGS="$(BR2_UDEV_CFLAGS)" \
+		USE_LOG=false USE_SELINUX=false \
+		udevdir=$(UDEV_ROOT) EXTRAS="extras/path_id" -C $(UDEV_DIR)
+	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/path_id/path_id $@
+
+udev-path_id: udev $(TARGET_DIR)/lib/udev/path_id
+
+udev-path_id-clean:
+	rm -f $(TARGET_DIR)/lib/udev/path_id
+	rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/lib/udev
+
+udev-path_id-dirclean:
+	-$(MAKE) EXTRAS="extras/path_id" -C $(UDEV_DIR) clean
+
+UDEV_CLEAN_DEPS+=udev-path_id-clean
+UDEV_DIRCLEAN_DEPS+=udev-path_id-dirclean
+endif
+
+#####################################################################
+ifeq ($(BR2_PACKAGE_UDEV_FIRMWARE_SH),y)
+.PHONY: udev-firmware_sh udev-firmware_sh-clean udev-firmware_sh-dirclean
+
+$(TARGET_DIR)/lib/udev/firmware.sh: $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
+	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \
+		CFLAGS="$(BR2_UDEV_CFLAGS)" \
+		USE_LOG=false USE_SELINUX=false \
+		udevdir=$(UDEV_ROOT) EXTRAS="extras/firmware" -C $(UDEV_DIR)
+	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/firmware/firmware.sh $@
+
+udev-firmware_sh: udev $(TARGET_DIR)/lib/udev/firmware.sh
+
+udev-firmware_sh-clean:
+	rm -f $(TARGET_DIR)/lib/udev/firmware.sh
+	rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/lib/udev
+
+udev-firmware_sh-dirclean:
+	-$(MAKE) EXTRAS="extras/firmware" -C $(UDEV_DIR) clean
+
+UDEV_CLEAN_DEPS+=udev-firmware_sh-clean
+UDEV_DIRCLEAN_DEPS+=udev-firmware_sh-dirclean
+endif
+
 #############################################################
 #
 # Toplevel Makefile options
@@ -170,3 +218,11 @@
 ifeq ($(BR2_PACKAGE_UDEV_SCSI_ID),y)
 TARGETS+=udev-scsi_id
 endif
+
+ifeq ($(BR2_PACKAGE_UDEV_PATH_ID),y)
+TARGETS+=udev-path_id
+endif
+
+ifeq ($(BR2_PACKAGE_UDEV_FIRMWARE_SH),y)
+TARGETS+=udev-firmware_sh
+endif

^ permalink raw reply	[flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/udev
@ 2008-12-08 13:48 jacmet at uclibc.org
  0 siblings, 0 replies; 21+ messages in thread
From: jacmet at uclibc.org @ 2008-12-08 13:48 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2008-12-08 05:48:37 -0800 (Mon, 08 Dec 2008)
New Revision: 24323

Log:
udev: use $@ instead of hardcoding target name

Modified:
   trunk/buildroot/package/udev/udev.mk


Changeset:
Modified: trunk/buildroot/package/udev/udev.mk
===================================================================
--- trunk/buildroot/package/udev/udev.mk	2008-12-08 13:42:04 UTC (rev 24322)
+++ trunk/buildroot/package/udev/udev.mk	2008-12-08 13:48:37 UTC (rev 24323)
@@ -85,23 +85,23 @@
 		USE_LOG=false USE_SELINUX=false \
 		udevdir=$(UDEV_ROOT) EXTRAS="extras/volume_id" -C $(UDEV_DIR)
 	$(INSTALL) -m 0644 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.h $(STAGING_DIR)/usr/include/libvolume_id.h
-	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
+	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $@
 	-ln -sf libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(STAGING_DIR)/usr/lib/libvolume_id.so.0
 	-ln -sf libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(STAGING_DIR)/usr/lib/libvolume_id.so
 
 $(STAGING_DIR)/usr/lib/libvolume_id.la: $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
-	$(INSTALL) -m 0755 -D package/udev/libvolume_id.la.tmpl $(STAGING_DIR)/usr/lib/libvolume_id.la
-	$(SED) 's/REPLACE_CURRENT/$(UDEV_VOLUME_ID_CURRENT)/g' $(STAGING_DIR)/usr/lib/libvolume_id.la
-	$(SED) 's/REPLACE_AGE/$(UDEV_VOLUME_ID_AGE)/g' $(STAGING_DIR)/usr/lib/libvolume_id.la
-	$(SED) 's/REPLACE_REVISION/$(UDEV_VOLUME_ID_REVISION)/g' $(STAGING_DIR)/usr/lib/libvolume_id.la
-	$(SED) 's,REPLACE_LIB_DIR,$(STAGING_DIR)/usr/lib,g' $(STAGING_DIR)/usr/lib/libvolume_id.la
+	$(INSTALL) -m 0755 -D package/udev/libvolume_id.la.tmpl $@
+	$(SED) 's/REPLACE_CURRENT/$(UDEV_VOLUME_ID_CURRENT)/g' $@
+	$(SED) 's/REPLACE_AGE/$(UDEV_VOLUME_ID_AGE)/g' $@
+	$(SED) 's/REPLACE_REVISION/$(UDEV_VOLUME_ID_REVISION)/g' $@
+	$(SED) 's,REPLACE_LIB_DIR,$(STAGING_DIR)/usr/lib,g' $@
 
 $(TARGET_DIR)/lib/udev/vol_id: $(STAGING_DIR)/usr/lib/libvolume_id.la
 	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(TARGET_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
 	-ln -sf libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(TARGET_DIR)/usr/lib/libvolume_id.so.0
 	-ln -sf libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(TARGET_DIR)/usr/lib/libvolume_id.so
 	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
-	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/vol_id $(TARGET_DIR)/lib/udev/vol_id
+	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/vol_id $@
 
 udev-volume_id: udev $(TARGET_DIR)/lib/udev/vol_id
 
@@ -129,16 +129,16 @@
 		CFLAGS="$(BR2_UDEV_CFLAGS)" \
 		USE_LOG=false USE_SELINUX=false \
 		udevdir=$(UDEV_ROOT) EXTRAS="extras/scsi_id" -C $(UDEV_DIR)
-	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/scsi_id/scsi_id $(TARGET_DIR)/lib/udev/scsi_id
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/udev/scsi_id
+	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/scsi_id/scsi_id $@
+	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
 
 $(TARGET_DIR)/lib/udev/usb_id: $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
 	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \
 		CFLAGS="$(BR2_UDEV_CFLAGS)" \
 		USE_LOG=false USE_SELINUX=false \
 		udevdir=$(UDEV_ROOT) EXTRAS="extras/usb_id" -C $(UDEV_DIR)
-	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/usb_id/usb_id $(TARGET_DIR)/lib/udev/usb_id
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/udev/usb_id
+	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/usb_id/usb_id $@
+	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
 
 udev-scsi_id: udev $(TARGET_DIR)/lib/udev/scsi_id $(TARGET_DIR)/lib/udev/usb_id
 

^ permalink raw reply	[flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/udev
@ 2008-12-08 13:41 jacmet at uclibc.org
  0 siblings, 0 replies; 21+ messages in thread
From: jacmet at uclibc.org @ 2008-12-08 13:41 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2008-12-08 05:41:59 -0800 (Mon, 08 Dec 2008)
New Revision: 24320

Log:
package/udev: create base device nodes after mounting a new /dev

Currently, udev won't start for me, as we've just mounted a new /dev,
which is completely empty, and udevd requires a /dev/null.

This change manually creates the three base device nodes (zero, null
and console) so that udev can start.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Modified:
   trunk/buildroot/package/udev/S10udev


Changeset:
Modified: trunk/buildroot/package/udev/S10udev
===================================================================
--- trunk/buildroot/package/udev/S10udev	2008-12-08 13:41:56 UTC (rev 24319)
+++ trunk/buildroot/package/udev/S10udev	2008-12-08 13:41:59 UTC (rev 24320)
@@ -58,6 +58,9 @@
 	exit 1
 
         mkdir $udev_root/pts $udev_root/shm
+        mknod -m 0666 /dev/null c 1 3
+        mknod -m 0666 /dev/zero c 1 5
+        mknod -m 0600 /dev/console c 5 1
 
         # populate /dev (normally)
         echo -n "Populating $udev_root using udev: "

^ permalink raw reply	[flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/udev
@ 2008-12-08 13:41 jacmet at uclibc.org
  0 siblings, 0 replies; 21+ messages in thread
From: jacmet at uclibc.org @ 2008-12-08 13:41 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2008-12-08 05:41:56 -0800 (Mon, 08 Dec 2008)
New Revision: 24319

Log:
package/udev: fix CFLAGS for udev extras

If the udev extras are built without large file support in uClibc,
I get the following error:

 build_powerpc/staging_dir/usr/bin/powerpc-linux-uclibc-gcc -c -g -Wall
 -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -Wstrict-prototypes
 -Wsign-compare -Wshadow -Wchar-subscripts -Wmissing-declarations
 -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare
 -Wmissing-prototypes -Os ext.c -o ext.o
 In file included from build_powerpc/staging_dir/usr/include/stdio.h:28,
 from ext.c:19:
 build_powerpc/staging_dir/usr/include/features.h:382:4: error:
 #error It appears you have defined _FILE_OFFSET_BITS=64. Unfortunately,
 uClibc was built without large file support enabled.

Although the base udev package builds correctly, the extras pacakges
don't adjust their CFLAGS depending on BR2_LARGEFILE.

This change adds the required CFLAGS modifications to make the
extras build.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Modified:
   trunk/buildroot/package/udev/udev.mk


Changeset:
Modified: trunk/buildroot/package/udev/udev.mk
===================================================================
--- trunk/buildroot/package/udev/udev.mk	2008-12-08 13:41:53 UTC (rev 24318)
+++ trunk/buildroot/package/udev/udev.mk	2008-12-08 13:41:56 UTC (rev 24319)
@@ -81,6 +81,7 @@
 
 $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION):
 	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \
+		CFLAGS="$(BR2_UDEV_CFLAGS)" \
 		USE_LOG=false USE_SELINUX=false \
 		udevdir=$(UDEV_ROOT) EXTRAS="extras/volume_id" -C $(UDEV_DIR)
 	$(INSTALL) -m 0644 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.h $(STAGING_DIR)/usr/include/libvolume_id.h
@@ -125,6 +126,7 @@
 
 $(TARGET_DIR)/lib/udev/scsi_id: $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
 	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \
+		CFLAGS="$(BR2_UDEV_CFLAGS)" \
 		USE_LOG=false USE_SELINUX=false \
 		udevdir=$(UDEV_ROOT) EXTRAS="extras/scsi_id" -C $(UDEV_DIR)
 	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/scsi_id/scsi_id $(TARGET_DIR)/lib/udev/scsi_id
@@ -132,6 +134,7 @@
 
 $(TARGET_DIR)/lib/udev/usb_id: $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
 	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \
+		CFLAGS="$(BR2_UDEV_CFLAGS)" \
 		USE_LOG=false USE_SELINUX=false \
 		udevdir=$(UDEV_ROOT) EXTRAS="extras/usb_id" -C $(UDEV_DIR)
 	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/usb_id/usb_id $(TARGET_DIR)/lib/udev/usb_id

^ permalink raw reply	[flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/udev
@ 2008-12-08 13:41 jacmet at uclibc.org
  0 siblings, 0 replies; 21+ messages in thread
From: jacmet at uclibc.org @ 2008-12-08 13:41 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2008-12-08 05:41:53 -0800 (Mon, 08 Dec 2008)
New Revision: 24318

Log:
package/udev: fix dependency for scsi_id

According to udev.mk, the scsi_id package depends on the libvolume_id
library, so add this dependency to Config.mk

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Modified:
   trunk/buildroot/package/udev/Config.in


Changeset:
Modified: trunk/buildroot/package/udev/Config.in
===================================================================
--- trunk/buildroot/package/udev/Config.in	2008-12-08 13:12:42 UTC (rev 24317)
+++ trunk/buildroot/package/udev/Config.in	2008-12-08 13:41:53 UTC (rev 24318)
@@ -23,7 +23,7 @@
 
 config BR2_PACKAGE_UDEV_SCSI_ID
 	bool "udev-scsi_id"
-	depends on BR2_PACKAGE_UDEV
+	depends on BR2_PACKAGE_UDEV_VOLUME_ID
 	help
 	  Build and install SCSI disk identification library.
 

^ permalink raw reply	[flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/udev
@ 2008-04-06 10:35 nkukard at uclibc.org
  0 siblings, 0 replies; 21+ messages in thread
From: nkukard at uclibc.org @ 2008-04-06 10:35 UTC (permalink / raw)
  To: buildroot

Author: nkukard
Date: 2008-04-06 03:35:22 -0700 (Sun, 06 Apr 2008)
New Revision: 21654

Log:
* udev will not install if you remove project_build_*/uclibc/root and project_build_*/uclibc/.root ... this sets the dependency on the target binary so if its removed, its installed again


Modified:
   trunk/buildroot/package/udev/udev.mk


Changeset:
Modified: trunk/buildroot/package/udev/udev.mk
===================================================================
--- trunk/buildroot/package/udev/udev.mk	2008-04-06 10:32:34 UTC (rev 21653)
+++ trunk/buildroot/package/udev/udev.mk	2008-04-06 10:35:22 UTC (rev 21654)
@@ -47,8 +47,6 @@
 		LDFLAGS="-warn-common" \
 		USE_LOG=false USE_SELINUX=false \
 		udevdir=$(UDEV_ROOT) -C $(UDEV_DIR) install
-
-$(UDEV_DIR)/.target_install: $(UDEV_DIR)/$(UDEV_BINARY)
 	$(INSTALL) -m 0755 package/udev/S10udev $(TARGET_DIR)/etc/init.d
 	$(INSTALL) -m 0644 $(UDEV_DIR)/etc/udev/frugalware/* $(TARGET_DIR)/etc/udev/rules.d
 	( grep udev_root $(TARGET_DIR)/etc/udev/udev.conf > /dev/null 2>&1 || echo 'udev_root=/dev' >> $(TARGET_DIR)/etc/udev/udev.conf )
@@ -59,12 +57,11 @@
 	rm -f $(TARGET_DIR)/usr/bin/udevinfo
 	rm -f $(TARGET_DIR)/usr/bin/udevtest
 endif
-	touch $@
 
 #####################################################################
 .PHONY: udev-source udev udev-clean udev-dirclean
 
-udev: uclibc $(TARGET_DIR)/$(UDEV_TARGET_BINARY) $(UDEV_DIR)/.target_install
+udev: uclibc $(TARGET_DIR)/$(UDEV_TARGET_BINARY)
 
 udev-source: $(DL_DIR)/$(UDEV_SOURCE)
 

^ permalink raw reply	[flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/udev
@ 2007-08-15 22:31 ulf at uclibc.org
  0 siblings, 0 replies; 21+ messages in thread
From: ulf at uclibc.org @ 2007-08-15 22:31 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-08-15 15:31:25 -0700 (Wed, 15 Aug 2007)
New Revision: 19520

Log:
Cleanup of udev, build libvolume_id.la

Added:
   trunk/buildroot/package/udev/libvolume_id.la.tmpl

Modified:
   trunk/buildroot/package/udev/udev.mk


Changeset:
Added: trunk/buildroot/package/udev/libvolume_id.la.tmpl
===================================================================
--- trunk/buildroot/package/udev/libvolume_id.la.tmpl	                        (rev 0)
+++ trunk/buildroot/package/udev/libvolume_id.la.tmpl	2007-08-15 22:31:25 UTC (rev 19520)
@@ -0,0 +1,35 @@
+# libvolume_id.la - a libtool library file
+# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06)
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='libvolume_id.so.REPLACE_CURRENT'
+
+# Names of this library.
+library_names='libvolume_id.so.REPLACE_CURRENT.REPLACE_AGE.REPLACE_REVISION libvolume_id.so.REPLACE_CURRENT libvolume_id.so'
+
+# The name of the static archive.
+old_library='libvolume_id.a'
+
+# Libraries that this one depends upon.
+dependency_libs=' -lc'
+
+# Version information for libvolume_id.
+current=REPLACE_CURRENT
+age=REPLACE_AGE
+revision=REPLACE_REVISION
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=no
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='REPLACE_LIB_DIR'

Modified: trunk/buildroot/package/udev/udev.mk
===================================================================
--- trunk/buildroot/package/udev/udev.mk	2007-08-15 20:42:52 UTC (rev 19519)
+++ trunk/buildroot/package/udev/udev.mk	2007-08-15 22:31:25 UTC (rev 19520)
@@ -4,8 +4,10 @@
 #
 #############################################################
 UDEV_VERSION:=114
-UDEV_VOLUME_ID_VERSION:=0.79.0
-
+UDEV_VOLUME_ID_CURRENT:=0
+UDEV_VOLUME_ID_AGE:=79
+UDEV_VOLUME_ID_REVISION:=0
+UDEV_VOLUME_ID_VERSION:=$(UDEV_VOLUME_ID_CURRENT).$(UDEV_VOLUME_ID_AGE).$(UDEV_VOLUME_ID_REVISION)
 UDEV_SOURCE:=udev-$(UDEV_VERSION).tar.bz2
 UDEV_SITE:=ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
 UDEV_CAT:=$(BZCAT)
@@ -39,11 +41,14 @@
 
 $(TARGET_DIR)/$(UDEV_TARGET_BINARY): $(UDEV_DIR)/$(UDEV_BINARY)
 	-mkdir -p $(TARGET_DIR)/sys
-	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) DESTDIR=$(TARGET_DIR) \
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		DESTDIR=$(TARGET_DIR) \
 		CFLAGS="$(BR2_UDEV_CFLAGS)" \
 		LDFLAGS="-warn-common" \
 		USE_LOG=false USE_SELINUX=false \
 		udevdir=$(UDEV_ROOT) -C $(UDEV_DIR) install
+
+$(UDEV_DIR)/.target_install:	$(UDEV_DIR)/$(UDEV_BINARY)
 	$(INSTALL) -m 0755 package/udev/S10udev $(TARGET_DIR)/etc/init.d
 	$(INSTALL) -m 0644 $(UDEV_DIR)/etc/udev/frugalware/* $(TARGET_DIR)/etc/udev/rules.d
 	( grep udev_root $(TARGET_DIR)/etc/udev/udev.conf > /dev/null 2>&1 || echo 'udev_root=/dev' >> $(TARGET_DIR)/etc/udev/udev.conf )
@@ -54,27 +59,29 @@
 	rm -f $(TARGET_DIR)/usr/bin/udevinfo
 	rm -f $(TARGET_DIR)/usr/bin/udevtest
 endif
+	touch $@
 
 #####################################################################
 .PHONY:	udev-source udev udev-clean udev-dirclean
 
-udev: uclibc $(TARGET_DIR)/$(UDEV_TARGET_BINARY)
+udev: uclibc $(TARGET_DIR)/$(UDEV_TARGET_BINARY) $(UDEV_DIR)/.target_install
 
 udev-source: $(DL_DIR)/$(UDEV_SOURCE)
 
 udev-clean: $(UDEV_CLEAN_DEPS)
 	rm -f $(TARGET_DIR)/etc/init.d/S10udev $(TARGET_DIR)/sbin/udev*
 	rm -f $(TARGET_DIR)/usr/sbin/udevmonitor $(TARGET_DIR)/usr/bin/udev*
-	rmdir $(TARGET_DIR)/sys
+	rm -fr $(TARGET_DIR)/sys
 	-$(MAKE) -C $(UDEV_DIR) clean
 
+
 udev-dirclean: $(UDEV_DIRCLEAN_DEPS)
 	rm -rf $(UDEV_DIR)
 
 #####################################################################
-.PHONY:	 udev-volume_id udev-volume_id-clean
+ifeq ($(strip $(BR2_PACKAGE_UDEV_VOLUME_ID)),y)
+.PHONY:	 udev-volume_id udev-volume_id-clean udev-volume_id-dirclean
 
-ifeq ($(strip $(BR2_PACKAGE_UDEV_VOLUME_ID)),y)
 $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION):
 	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \
 		USE_LOG=false USE_SELINUX=false \
@@ -82,19 +89,28 @@
 	$(INSTALL) -m 0644 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.h $(STAGING_DIR)/usr/include/libvolume_id.h
 	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
 	-ln -sf libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(STAGING_DIR)/usr/lib/libvolume_id.so.0
-	-ln -sf libvolume_id.so.0 $(STAGING_DIR)/usr/lib/libvolume_id.so
+	-ln -sf libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(STAGING_DIR)/usr/lib/libvolume_id.so
 
-$(TARGET_DIR)/lib/udev/vol_id: $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
-	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/vol_id $(TARGET_DIR)/lib/udev/vol_id
+$(STAGING_DIR)/usr/lib/libvolume_id.la:	$(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
+	$(INSTALL) -m 0755 -D package/udev/libvolume_id.la.tmpl		$(STAGING_DIR)/usr/lib/libvolume_id.la
+	$(SED) 's/REPLACE_CURRENT/$(UDEV_VOLUME_ID_CURRENT)/g'		$(STAGING_DIR)/usr/lib/libvolume_id.la
+	$(SED) 's/REPLACE_AGE/$(UDEV_VOLUME_ID_AGE)/g'			$(STAGING_DIR)/usr/lib/libvolume_id.la
+	$(SED) 's/REPLACE_REVISION/$(UDEV_VOLUME_ID_REVISION)/g'	$(STAGING_DIR)/usr/lib/libvolume_id.la
+	$(SED) 's,REPLACE_LIB_DIR,$(STAGING_DIR)/usr/lib,g'		$(STAGING_DIR)/usr/lib/libvolume_id.la
+
+$(TARGET_DIR)/lib/udev/vol_id: $(STAGING_DIR)/usr/lib/libvolume_id.la
 	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(TARGET_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
 	-ln -sf libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(TARGET_DIR)/usr/lib/libvolume_id.so.0
+	-ln -sf libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(TARGET_DIR)/usr/lib/libvolume_id.so
 	$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
+	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/vol_id $(TARGET_DIR)/lib/udev/vol_id
 
-udev-volume_id: udev $(TARGET_DIR)/lib/udev/vol_id udev-volume_id-dirclean
+udev-volume_id: udev $(TARGET_DIR)/lib/udev/vol_id
 
 udev-volume_id-clean:
 	rm -f $(STAGING_DIR)/usr/include/libvolume_id.h
 	rm -f $(STAGING_DIR)/usr/lib/libvolume_id.so*
+	rm -f $(STAGING_DIR)/usr/lib/libvolume_id.la
 	rm -f $(TARGET_DIR)/usr/lib/libvolume_id.so.0*
 	rm -f $(TARGET_DIR)/lib/udev/vol_id
 	rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/lib/udev
@@ -107,25 +123,29 @@
 endif
 
 #####################################################################
+ifeq ($(strip $(BR2_PACKAGE_UDEV_SCSI_ID)),y)
 .PHONY:	udev-scsi_id udev-scsi_id-clean udev-scsi_id-dirclean
 
-ifeq ($(strip $(BR2_PACKAGE_UDEV_SCSI_ID)),y)
 $(TARGET_DIR)/lib/udev/scsi_id: $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
 	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \
 		USE_LOG=false USE_SELINUX=false \
 		udevdir=$(UDEV_ROOT) EXTRAS="extras/scsi_id" -C $(UDEV_DIR)
 	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/scsi_id/scsi_id $(TARGET_DIR)/lib/udev/scsi_id
 	$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/udev/scsi_id
+
+$(TARGET_DIR)/lib/udev/usb_id: $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
 	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \
 		USE_LOG=false USE_SELINUX=false \
 		udevdir=$(UDEV_ROOT) EXTRAS="extras/usb_id" -C $(UDEV_DIR)
 	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/usb_id/usb_id $(TARGET_DIR)/lib/udev/usb_id
 	$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/udev/usb_id
 
-udev-scsi_id: udev $(TARGET_DIR)/lib/udev/scsi_id
+udev-scsi_id: udev $(TARGET_DIR)/lib/udev/scsi_id $(TARGET_DIR)/lib/udev/usb_id
 
 udev-scsi_id-clean:
 	rm -f $(TARGET_DIR)/lib/udev/scsi_id
+	rm -f $(TARGET_DIR)/lib/udev/usb_id
+	rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/lib/udev
 
 udev-scsi_id-dirclean:
 	-$(MAKE) EXTRAS="extras/scsi_id" -C $(UDEV_DIR) clean

^ permalink raw reply	[flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/udev
@ 2007-08-15 15:47 ulf at uclibc.org
  0 siblings, 0 replies; 21+ messages in thread
From: ulf at uclibc.org @ 2007-08-15 15:47 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-08-15 08:47:51 -0700 (Wed, 15 Aug 2007)
New Revision: 19515

Log:
Sync volume_id version to 0.79.0 matching udev-114

Modified:
   trunk/buildroot/package/udev/udev.mk


Changeset:
Modified: trunk/buildroot/package/udev/udev.mk
===================================================================
--- trunk/buildroot/package/udev/udev.mk	2007-08-15 09:47:49 UTC (rev 19514)
+++ trunk/buildroot/package/udev/udev.mk	2007-08-15 15:47:51 UTC (rev 19515)
@@ -4,6 +4,8 @@
 #
 #############################################################
 UDEV_VERSION:=114
+UDEV_VOLUME_ID_VERSION:=0.79.0
+
 UDEV_SOURCE:=udev-$(UDEV_VERSION).tar.bz2
 UDEV_SITE:=ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
 UDEV_CAT:=$(BZCAT)
@@ -73,20 +75,20 @@
 .PHONY:	 udev-volume_id udev-volume_id-clean
 
 ifeq ($(strip $(BR2_PACKAGE_UDEV_VOLUME_ID)),y)
-$(STAGING_DIR)/usr/lib/libvolume_id.so.0.72.0:
+$(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION):
 	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \
 		USE_LOG=false USE_SELINUX=false \
 		udevdir=$(UDEV_ROOT) EXTRAS="extras/volume_id" -C $(UDEV_DIR)
 	$(INSTALL) -m 0644 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.h $(STAGING_DIR)/usr/include/libvolume_id.h
-	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.so.0.72.0 $(STAGING_DIR)/usr/lib/libvolume_id.so.0.72.0
-	-ln -sf libvolume_id.so.0.72.0 $(STAGING_DIR)/usr/lib/libvolume_id.so.0
+	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
+	-ln -sf libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(STAGING_DIR)/usr/lib/libvolume_id.so.0
 	-ln -sf libvolume_id.so.0 $(STAGING_DIR)/usr/lib/libvolume_id.so
 
-$(TARGET_DIR)/lib/udev/vol_id: $(STAGING_DIR)/usr/lib/libvolume_id.so.0.72.0
+$(TARGET_DIR)/lib/udev/vol_id: $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
 	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/vol_id $(TARGET_DIR)/lib/udev/vol_id
-	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.so.0.72.0 $(TARGET_DIR)/usr/lib/libvolume_id.so.0.72.0
-	-ln -sf libvolume_id.so.0.72.0 $(TARGET_DIR)/usr/lib/libvolume_id.so.0
-	$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libvolume_id.so.0.72.0
+	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(TARGET_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
+	-ln -sf libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(TARGET_DIR)/usr/lib/libvolume_id.so.0
+	$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
 
 udev-volume_id: udev $(TARGET_DIR)/lib/udev/vol_id udev-volume_id-dirclean
 
@@ -108,7 +110,7 @@
 .PHONY:	udev-scsi_id udev-scsi_id-clean udev-scsi_id-dirclean
 
 ifeq ($(strip $(BR2_PACKAGE_UDEV_SCSI_ID)),y)
-$(TARGET_DIR)/lib/udev/scsi_id: $(STAGING_DIR)/usr/lib/libvolume_id.so.0.72.0
+$(TARGET_DIR)/lib/udev/scsi_id: $(STAGING_DIR)/usr/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
 	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \
 		USE_LOG=false USE_SELINUX=false \
 		udevdir=$(UDEV_ROOT) EXTRAS="extras/scsi_id" -C $(UDEV_DIR)

^ permalink raw reply	[flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/udev
@ 2007-08-14  6:16 ulf at uclibc.org
  0 siblings, 0 replies; 21+ messages in thread
From: ulf at uclibc.org @ 2007-08-14  6:16 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-08-13 23:16:08 -0700 (Mon, 13 Aug 2007)
New Revision: 19497

Log:
Change udev target from udev to udevd. Add .PHONY targets. Rearrange targets

Modified:
   trunk/buildroot/package/udev/udev.mk


Changeset:
Modified: trunk/buildroot/package/udev/udev.mk
===================================================================
--- trunk/buildroot/package/udev/udev.mk	2007-08-13 21:30:02 UTC (rev 19496)
+++ trunk/buildroot/package/udev/udev.mk	2007-08-14 06:16:08 UTC (rev 19497)
@@ -9,7 +9,7 @@
 UDEV_CAT:=$(BZCAT)
 UDEV_DIR:=$(BUILD_DIR)/udev-$(UDEV_VERSION)
 UDEV_TARGET_BINARY:=sbin/udevd
-UDEV_BINARY:=udev
+UDEV_BINARY:=udevd
 
 # 094 had _GNU_SOURCE set
 BR2_UDEV_CFLAGS:= -D_GNU_SOURCE $(TARGET_CFLAGS)
@@ -17,15 +17,12 @@
 BR2_UDEV_CFLAGS+=-U_FILE_OFFSET_BITS
 endif
 
-
 # UDEV_ROOT is /dev so we can replace devfs, not /udev for experiments
 UDEV_ROOT:=/dev
 
 $(DL_DIR)/$(UDEV_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(UDEV_SITE)/$(UDEV_SOURCE)
 
-udev-source: $(DL_DIR)/$(UDEV_SOURCE)
-
 $(UDEV_DIR)/.unpacked: $(DL_DIR)/$(UDEV_SOURCE)
 	$(UDEV_CAT) $(DL_DIR)/$(UDEV_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	toolchain/patch-kernel.sh $(UDEV_DIR) package/udev \*.patch
@@ -36,10 +33,10 @@
 		CFLAGS="$(BR2_UDEV_CFLAGS)" \
 		USE_LOG=false USE_SELINUX=false \
 		udevdir=$(UDEV_ROOT) -C $(UDEV_DIR)
-	touch -c $(UDEV_DIR)/$(UDEV_BINARY)
+	touch -c $@
 
 $(TARGET_DIR)/$(UDEV_TARGET_BINARY): $(UDEV_DIR)/$(UDEV_BINARY)
-	-mkdir $(TARGET_DIR)/sys
+	-mkdir -p $(TARGET_DIR)/sys
 	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) DESTDIR=$(TARGET_DIR) \
 		CFLAGS="$(BR2_UDEV_CFLAGS)" \
 		LDFLAGS="-warn-common" \
@@ -56,8 +53,25 @@
 	rm -f $(TARGET_DIR)/usr/bin/udevtest
 endif
 
+#####################################################################
+.PHONY:	udev-source udev udev-clean udev-dirclean
+
 udev: uclibc $(TARGET_DIR)/$(UDEV_TARGET_BINARY)
 
+udev-source: $(DL_DIR)/$(UDEV_SOURCE)
+
+udev-clean: $(UDEV_CLEAN_DEPS)
+	rm -f $(TARGET_DIR)/etc/init.d/S10udev $(TARGET_DIR)/sbin/udev*
+	rm -f $(TARGET_DIR)/usr/sbin/udevmonitor $(TARGET_DIR)/usr/bin/udev*
+	rmdir $(TARGET_DIR)/sys
+	-$(MAKE) -C $(UDEV_DIR) clean
+
+udev-dirclean: $(UDEV_DIRCLEAN_DEPS)
+	rm -rf $(UDEV_DIR)
+
+#####################################################################
+.PHONY:	 udev-volume_id udev-volume_id-clean
+
 ifeq ($(strip $(BR2_PACKAGE_UDEV_VOLUME_ID)),y)
 $(STAGING_DIR)/usr/lib/libvolume_id.so.0.72.0:
 	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \
@@ -74,7 +88,7 @@
 	-ln -sf libvolume_id.so.0.72.0 $(TARGET_DIR)/usr/lib/libvolume_id.so.0
 	$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libvolume_id.so.0.72.0
 
-udev-volume_id: udev $(TARGET_DIR)/lib/udev/vol_id
+udev-volume_id: udev $(TARGET_DIR)/lib/udev/vol_id udev-volume_id-dirclean
 
 udev-volume_id-clean:
 	rm -f $(STAGING_DIR)/usr/include/libvolume_id.h
@@ -90,6 +104,9 @@
 UDEV_DIRCLEAN_DEPS+=udev-volume_id-dirclean
 endif
 
+#####################################################################
+.PHONY:	udev-scsi_id udev-scsi_id-clean udev-scsi_id-dirclean
+
 ifeq ($(strip $(BR2_PACKAGE_UDEV_SCSI_ID)),y)
 $(TARGET_DIR)/lib/udev/scsi_id: $(STAGING_DIR)/usr/lib/libvolume_id.so.0.72.0
 	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \
@@ -115,15 +132,6 @@
 UDEV_DIRCLEAN_DEPS+=udev-scsi_id-dirclean
 endif
 
-udev-clean: $(UDEV_CLEAN_DEPS)
-	rm -f $(TARGET_DIR)/etc/init.d/S10udev $(TARGET_DIR)/sbin/udev*
-	rm -f $(TARGET_DIR)/usr/sbin/udevmonitor $(TARGET_DIR)/usr/bin/udev*
-	rmdir $(TARGET_DIR)/sys
-	-$(MAKE) -C $(UDEV_DIR) clean
-
-udev-dirclean: $(UDEV_DIRCLEAN_DEPS)
-	rm -rf $(UDEV_DIR)
-
 #############################################################
 #
 # Toplevel Makefile options

^ permalink raw reply	[flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/udev
@ 2007-08-11 16:52 ulf at uclibc.org
  0 siblings, 0 replies; 21+ messages in thread
From: ulf at uclibc.org @ 2007-08-11 16:52 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-08-11 09:52:57 -0700 (Sat, 11 Aug 2007)
New Revision: 19429

Log:
Remove udev-install patch (merged into Makefile)

Removed:
   trunk/buildroot/package/udev/udev-install.patch


Changeset:
Deleted: trunk/buildroot/package/udev/udev-install.patch
===================================================================
--- trunk/buildroot/package/udev/udev-install.patch	2007-08-11 16:50:49 UTC (rev 19428)
+++ trunk/buildroot/package/udev/udev-install.patch	2007-08-11 16:52:57 UTC (rev 19429)
@@ -1,11 +0,0 @@
-diff -ur udev-101/Makefile udev-101-patched/Makefile
---- udev-101/Makefile	2006-09-30 07:30:00.000000000 -0500
-+++ udev-101-patched/Makefile	2006-10-20 12:28:18.000000000 -0500
-@@ -275,6 +275,7 @@
- 
- install-bin:
- 	$(INSTALL) -d $(DESTDIR)$(udevdir)
-+	$(INSTALL_PROGRAM) -D udevstart $(DESTDIR)$(sbindir)/udevstart
- 	$(INSTALL_PROGRAM) -D udevd $(DESTDIR)$(sbindir)/udevd
- 	$(INSTALL_PROGRAM) -D udevtrigger $(DESTDIR)$(sbindir)/udevtrigger
- 	$(INSTALL_PROGRAM) -D udevsettle $(DESTDIR)$(sbindir)/udevsettle

^ permalink raw reply	[flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/udev
@ 2007-08-11 16:50 ulf at uclibc.org
  0 siblings, 0 replies; 21+ messages in thread
From: ulf at uclibc.org @ 2007-08-11 16:50 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-08-11 09:50:49 -0700 (Sat, 11 Aug 2007)
New Revision: 19428

Log:
Bump udev version, add rules

Modified:
   trunk/buildroot/package/udev/S10udev
   trunk/buildroot/package/udev/udev.mk


Changeset:
Modified: trunk/buildroot/package/udev/S10udev
===================================================================
--- trunk/buildroot/package/udev/S10udev	2007-08-11 16:44:54 UTC (rev 19427)
+++ trunk/buildroot/package/udev/S10udev	2007-08-11 16:50:49 UTC (rev 19428)
@@ -64,6 +64,7 @@
         echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
         $UDEV_BIN -d || (echo "FAIL" && exit 1)
 	$UDEVSTART_BIN || (echo "FAIL" && exit 1)
+	mount -t devpts /dev/pts /dev/pts || (echo "FAIL" && exit 1)
         echo "done"
         ;;
     stop)

Modified: trunk/buildroot/package/udev/udev.mk
===================================================================
--- trunk/buildroot/package/udev/udev.mk	2007-08-11 16:44:54 UTC (rev 19427)
+++ trunk/buildroot/package/udev/udev.mk	2007-08-11 16:50:49 UTC (rev 19428)
@@ -3,7 +3,7 @@
 # udev
 #
 #############################################################
-UDEV_VERSION:=101
+UDEV_VERSION:=114
 UDEV_SOURCE:=udev-$(UDEV_VERSION).tar.bz2
 UDEV_SITE:=ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
 UDEV_CAT:=$(BZCAT)
@@ -46,6 +46,9 @@
 		USE_LOG=false USE_SELINUX=false \
 		udevdir=$(UDEV_ROOT) -C $(UDEV_DIR) install
 	$(INSTALL) -m 0755 package/udev/S10udev $(TARGET_DIR)/etc/init.d
+	$(INSTALL) -m 0644 $(UDEV_DIR)/etc/udev/frugalware/* $(TARGET_DIR)/etc/udev/rules.d
+	( grep udev_root $(TARGET_DIR)/etc/udev/udev.conf > /dev/null 2>&1 || echo 'udev_root=/dev' >> $(TARGET_DIR)/etc/udev/udev.conf )
+	install -m 0755 -D $(UDEV_DIR)/udevstart $(TARGET_DIR)/sbin/udevstart
 	rm -rf $(TARGET_DIR)/usr/share/man
 ifneq ($(strip $(BR2_PACKAGE_UDEV_UTILS)),y)
 	rm -f $(TARGET_DIR)/usr/sbin/udevmonitor
@@ -82,6 +85,9 @@
 
 udev-volume_id-dirclean:
 	-$(MAKE) EXTRAS="extras/volume_id" -C $(UDEV_DIR) clean
+
+UDEV_CLEAN_DEPS+=udev-volume_id-clean
+UDEV_DIRCLEAN_DEPS+=udev-volume_id-dirclean
 endif
 
 ifeq ($(strip $(BR2_PACKAGE_UDEV_SCSI_ID)),y)
@@ -104,15 +110,18 @@
 
 udev-scsi_id-dirclean:
 	-$(MAKE) EXTRAS="extras/scsi_id" -C $(UDEV_DIR) clean
+
+UDEV_CLEAN_DEPS+=udev-scsi_id-clean
+UDEV_DIRCLEAN_DEPS+=udev-scsi_id-dirclean
 endif
 
-udev-clean: udev-volume_id-clean udev-scsi_id-clean
+udev-clean: $(UDEV_CLEAN_DEPS)
 	rm -f $(TARGET_DIR)/etc/init.d/S10udev $(TARGET_DIR)/sbin/udev*
 	rm -f $(TARGET_DIR)/usr/sbin/udevmonitor $(TARGET_DIR)/usr/bin/udev*
 	rmdir $(TARGET_DIR)/sys
 	-$(MAKE) -C $(UDEV_DIR) clean
 
-udev-dirclean: udev-volume_id-dirclean udev-scsi_id-dirclean
+udev-dirclean: $(UDEV_DIRCLEAN_DEPS)
 	rm -rf $(UDEV_DIR)
 
 #############################################################

^ permalink raw reply	[flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/udev
@ 2007-05-07  4:02 sjhill at uclibc.org
  0 siblings, 0 replies; 21+ messages in thread
From: sjhill at uclibc.org @ 2007-05-07  4:02 UTC (permalink / raw)
  To: buildroot

Author: sjhill
Date: 2007-05-06 21:02:31 -0700 (Sun, 06 May 2007)
New Revision: 18578

Log:
Add ability to build 'scsi_id' utility for udev.


Modified:
   trunk/buildroot/package/udev/Config.in
   trunk/buildroot/package/udev/udev.mk


Changeset:
Modified: trunk/buildroot/package/udev/Config.in
===================================================================
--- trunk/buildroot/package/udev/Config.in	2007-05-07 04:01:58 UTC (rev 18577)
+++ trunk/buildroot/package/udev/Config.in	2007-05-07 04:02:31 UTC (rev 18578)
@@ -24,4 +24,11 @@
         help
           Build and install volume identification library.
 
+config BR2_PACKAGE_UDEV_SCSI_ID
+        bool "udev-scsi_id"
+        default n
+        depends on BR2_PACKAGE_UDEV
+        help
+          Build and install SCSI disk identification library.
+
 endmenu

Modified: trunk/buildroot/package/udev/udev.mk
===================================================================
--- trunk/buildroot/package/udev/udev.mk	2007-05-07 04:01:58 UTC (rev 18577)
+++ trunk/buildroot/package/udev/udev.mk	2007-05-07 04:02:31 UTC (rev 18578)
@@ -84,13 +84,35 @@
 	-$(MAKE) EXTRAS="extras/volume_id" -C $(UDEV_DIR) clean
 endif
 
-udev-clean:
+ifeq ($(strip $(BR2_PACKAGE_UDEV_SCSI_ID)),y)
+$(TARGET_DIR)/lib/udev/scsi_id: $(STAGING_DIR)/usr/lib/libvolume_id.so.0.72.0
+	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \
+		USE_LOG=false USE_SELINUX=false \
+		udevdir=$(UDEV_ROOT) EXTRAS="extras/scsi_id" -C $(UDEV_DIR)
+	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/scsi_id/scsi_id $(TARGET_DIR)/lib/udev/scsi_id
+	$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/udev/scsi_id
+	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \
+		USE_LOG=false USE_SELINUX=false \
+		udevdir=$(UDEV_ROOT) EXTRAS="extras/usb_id" -C $(UDEV_DIR)
+	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/usb_id/usb_id $(TARGET_DIR)/lib/udev/usb_id
+	$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/udev/usb_id
+
+udev-scsi_id: udev $(TARGET_DIR)/lib/udev/scsi_id
+
+udev-scsi_id-clean:
+	rm -f $(TARGET_DIR)/lib/udev/scsi_id
+
+udev-scsi_id-dirclean:
+	-$(MAKE) EXTRAS="extras/scsi_id" -C $(UDEV_DIR) clean
+endif
+
+udev-clean: udev-volume_id-clean udev-scsi_id-clean
 	rm -f $(TARGET_DIR)/etc/init.d/S10udev $(TARGET_DIR)/sbin/udev*
 	rm -f $(TARGET_DIR)/usr/sbin/udevmonitor $(TARGET_DIR)/usr/bin/udev*
 	rmdir $(TARGET_DIR)/sys
 	-$(MAKE) -C $(UDEV_DIR) clean
 
-udev-dirclean:
+udev-dirclean: udev-volume_id-dirclean udev-scsi_id-dirclean
 	rm -rf $(UDEV_DIR)
 
 #############################################################
@@ -105,3 +127,7 @@
 ifeq ($(strip $(BR2_PACKAGE_UDEV_VOLUME_ID)),y)
 TARGETS+=udev-volume_id
 endif
+
+ifeq ($(strip $(BR2_PACKAGE_UDEV_SCSI_ID)),y)
+TARGETS+=udev-scsi_id
+endif

^ permalink raw reply	[flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/udev
@ 2007-01-19 16:23 aldot at uclibc.org
  0 siblings, 0 replies; 21+ messages in thread
From: aldot at uclibc.org @ 2007-01-19 16:23 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2007-01-19 08:23:35 -0800 (Fri, 19 Jan 2007)
New Revision: 17382

Log:
- remove superfluous intermediate target


Modified:
   trunk/buildroot/package/udev/udev.mk


Changeset:
Modified: trunk/buildroot/package/udev/udev.mk
===================================================================
--- trunk/buildroot/package/udev/udev.mk	2007-01-19 14:54:58 UTC (rev 17381)
+++ trunk/buildroot/package/udev/udev.mk	2007-01-19 16:23:35 UTC (rev 17382)
@@ -29,12 +29,9 @@
 $(UDEV_DIR)/.unpacked: $(DL_DIR)/$(UDEV_SOURCE)
 	$(UDEV_CAT) $(DL_DIR)/$(UDEV_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	toolchain/patch-kernel.sh $(UDEV_DIR) package/udev \*.patch
-	touch $(UDEV_DIR)/.unpacked
+	touch $@
 
-$(UDEV_DIR)/.configured: $(UDEV_DIR)/.unpacked
-	touch $(UDEV_DIR)/.configured
-
-$(UDEV_DIR)/$(UDEV_BINARY): $(UDEV_DIR)/.configured
+$(UDEV_DIR)/$(UDEV_BINARY): $(UDEV_DIR)/.unpacked
 	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) CC=$(TARGET_CC) LD=$(TARGET_CC)\
 		CFLAGS="$(BR2_UDEV_CFLAGS)" \
 		USE_LOG=false USE_SELINUX=false \

^ permalink raw reply	[flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/udev
@ 2007-01-14  0:59 sjhill at uclibc.org
  0 siblings, 0 replies; 21+ messages in thread
From: sjhill at uclibc.org @ 2007-01-14  0:59 UTC (permalink / raw)
  To: buildroot

Author: sjhill
Date: 2007-01-13 16:59:10 -0800 (Sat, 13 Jan 2007)
New Revision: 17271

Log:
Upgrade to udev-101. We also create and init script that actually works and has been tested in multiple PowerPC embedded platforms. We also add a new config option to build the volume_id library which will be used by D-Bus and HAL.


Added:
   trunk/buildroot/package/udev/udev-install.patch

Removed:
   trunk/buildroot/package/udev/udev-100.fix_makefile.patch
   trunk/buildroot/package/udev/udev.conf

Modified:
   trunk/buildroot/package/udev/Config.in
   trunk/buildroot/package/udev/init-udev
   trunk/buildroot/package/udev/udev.mk


Changeset:
Modified: trunk/buildroot/package/udev/Config.in
===================================================================
--- trunk/buildroot/package/udev/Config.in	2007-01-14 00:57:50 UTC (rev 17270)
+++ trunk/buildroot/package/udev/Config.in	2007-01-14 00:59:10 UTC (rev 17271)
@@ -5,3 +5,23 @@
 	  Userspace device daemon.
 
 	  ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
+
+config BR2_PACKAGE_UDEV_UTILS
+        bool "udev-utils"
+        default n
+        depends on BR2_PACKAGE_UDEV
+        help
+          Adds the udevmonitor, udevinfo, and udevtest binaries
+	  to your filesystem.
+
+menu "Extra udev tools"
+        depends BR2_PACKAGE_UDEV
+
+config BR2_PACKAGE_UDEV_VOLUME_ID
+        bool "udev-libvolume_id"
+        default n
+        depends on BR2_PACKAGE_UDEV
+        help
+          Build and install volume identification library.
+
+endmenu

Modified: trunk/buildroot/package/udev/init-udev
===================================================================
--- trunk/buildroot/package/udev/init-udev	2007-01-14 00:57:50 UTC (rev 17270)
+++ trunk/buildroot/package/udev/init-udev	2007-01-14 00:59:10 UTC (rev 17271)
@@ -18,17 +18,15 @@
 
 # old kernels don't use udev
 case $(uname -r) in
-2.6*|2.7*)	;;
-*)		exit 0;;
+    2.6*|2.7*)	;;
+    *)		exit 0;;
 esac
 
 # Check for missing binaries
-UDEV_BIN=/sbin/udev
+UDEV_BIN=/sbin/udevd
 test -x $UDEV_BIN || exit 5
 UDEVSTART_BIN=/sbin/udevstart
 test -x $UDEVSTART_BIN || exit 5
-UDEVD_BIN=/sbin/udevd
-test -x $UDEVD_BIN || exit 5
 
 # Check for config file and read it
 UDEV_CONFIG=/etc/udev/udev.conf
@@ -40,42 +38,44 @@
 
 case "$1" in
     start)
-	# mount sysfs if it's not yet mounted
-	if [ ! -d $SYSFS_DIR ]; then
-		echo "${0}: SYSFS_DIR \"$SYSFS_DIR\" not found"
-		exit 1
-	fi
-	grep -q "^sysfs $SYSFS_DIR" /proc/mounts ||
-		mount -t sysfs /sys /sys ||
-		exit 1
+        # mount sysfs if it's not yet mounted
+        if [ ! -d $SYSFS_DIR ]; then
+	    echo "${0}: SYSFS_DIR \"$SYSFS_DIR\" not found"
+	    exit 1
+        fi
+        grep -q "^sysfs $SYSFS_DIR" /proc/mounts ||
+	mount -t sysfs /sys /sys ||
+	exit 1
 
-	# mount $udev_root as ramfs if it's not yet mounted
-	# we know 2.6 kernels always support ramfs
-	if [ ! -d $udev_root ]; then
-		echo "${0}: udev_root \"$udev_root\" not found"
-		exit 1
-	fi
-	grep -q "^udev $udev_root" /proc/mounts ||
-		mount -t ramfs udev $udev_root ||
-		exit 1
+        # mount $udev_root as ramfs if it's not yet mounted
+        # we know 2.6 kernels always support ramfs
+        if [ ! -d $udev_root ]; then
+	    echo "${0}: udev_root \"$udev_root\" not found"
+	    exit 1
+        fi
+        grep -q "^udev $udev_root" /proc/mounts ||
+	mount -t ramfs udev $udev_root ||
+	exit 1
 
-	# heck, go whole-hog:  use only new style hotplug
-	# echo $UDEV_BIN > /proc/sys/kernel/hotplug
+        mkdir $udev_root/pts $udev_root/shm
 
-	# populate /dev (normally)
-	echo -n "Populating $udev_root using udev... "
+        # populate /dev (normally)
+        echo -n "Populating $udev_root using udev: "
+        echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
+        $UDEV_BIN -d || (echo "FAIL" && exit 1)
 	$UDEVSTART_BIN || (echo "FAIL" && exit 1)
-	mkdir $udev_root/pts $udev_root/shm
-	# start daemon
-	$UDEVD_BIN --daemon || (echo "udevd FAIL" && exit 1)
-	echo "done"
-	mount -a
-	;;
+        echo "done"
+        ;;
     stop)
-	# do nothing
-	;;
+        # Stop execution of events
+        udevcontrol stop_exec_queue
+        killall udevd
+        ;;
     *)
-	echo "Usage: $0 {start|stop}"
-	exit 1
-	;;
+        echo "Usage: $0 {start|stop}"
+        exit 1
+        ;;
 esac
+
+
+exit 0

Deleted: trunk/buildroot/package/udev/udev-100.fix_makefile.patch
===================================================================
--- trunk/buildroot/package/udev/udev-100.fix_makefile.patch	2007-01-14 00:57:50 UTC (rev 17270)
+++ trunk/buildroot/package/udev/udev-100.fix_makefile.patch	2007-01-14 00:59:10 UTC (rev 17271)
@@ -1,12 +0,0 @@
-diff -u udev-100/Makefile udev-100.ynezz/Makefile
---- udev-100/Makefile	2006-09-07 11:32:45.000000000 +0200
-+++ udev-100.ynezz/Makefile	2006-09-18 17:35:33.000000000 +0200
-@@ -276,6 +276,8 @@
- install-bin:
- 	$(INSTALL) -d $(DESTDIR)$(udevdir)
- 	$(INSTALL_PROGRAM) -D udevd $(DESTDIR)$(sbindir)/udevd
-+	$(INSTALL_PROGRAM) -D udev $(DESTDIR)$(sbindir)/udev
-+	$(INSTALL_PROGRAM) -D udevstart $(DESTDIR)$(sbindir)/udevstart
- 	$(INSTALL_PROGRAM) -D udevtrigger $(DESTDIR)$(sbindir)/udevtrigger
- 	$(INSTALL_PROGRAM) -D udevsettle $(DESTDIR)$(sbindir)/udevsettle
- 	$(INSTALL_PROGRAM) -D udevcontrol $(DESTDIR)$(sbindir)/udevcontrol

Added: trunk/buildroot/package/udev/udev-install.patch
===================================================================
--- trunk/buildroot/package/udev/udev-install.patch	                        (rev 0)
+++ trunk/buildroot/package/udev/udev-install.patch	2007-01-14 00:59:10 UTC (rev 17271)
@@ -0,0 +1,11 @@
+diff -ur udev-101/Makefile udev-101-patched/Makefile
+--- udev-101/Makefile	2006-09-30 07:30:00.000000000 -0500
++++ udev-101-patched/Makefile	2006-10-20 12:28:18.000000000 -0500
+@@ -275,6 +275,7 @@
+ 
+ install-bin:
+ 	$(INSTALL) -d $(DESTDIR)$(udevdir)
++	$(INSTALL_PROGRAM) -D udevstart $(DESTDIR)$(sbindir)/udevstart
+ 	$(INSTALL_PROGRAM) -D udevd $(DESTDIR)$(sbindir)/udevd
+ 	$(INSTALL_PROGRAM) -D udevtrigger $(DESTDIR)$(sbindir)/udevtrigger
+ 	$(INSTALL_PROGRAM) -D udevsettle $(DESTDIR)$(sbindir)/udevsettle

Deleted: trunk/buildroot/package/udev/udev.conf
===================================================================
--- trunk/buildroot/package/udev/udev.conf	2007-01-14 00:57:50 UTC (rev 17270)
+++ trunk/buildroot/package/udev/udev.conf	2007-01-14 00:59:10 UTC (rev 17271)
@@ -1,7 +0,0 @@
-# udev.conf
-
-# The initial syslog(3) priority: "err", "info", "debug" or its
-# numerical equivalent. For runtime debugging, the daemons internal
-# state can be changed with: "udevcontrol log_priority=<value>".
-udev_log="err"
-udev_root=/dev

Modified: trunk/buildroot/package/udev/udev.mk
===================================================================
--- trunk/buildroot/package/udev/udev.mk	2007-01-14 00:57:50 UTC (rev 17270)
+++ trunk/buildroot/package/udev/udev.mk	2007-01-14 00:59:10 UTC (rev 17271)
@@ -3,12 +3,12 @@
 # udev
 #
 #############################################################
-UDEV_VERSION:=100
+UDEV_VERSION:=101
 UDEV_SOURCE:=udev-$(UDEV_VERSION).tar.bz2
 UDEV_SITE:=ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
 UDEV_CAT:=$(BZCAT)
 UDEV_DIR:=$(BUILD_DIR)/udev-$(UDEV_VERSION)
-UDEV_TARGET_BINARY:=sbin/udev
+UDEV_TARGET_BINARY:=sbin/udevd
 UDEV_BINARY:=udev
 
 # 094 had _GNU_SOURCE set
@@ -41,30 +41,56 @@
 		udevdir=$(UDEV_ROOT) -C $(UDEV_DIR)
 	touch -c $(UDEV_DIR)/$(UDEV_BINARY)
 
-# UDEV_CONF overrides default policies for device access control and naming;
-# default access controls prevent non-root tasks from running.  Many of the
-# rule files rely on PROGRAM invocations (e.g. extra /etc/udev/scripts);
-# for now we'll avoid having buildroot systems rely on them.
-UDEV_CONF:=etc/udev/frugalware/*
-
 $(TARGET_DIR)/$(UDEV_TARGET_BINARY): $(UDEV_DIR)/$(UDEV_BINARY)
 	-mkdir $(TARGET_DIR)/sys
-	-mkdir -p $(TARGET_DIR)/etc/udev/rules.d
-	$(INSTALL) -D -m 0644 $(UDEV_DIR)/$(UDEV_CONF) \
-		$(TARGET_DIR)/etc/udev/rules.d
-	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) CC=$(TARGET_CC)  LD=$(TARGET_CC) \
-		DESTDIR=$(TARGET_DIR) \
+	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) DESTDIR=$(TARGET_DIR) \
 		CFLAGS="$(BR2_UDEV_CFLAGS)" \
 		LDFLAGS="-warn-common" \
 		USE_LOG=false USE_SELINUX=false \
 		udevdir=$(UDEV_ROOT) -C $(UDEV_DIR) install
 	$(INSTALL) -m 0755 -D package/udev/init-udev $(TARGET_DIR)/etc/init.d/S10udev
-	$(INSTALL) -m 0644 -D package/udev/udev.conf $(TARGET_DIR)/etc/udev
+	rm -rf $(TARGET_DIR)/usr/share/man
+ifneq ($(strip $(BR2_PACKAGE_UDEV_UTILS)),y)
+	rm -f $(TARGET_DIR)/usr/sbin/udevmonitor
+	rm -f $(TARGET_DIR)/usr/bin/udevinfo
+	rm -f $(TARGET_DIR)/usr/bin/udevtest
+endif
 
 udev: uclibc $(TARGET_DIR)/$(UDEV_TARGET_BINARY)
 
+ifeq ($(strip $(BR2_PACKAGE_UDEV_VOLUME_ID)),y)
+$(STAGING_DIR)/usr/lib/libvolume_id.so.0.72.0:
+	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \
+		USE_LOG=false USE_SELINUX=false \
+		udevdir=$(UDEV_ROOT) EXTRAS="extras/volume_id" -C $(UDEV_DIR)
+	$(INSTALL) -m 0644 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.h $(STAGING_DIR)/include/libvolume_id.h
+	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.so.0.72.0 $(STAGING_DIR)/usr/lib/libvolume_id.so.0.72.0
+	-ln -sf libvolume_id.so.0.72.0 $(STAGING_DIR)/usr/lib/libvolume_id.so.0
+	-ln -sf libvolume_id.so.0 $(STAGING_DIR)/usr/lib/libvolume_id.so
+
+$(TARGET_DIR)/lib/udev/vol_id: $(STAGING_DIR)/usr/lib/libvolume_id.so.0.72.0
+	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/vol_id $(TARGET_DIR)/lib/udev/vol_id
+	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.so.0.72.0 $(TARGET_DIR)/usr/lib/libvolume_id.so.0.72.0
+	-ln -sf libvolume_id.so.0.72.0 $(TARGET_DIR)/usr/lib/libvolume_id.so.0
+	$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libvolume_id.so.0.72.0
+
+udev-volume_id: udev $(TARGET_DIR)/lib/udev/vol_id
+
+udev-volume_id-clean:
+	rm -f $(STAGING_DIR)/include/libvolume_id.h
+	rm -f $(STAGING_DIR)/usr/lib/libvolume_id.so*
+	rm -f $(TARGET_DIR)/usr/lib/libvolume_id.so.0*
+	rm -f $(TARGET_DIR)/lib/udev/vol_id
+	rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/lib/udev
+
+udev-volume_id-dirclean:
+	-$(MAKE) EXTRAS="extras/volume_id" -C $(UDEV_DIR) clean
+endif
+
 udev-clean:
-	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(UDEV_DIR) uninstall
+	rm -f $(TARGET_DIR)/etc/init.d/S10udev $(TARGET_DIR)/sbin/udev*
+	rm -f $(TARGET_DIR)/usr/sbin/udevmonitor $(TARGET_DIR)/usr/bin/udev*
+	rmdir $(TARGET_DIR)/sys
 	-$(MAKE) -C $(UDEV_DIR) clean
 
 udev-dirclean:
@@ -78,3 +104,7 @@
 ifeq ($(strip $(BR2_PACKAGE_UDEV)),y)
 TARGETS+=udev
 endif
+
+ifeq ($(strip $(BR2_PACKAGE_UDEV_VOLUME_ID)),y)
+TARGETS+=udev-volume_id
+endif

^ permalink raw reply	[flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/udev
@ 2006-12-10 13:53 aldot at uclibc.org
  0 siblings, 0 replies; 21+ messages in thread
From: aldot at uclibc.org @ 2006-12-10 13:53 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2006-12-10 05:53:28 -0800 (Sun, 10 Dec 2006)
New Revision: 16835

Log:
- Add default udev.conf and fix a mkdir call.
  Thanks to Petr Stetiar.


Added:
   trunk/buildroot/package/udev/udev.conf

Modified:
   trunk/buildroot/package/udev/udev.mk


Changeset:
Added: trunk/buildroot/package/udev/udev.conf
===================================================================
--- trunk/buildroot/package/udev/udev.conf	2006-12-10 13:42:16 UTC (rev 16834)
+++ trunk/buildroot/package/udev/udev.conf	2006-12-10 13:53:28 UTC (rev 16835)
@@ -0,0 +1,7 @@
+# udev.conf
+
+# The initial syslog(3) priority: "err", "info", "debug" or its
+# numerical equivalent. For runtime debugging, the daemons internal
+# state can be changed with: "udevcontrol log_priority=<value>".
+udev_log="err"
+udev_root=/dev

Modified: trunk/buildroot/package/udev/udev.mk
===================================================================
--- trunk/buildroot/package/udev/udev.mk	2006-12-10 13:42:16 UTC (rev 16834)
+++ trunk/buildroot/package/udev/udev.mk	2006-12-10 13:53:28 UTC (rev 16835)
@@ -49,7 +49,7 @@
 
 $(TARGET_DIR)/$(UDEV_TARGET_BINARY): $(UDEV_DIR)/$(UDEV_BINARY)
 	-mkdir $(TARGET_DIR)/sys
-	-mkdir $(TARGET_DIR)/etc/udev/rules.d
+	-mkdir -p $(TARGET_DIR)/etc/udev/rules.d
 	$(INSTALL) -D -m 0644 $(UDEV_DIR)/$(UDEV_CONF) \
 		$(TARGET_DIR)/etc/udev/rules.d
 	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) CC=$(TARGET_CC)  LD=$(TARGET_CC) \

^ permalink raw reply	[flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/udev
@ 2006-12-06  8:29 aldot at uclibc.org
  0 siblings, 0 replies; 21+ messages in thread
From: aldot at uclibc.org @ 2006-12-06  8:29 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2006-12-06 00:29:40 -0800 (Wed, 06 Dec 2006)
New Revision: 16787

Log:
- remove patch for "s3c2410_serial*" that doesn't apply anymore.


Removed:
   trunk/buildroot/package/udev/udev-fix-s3c2410-serial-perms.patch


Changeset:
Deleted: trunk/buildroot/package/udev/udev-fix-s3c2410-serial-perms.patch
===================================================================
--- trunk/buildroot/package/udev/udev-fix-s3c2410-serial-perms.patch	2006-12-06 01:55:59 UTC (rev 16786)
+++ trunk/buildroot/package/udev/udev-fix-s3c2410-serial-perms.patch	2006-12-06 08:29:40 UTC (rev 16787)
@@ -1,12 +0,0 @@
-diff -urp udev-058/etc/udev/frugalware/udev.rules udev-058/etc/udev/frugalware/udev.rules
---- udev-058/etc/udev/frugalware/udev.rules	2005-05-20 21:18:28.000000000 +0100
-+++ udev-058/etc/udev/frugalware/udev.rules	2005-10-26 02:26:25.000000000 +0100
-@@ -40,6 +40,8 @@ KERNEL="ttyUB[0-9]",    NAME="%k", OWNER
- KERNEL="ttyUSB0",       NAME="%k", OWNER="root", GROUP="uucp", MODE="0660"
- KERNEL="ttyUSB1",       NAME="%k", OWNER="root"  GROUP="uucp", MODE="0666"
- 
-+KERNEL="s3c2410_serial*" NAME="%k", OWNER="root", GROUP="uucp", MODE="0660"
-+
- # pty devices
- KERNEL="ptmx"           NAME="%k", OWNER="root", GROUP="tty",  MODE="0666"
- KERNEL="pty[p-za-e][0-9a-f]*" NAME="%k", OWNER="root", GROUP="tty",  MODE="0666"

^ permalink raw reply	[flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/udev
@ 2006-11-29 18:59 aldot at uclibc.org
  2006-11-29 21:38 ` Petr Stetiar
  0 siblings, 1 reply; 21+ messages in thread
From: aldot at uclibc.org @ 2006-11-29 18:59 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2006-11-29 10:59:43 -0800 (Wed, 29 Nov 2006)
New Revision: 16723

Log:
- build a udev for the target rather than for the host.


Modified:
   trunk/buildroot/package/udev/udev.mk


Changeset:
Modified: trunk/buildroot/package/udev/udev.mk
===================================================================
--- trunk/buildroot/package/udev/udev.mk	2006-11-29 18:15:52 UTC (rev 16722)
+++ trunk/buildroot/package/udev/udev.mk	2006-11-29 18:59:43 UTC (rev 16723)
@@ -11,6 +11,13 @@
 UDEV_TARGET_BINARY:=sbin/udev
 UDEV_BINARY:=udev
 
+# 094 had _GNU_SOURCE set
+BR2_UDEV_CFLAGS:= -D_GNU_SOURCE $(TARGET_CFLAGS)
+ifeq ($(BR2_LARGEFILE),)
+BR2_UDEV_CFLAGS+=-U_FILE_OFFSET_BITS
+endif
+
+
 # UDEV_ROOT is /dev so we can replace devfs, not /udev for experiments
 UDEV_ROOT:=/dev
 
@@ -28,7 +35,8 @@
 	touch $(UDEV_DIR)/.configured
 
 $(UDEV_DIR)/$(UDEV_BINARY): $(UDEV_DIR)/.configured
-	$(MAKE) CROSS=$(TARGET_CROSS) GCC=$(TARGET_CC) \
+	$(MAKE) CROSS=$(TARGET_CROSS) CC=$(TARGET_CC) LD=$(TARGET_CC) \
+		CFLAGS="$(BR2_UDEV_CFLAGS)" \
 		USE_LOG=false USE_SELINUX=false \
 		udevdir=$(UDEV_ROOT) -C $(UDEV_DIR)
 	touch -c $(UDEV_DIR)/$(UDEV_BINARY)
@@ -43,7 +51,10 @@
 	-mkdir $(TARGET_DIR)/sys
 	install -D -m 0644 $(UDEV_DIR)/$(UDEV_CONF) \
 		$(TARGET_DIR)/etc/udev/rules.d/50-udev.rules
-	$(MAKE) CROSS=$(TARGET_CROSS) GCC=$(TARGET_CC) DESTDIR=$(TARGET_DIR) \
+	$(MAKE) CROSS=$(TARGET_CROSS) CC=$(TARGET_CC) LD=$(TARGET_CC) \
+		DESTDIR=$(TARGET_DIR) \
+		CFLAGS="$(BR2_UDEV_CFLAGS)" \
+		LDFLAGS="-warn-common" \
 		USE_LOG=false USE_SELINUX=false \
 		udevdir=$(UDEV_ROOT) -C $(UDEV_DIR) install
 	$(INSTALL) -m 0755 -D package/udev/init-udev $(TARGET_DIR)/etc/init.d/S10udev

^ permalink raw reply	[flat|nested] 21+ messages in thread

end of thread, other threads:[~2009-02-13 19:58 UTC | newest]

Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-12-01 17:49 [Buildroot] svn commit: trunk/buildroot/package/udev aldot at uclibc.org
  -- strict thread matches above, loose matches on Subject: below --
2009-02-13 19:58 jacmet at uclibc.org
2008-12-08 13:48 jacmet at uclibc.org
2008-12-08 13:41 jacmet at uclibc.org
2008-12-08 13:41 jacmet at uclibc.org
2008-12-08 13:41 jacmet at uclibc.org
2008-04-06 10:35 nkukard at uclibc.org
2007-08-15 22:31 ulf at uclibc.org
2007-08-15 15:47 ulf at uclibc.org
2007-08-14  6:16 ulf at uclibc.org
2007-08-11 16:52 ulf at uclibc.org
2007-08-11 16:50 ulf at uclibc.org
2007-05-07  4:02 sjhill at uclibc.org
2007-01-19 16:23 aldot at uclibc.org
2007-01-14  0:59 sjhill at uclibc.org
2006-12-10 13:53 aldot at uclibc.org
2006-12-06  8:29 aldot at uclibc.org
2006-11-29 18:59 aldot at uclibc.org
2006-11-29 21:38 ` Petr Stetiar
2006-12-01 17:50   ` Bernhard Fischer
2006-12-01 20:47     ` ynezz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox