Commit 0a4b6a3b authored by "Steven J. Hill"'s avatar "Steven J. Hill"
Browse files

Upgrade to udev-101. We also create and init script that actually works and... 

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.
parent 5d8342c7

package/udev/Config.in

+20 −0
Original line number Diff line number Diff line
@@ -5,3 +5,23 @@ config BR2_PACKAGE_UDEV 
	  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

package/udev/init-udev

+37 −37
Original line number Diff line number Diff line
@@ -23,12 +23,10 @@ case $(uname -r) in 
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
@@ -59,23 +57,25 @@ case "$1" in 
	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... "

        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

        ;;

    stop)

	# do nothing

        # Stop execution of events

        udevcontrol stop_exec_queue

        killall udevd

        ;;

    *)

        echo "Usage: $0 {start|stop}"

        exit 1

        ;;

esac





exit 0

package/udev/udev-100.fix_makefile.patch→package/udev/udev-install.patch

+11 −0
Original line number Diff line number Diff line 
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 @@

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 udevd $(DESTDIR)$(sbindir)/udevd

+	$(INSTALL_PROGRAM) -D udev $(DESTDIR)$(sbindir)/udev

+	$(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
 
 	$(INSTALL_PROGRAM) -D udevcontrol $(DESTDIR)$(sbindir)/udevcontrol

package/udev/udev.conf

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
# 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

package/udev/udev.mk

+45 −15
Original line number Diff line number Diff line
@@ -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 @@ $(UDEV_DIR)/$(UDEV_BINARY): $(UDEV_DIR)/.configured 
		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 @@ udev-dirclean: 
ifeq ($(strip $(BR2_PACKAGE_UDEV)),y)

TARGETS+=udev

endif



ifeq ($(strip $(BR2_PACKAGE_UDEV_VOLUME_ID)),y)

TARGETS+=udev-volume_id

endif