Hello community, here is the log from the commit of package udev for openSUSE:Factory checked in at 2012-03-22 13:36:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/udev (Old) and /work/SRC/openSUSE:Factory/.udev.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "udev", Maintainer is "rmila...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/udev/udev.changes 2012-01-25 15:02:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.udev.new/udev.changes 2012-03-22 13:36:51.000000000 +0100 @@ -1,0 +2,44 @@ +Tue Mar 13 12:07:32 UTC 2012 - rmila...@suse.com + +- version 181 + - boot.udev: root_symlink_rule now creates the rule 10-root-symlink.rules + in /run/udev/rules.d and a link to /dev/.udev (for the good old times). + - require kmod version 5. + - keymap: Add Fujitsu Siemens Amilo Li 2732 + - ata_id: fix identify string fixup + - ata_id: whitespace fixes + - keymap: Fix touchpad toggle button on Lenovo Ideapad + * version 180: + - Bugfixes. + * version 179: + - Bugfixes. + * version 178: + - RUN+="socket:.." option is deprecated and should not be used. + * version 177: + - Bugfixes. + * version 176: + - 'devtmpfs' filesystem is required now, udev will not create or delete + device nodes anymore. + - writable /run directory (ususally tmpfs) is required now. + - there is no longer a fallback to /dev/.udev. + - modules are now loaded directly by linking udev to 'libkmod'. + - udev links directly to libblkid now. + - 'udevadm control --reload-rules' option has been renamed to '--reload'. + * version 175: + - Bugfixes. + * version 174: + - udev daemon moved to /lib/udev/udevd. + (we moved it back: move-udevd-and-udevadm-back-to-sbin.patch) + - long deprecated keys: SYSFS=, ID=, BUS= have been removed. + - 'udevadm trigger --type=failed, and the RUN{fail_event_on_error} attribute + was removed. + - udev control socket is now created in /run/udev/control. + + (for more info please check /usr/share/doc/packages/udev/NEWS) + +- build-requires: + libblkid-devel >= 2.20 , libkmod-devel, libtool, automake, autoconf. +- requires: + util-linux >= 2.20, libkmod2, systemd > 39. + +------------------------------------------------------------------- Old: ---- udev-173.tar.bz2 udev.git-617746e09795575c6258dd075ee7f0a44ce61e1e.patch udev.git-7944a13a2b8516d5fa354703789f5988cb4299b6.patch New: ---- move-udevd-and-udevadm-back-to-sbin.patch udev-181.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ udev.spec ++++++ --- /var/tmp/diff_new_pack.Mq76tw/_old 2012-03-22 13:36:53.000000000 +0100 +++ /var/tmp/diff_new_pack.Mq76tw/_new 2012-03-22 13:36:53.000000000 +0100 @@ -15,21 +15,26 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: udev Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html -Version: 173 +Version: 181 Release: 0 Summary: A rule-based device node and kernel event manager License: GPL-2.0+ Group: System/Kernel -PreReq: /bin/pidof /bin/rm /usr/bin/stat %insserv_prereq %fillup_prereq /usr/sbin/groupadd -Conflicts: systemd < 28 +PreReq: /bin/pidof /bin/rm /usr/bin/stat %insserv_prereq %fillup_prereq /usr/sbin/groupadd /usr/bin/getent +Conflicts: systemd < 39 Conflicts: aaa_base < 11.5 Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 Conflicts: util-linux < 2.16 Conflicts: ConsoleKit < 0.4.1 BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: automake +BuildRequires: autoconf +BuildRequires: libtool BuildRequires: glib2-devel BuildRequires: gobject-introspection-devel BuildRequires: gperf @@ -40,14 +45,14 @@ BuildRequires: pciutils-ids BuildRequires: pkg-config BuildRequires: usbutils +BuildRequires: libblkid-devel >= 2.20 +BuildRequires: libkmod-devel > 5 Source0: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2 Source1: udev-rpmlintrc Source2: baselibs.conf Source60: boot.udev -#Patch from upstream to make bluetooth input devices working again. -Patch1: udev.git-617746e09795575c6258dd075ee7f0a44ce61e1e.patch -#PATCH-FIX-UPSTREAM bnc#722858 -Patch2: udev.git-7944a13a2b8516d5fa354703789f5988cb4299b6.patch +# PATCH-FIX-OPENSUSE move-udevd-and-udevadm-back-to-sbin.patch +Patch0: move-udevd-and-udevadm-back-to-sbin.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -115,10 +120,11 @@ %prep %setup -q -%patch1 -p1 -%patch2 -p1 +# patching +%patch0 -p1 %build +autoreconf -vfi # prevent man pages from re-building (xmlto) find . -name "*.[1-8]" -exec touch '{}' \; export V=1 @@ -126,7 +132,7 @@ --sysconfdir=%{_sysconfdir} \ --sbindir=/sbin \ --with-rootlibdir=/%{_lib} \ - --libexecdir=/lib/udev \ + --libexecdir=/lib \ --docdir=%{_docdir}/udev \ --with-selinux \ --with-systemdsystemunitdir=/lib/systemd/system \ @@ -139,7 +145,12 @@ make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT/%{_libdir}/libudev.la rm -f $RPM_BUILD_ROOT/%{_libdir}/libgudev-1.0.la -cp -ax README $RPM_BUILD_ROOT%{_docdir}/udev + +mkdir -p $RPM_BUILD_ROOT%{_bindir} +ln -sf ../../sbin/udevadm $RPM_BUILD_ROOT%{_bindir}/udevadm +ln -sf ../../sbin/udevd $RPM_BUILD_ROOT/lib/udev/udevd + +cp -ax README NEWS $RPM_BUILD_ROOT%{_docdir}/udev %ifarch ppc ppc64 cp rules/arch/40-ppc.rules $RPM_BUILD_ROOT/lib/udev/rules.d/ %endif @@ -152,7 +163,7 @@ install -m755 -D %{S:60} $RPM_BUILD_ROOT/etc/init.d/boot.udev %pre -/usr/sbin/groupadd -r tape 2> /dev/null || : +/usr/bin/getent group tape > /dev/null 2>&1 || /usr/sbin/groupadd -r tape 2> /dev/null # stop daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root; then if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then @@ -199,6 +210,8 @@ %defattr(-,root,root) /sbin/udevd /sbin/udevadm +%dir %{_bindir} +%{_bindir}/udevadm %dir /lib/udev/ /lib/udev/* %dir /lib/udev/keymaps ++++++ boot.udev ++++++ --- /var/tmp/diff_new_pack.Mq76tw/_old 2012-03-22 13:36:53.000000000 +0100 +++ /var/tmp/diff_new_pack.Mq76tw/_new 2012-03-22 13:36:53.000000000 +0100 @@ -20,14 +20,17 @@ root_symlink_rule() { eval $(/sbin/udevadm info --export --export-prefix=ROOT_ --device-id-of-file=/) [ "$ROOT_MAJOR" -gt 0 ] || return + + [ -d /run/udev/rules.d ] || mkdir -m 0755 -p /run/udev/rules.d + ln -sf /run/udev/rules.d /dev/.udev 2>/dev/null || : - mkdir -m 0755 -p /dev/.udev/rules.d/ echo "\ ACTION==\"add|change\", SUBSYSTEM==\"block\", \ ENV{MAJOR}==\"$ROOT_MAJOR\", ENV{MINOR}==\"$ROOT_MINOR\", \ -SYMLINK+=\"root\"" > /dev/.udev/rules.d/10-root-symlink.rules +SYMLINK+=\"root\"" > /run/udev/rules.d/10-root-symlink.rules } + case "$1" in start) # create /dev/root symlink with dynamic rule ++++++ move-udevd-and-udevadm-back-to-sbin.patch ++++++ diff -ur udev-181.orig/Makefile.am udev-181/Makefile.am --- udev-181.orig/Makefile.am 2012-03-13 14:18:13.795173776 +0100 +++ udev-181/Makefile.am 2012-03-13 14:29:50.348024644 +0100 @@ -207,11 +207,9 @@ INSTALL_DATA_HOOKS += systemd-install-hook endif -bin_PROGRAMS = \ - src/udevadm - -pkglibexec_PROGRAMS = \ - src/udevd +sbin_PROGRAMS = \ + src/udevd \ + src/udevadm udev_common_sources = \ src/udev.h \ @@ -330,7 +328,7 @@ # ------------------------------------------------------------------------------ src_extras_ata_id_ata_id_SOURCES = src/extras/ata_id/ata_id.c src_extras_ata_id_ata_id_LDADD = src/libudev-private.la -pkglibexec_PROGRAMS += src/extras/ata_id/ata_id +pkglibexec_PROGRAMS = src/extras/ata_id/ata_id # ------------------------------------------------------------------------------ # cdrom_id - optical drive/media capability diff -ur udev-181.orig/Makefile.in udev-181/Makefile.in --- udev-181.orig/Makefile.in 2012-03-13 14:18:13.795173776 +0100 +++ udev-181/Makefile.in 2012-03-13 14:20:55.704584024 +0100 @@ -55,9 +55,10 @@ @WITH_SYSTEMD_TRUE@ src/udev-settle.service @WITH_SYSTEMD_TRUE@am__append_4 = systemd-install-hook -bin_PROGRAMS = src/udevadm$(EXEEXT) -pkglibexec_PROGRAMS = src/udevd$(EXEEXT) \ - src/extras/ata_id/ata_id$(EXEEXT) \ +sbin_PROGRAMS = src/udevadm$(EXEEXT) \ + src/udevd$(EXEEXT) + +pkglibexec_PROGRAMS = src/extras/ata_id/ata_id$(EXEEXT) \ src/extras/cdrom_id/cdrom_id$(EXEEXT) \ src/extras/collect/collect$(EXEEXT) \ src/extras/scsi_id/scsi_id$(EXEEXT) \ @@ -254,7 +255,7 @@ @ENABLE_UDEV_ACL_TRUE@am__EXEEXT_3 = src/udev-acl$(EXEEXT) @ENABLE_FLOPPY_TRUE@am__EXEEXT_4 = src/create_floppy_devices$(EXEEXT) @ENABLE_EDD_TRUE@am__EXEEXT_5 = src/edd_id$(EXEEXT) -PROGRAMS = $(bin_PROGRAMS) $(pkglibexec_PROGRAMS) +PROGRAMS = $(sbin_PROGRAMS) $(pkglibexec_PROGRAMS) am__src_create_floppy_devices_SOURCES_DIST = \ src/extras/floppy/create_floppy_devices.c @ENABLE_FLOPPY_TRUE@am_src_create_floppy_devices_OBJECTS = src/extras/floppy/create_floppy_devices.$(OBJEXT) @@ -1340,10 +1341,10 @@ $(AM_V_CCLD)$(LINK) $(src_libudev_private_la_OBJECTS) $(src_libudev_private_la_LIBADD) $(LIBS) src/libudev.la: $(src_libudev_la_OBJECTS) $(src_libudev_la_DEPENDENCIES) $(EXTRA_src_libudev_la_DEPENDENCIES) src/$(am__dirstamp) $(AM_V_CCLD)$(src_libudev_la_LINK) -rpath $(libdir) $(src_libudev_la_OBJECTS) $(src_libudev_la_LIBADD) $(LIBS) -install-binPROGRAMS: $(bin_PROGRAMS) +install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + @list='$(sbin_PROGRAMS)'; test -n "$(bindir)" || list=; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -1365,9 +1366,9 @@ } \ ; done -uninstall-binPROGRAMS: +uninstall-sbinPROGRAMS: @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + @list='$(sbin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ -e 's/$$/$(EXEEXT)/' `; \ @@ -1375,8 +1376,8 @@ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files -clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ +clean-sbinPROGRAMS: + @list='$(sbin_PROGRAMS)'; test -n "$$list" || exit 0; \ echo " rm -f" $$list; \ rm -f $$list || exit $$?; \ test -n "$(EXEEXT)" || exit 0; \ ++++++ udev-173.tar.bz2 -> udev-181.tar.bz2 ++++++ ++++ 101993 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org