udev: update to udev-170

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2011-05-20 17:15:41 +02:00
parent b867fd862b
commit 0f05bb40d8
4 changed files with 18 additions and 180 deletions

View File

@ -42,12 +42,19 @@ LDFLAGS="$LDFLAGS -I$SYSROOT_PREFIX/usr/include/glib-2.0" \
--disable-gtk-doc-pdf \
--disable-debug \
--disable-logging \
--enable-extras \
--disable-rule_generator \
--disable-hwdb \
--disable-udev_acl \
--enable-gudev \
--disable-introspection \
--disable-keymap \
--disable-floppy \
--disable-edd \
--disable-action_modeswitch \
--without-selinux \
--without-systemdsystemunitdir \
--with-firmware-path=/lib/firmware \
--with-pci-ids-path=/usr/share/pci.ids \
--disable-introspection \
--with-gnu-ld \
make

View File

@ -42,45 +42,26 @@ mkdir -p $INSTALL/usr/lib
rm -rf $INSTALL/usr/lib/libgudev*.*T
mkdir -p $INSTALL/lib/udev
# cp $PKG_BUILD/extras/floppy/create_floppy_devices $INSTALL/lib/udev
cp $PKG_BUILD/extras/firmware/firmware $INSTALL/lib/udev
cp $PKG_BUILD/extras/rule_generator/rule_generator.functions $INSTALL/lib/udev
cp $PKG_BUILD/extras/rule_generator/write_cd_rules $INSTALL/lib/udev
cp $PKG_BUILD/extras/rule_generator/write_net_rules $INSTALL/lib/udev
chmod +x $INSTALL/lib/udev/write_*_rules
# cp $PKG_BUILD/extras/keymap/keymap $INSTALL/lib/udev
# cp $PKG_BUILD/extras/keymap/keyboard-force-release.sh $INSTALL/lib/udev
# chmod +x $INSTALL/lib/udev/keyboard-force-release.sh
# cp -R $PKG_BUILD/extras/keymap/keymaps $INSTALL/lib/udev
# cp -R $PKG_BUILD/extras/keymap/force-release-maps $INSTALL/lib/udev/keymaps/force-release
for i in ata_id cdrom_id collect edd_id path_id scsi_id usb_id v4l_id; do
for i in ata_id cdrom_id collect firmware input_id mtd_probe path_id scsi_id usb_id v4l_id; do
cp $PKG_BUILD/extras/$i/$i $INSTALL/lib/udev
done
cp $PKG_BUILD/extras/input_id/input_id $INSTALL/lib/udev
cp $PKG_BUILD/extras/usb-db/usb-db $INSTALL/lib/udev
cp $PKG_BUILD/extras/usb-db/pci-db $INSTALL/lib/udev
mkdir -p $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/extras/cdrom_id/*.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/extras/edd_id/*.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/extras/firmware/*.rules $INSTALL/lib/udev/rules.d
# cp $PKG_BUILD/extras/keymap/*.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/extras/rule_generator/*.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/extras/v4l_id/*.rules $INSTALL/lib/udev/rules.d
# cp $PKG_BUILD/rules/packages/40-alsa.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/extras/firmware/50-firmware.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/rules/rules.d/50-udev-default.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/extras/cdrom_id/60-cdrom_id.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/rules/rules.d/60-persistent-alsa.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/rules/rules.d/60-persistent-input.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/rules/rules.d/60-persistent-serial.rules $INSTALL/lib/udev/rules.d
# cp $PKG_BUILD/rules/rules.d/60-persistent-storage-tape.rules $INSTALL/lib/udev/rules.d
# cp $PKG_BUILD/rules/rules.d/75-net-description.rules $INSTALL/lib/udev/rules.d
# cp $PKG_BUILD/rules/rules.d/75-tty-description.rules $INSTALL/lib/udev/rules.d
# cp $PKG_BUILD/rules/rules.d/78-sound-card.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/rules/rules.d/60-persistent-storage-tape.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/rules/rules.d/60-persistent-storage.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/extras/v4l_id/60-persistent-v4l.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/extras/mtd_probe/75-probe_mtd.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/rules/rules.d/80-drivers.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/rules/rules.d/95-udev-late.rules $INSTALL/lib/udev/rules.d
mkdir -p $INSTALL/lib/udev/devices
mkdir -p $INSTALL/etc/udev
cp $PKG_BUILD/udev.conf $INSTALL/etc/udev
ln -sf /dev/rules.d $INSTALL/etc/udev/rules.d

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="udev"
PKG_VERSION="168"
PKG_VERSION="170"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -1,150 +0,0 @@
diff -Naur udev-168/configure.ac udev-168.patch/configure.ac
--- udev-168/configure.ac 2011-03-30 16:03:44.000000000 +0200
+++ udev-168.patch/configure.ac 2011-04-27 13:24:35.164449392 +0200
@@ -86,9 +86,6 @@
AC_SUBST([GLIB_CFLAGS])
AC_SUBST([GLIB_LIBS])
- AC_CHECK_LIB([acl], [acl_init], [:], AC_MSG_ERROR([libacl not found]))
- AC_CHECK_HEADER([acl/libacl.h], [:], AC_MSG_ERROR([libacl header not found]))
-
PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.12)
AC_SUBST(LIBUSB_CFLAGS)
AC_SUBST(LIBUSB_LIBS)
diff -Naur udev-168/Makefile.am udev-168.patch/Makefile.am
--- udev-168/Makefile.am 2011-04-13 18:21:34.000000000 +0200
+++ udev-168.patch/Makefile.am 2011-04-27 13:25:23.987426115 +0200
@@ -473,21 +473,6 @@
libexec_PROGRAMS += extras/hid2hci/hid2hci
# ------------------------------------------------------------------------------
-# udev_acl - apply ACLs for users with local forground sessions
-# ------------------------------------------------------------------------------
-extras_udev_acl_udev_acl_SOURCES = extras/udev-acl/udev-acl.c
-extras_udev_acl_udev_acl_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
-extras_udev_acl_udev_acl_LDADD = libudev/libudev-private.la -lacl $(GLIB_LIBS)
-dist_udevrules_DATA += extras/udev-acl/70-acl.rules
-libexec_PROGRAMS += extras/udev-acl/udev-acl
-
-udevacl-install-hook:
- mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
- ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
-
-INSTALL_EXEC_HOOKS += udevacl-install-hook
-
-# ------------------------------------------------------------------------------
# usb-db - read USB vendor/device string database
# ------------------------------------------------------------------------------
extras_usb_db_usb_db_SOURCES = extras/usb-db/usb-db.c
@@ -534,111 +519,6 @@
libexec_PROGRAMS += extras/mtd_probe/mtd_probe
-
-# ------------------------------------------------------------------------------
-# keymap - map custom hardware's multimedia keys
-# ------------------------------------------------------------------------------
-extras_keymap_keymap_SOURCES = extras/keymap/keymap.c
-extras_keymap_keymap_CPPFLAGS = $(AM_CPPFLAGS) -I extras/keymap
-nodist_extras_keymap_keymap_SOURCES = \
- extras/keymap/keys-from-name.h \
- extras/keymap/keys-to-name.h
-BUILT_SOURCES += $(nodist_extras_keymap_keymap_SOURCES)
-
-EXTRA_DIST += extras/keymap/check-keymaps.sh
-dist_udevrules_DATA += extras/keymap/95-keymap.rules
-dist_udevrules_DATA += extras/keymap/95-keyboard-force-release.rules
-libexec_PROGRAMS += extras/keymap/keymap
-dist_libexec_SCRIPTS += extras/keymap/findkeyboards
-dist_libexec_SCRIPTS += extras/keymap/keyboard-force-release.sh
-dist_doc_DATA = extras/keymap/README.keymap.txt
-
-CLEANFILES += \
- extras/keymap/keys.txt \
- extras/keymap/keys-from-name.gperf
-
-udevkeymapdir = $(libexecdir)/keymaps
-dist_udevkeymap_DATA = \
- extras/keymap/keymaps/acer \
- extras/keymap/keymaps/acer-aspire_5720 \
- extras/keymap/keymaps/acer-aspire_8930 \
- extras/keymap/keymaps/acer-aspire_5920g \
- extras/keymap/keymaps/acer-aspire_6920 \
- extras/keymap/keymaps/acer-travelmate_c300 \
- extras/keymap/keymaps/asus \
- extras/keymap/keymaps/compaq-e_evo \
- extras/keymap/keymaps/dell \
- extras/keymap/keymaps/dell-latitude-xt2 \
- extras/keymap/keymaps/everex-xt5000 \
- extras/keymap/keymaps/fujitsu-amilo_pa_2548 \
- extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \
- extras/keymap/keymaps/fujitsu-amilo_pro_v3205 \
- extras/keymap/keymaps/fujitsu-amilo_si_1520 \
- extras/keymap/keymaps/fujitsu-esprimo_mobile_v5 \
- extras/keymap/keymaps/fujitsu-esprimo_mobile_v6 \
- extras/keymap/keymaps/hewlett-packard \
- extras/keymap/keymaps/hewlett-packard-2510p_2530p \
- extras/keymap/keymaps/hewlett-packard-compaq_elitebook \
- extras/keymap/keymaps/hewlett-packard-pavilion \
- extras/keymap/keymaps/hewlett-packard-presario-2100 \
- extras/keymap/keymaps/hewlett-packard-tablet \
- extras/keymap/keymaps/hewlett-packard-tx2 \
- extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
- extras/keymap/keymaps/inventec-symphony_6.0_7.0 \
- extras/keymap/keymaps/lenovo-3000 \
- extras/keymap/keymaps/lenovo-ideapad \
- extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
- extras/keymap/keymaps/lenovo-thinkpad_x6_tablet \
- extras/keymap/keymaps/lenovo-thinkpad_x200_tablet \
- extras/keymap/keymaps/lg-x110 \
- extras/keymap/keymaps/logitech-wave \
- extras/keymap/keymaps/logitech-wave-cordless \
- extras/keymap/keymaps/logitech-wave-pro-cordless \
- extras/keymap/keymaps/maxdata-pro_7000 \
- extras/keymap/keymaps/medion-fid2060 \
- extras/keymap/keymaps/medionnb-a555 \
- extras/keymap/keymaps/micro-star \
- extras/keymap/keymaps/module-asus-w3j \
- extras/keymap/keymaps/module-ibm \
- extras/keymap/keymaps/module-lenovo \
- extras/keymap/keymaps/module-sony \
- extras/keymap/keymaps/module-sony-old \
- extras/keymap/keymaps/module-sony-vgn \
- extras/keymap/keymaps/olpc-xo \
- extras/keymap/keymaps/onkyo \
- extras/keymap/keymaps/oqo-model2 \
- extras/keymap/keymaps/samsung-other \
- extras/keymap/keymaps/samsung-sq1us \
- extras/keymap/keymaps/samsung-sx20s \
- extras/keymap/keymaps/toshiba-satellite_a100 \
- extras/keymap/keymaps/toshiba-satellite_a110 \
- extras/keymap/keymaps/toshiba-satellite_m30x \
- extras/keymap/keymaps/zepto-znote
-
-udevkeymapforcereldir = $(libexecdir)/keymaps/force-release
-dist_udevkeymapforcerel_DATA = \
- extras/keymap/force-release-maps/dell-touchpad \
- extras/keymap/force-release-maps/hp-other \
- extras/keymap/force-release-maps/samsung-other \
- extras/keymap/force-release-maps/common-volume-keys
-
-extras/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
- $(AM_V_at)mkdir -p extras/keymap
- $(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
-
-extras/keymap/keys-from-name.gperf: extras/keymap/keys.txt
- $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@
-
-extras/keymap/keys-from-name.h: extras/keymap/keys-from-name.gperf Makefile
- $(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_key -H hash_key_name -p -C < $< > $@
-
-extras/keymap/keys-to-name.h: extras/keymap/keys.txt Makefile
- $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
-
-keymaps-distcheck-hook: extras/keymap/keys.txt
- $(top_srcdir)/extras/keymap/check-keymaps.sh $(top_srcdir) $^
-DISTCHECK_HOOKS += keymaps-distcheck-hook
-
endif # ENABLE_EXTRAS
# ------------------------------------------------------------------------------