Author: arekm Date: Thu May 19 18:35:31 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 169 but rel 0.1 - new configure options are broken and don't make any
effect
---- Files affected:
packages/udev:
udev-uClibc.patch (1.4 -> 1.5) , udev.spec (1.349 -> 1.350)
---- Diffs:
================================================================
Index: packages/udev/udev-uClibc.patch
diff -u packages/udev/udev-uClibc.patch:1.4 packages/udev/udev-uClibc.patch:1.5
--- packages/udev/udev-uClibc.patch:1.4 Tue Apr 26 02:04:14 2011
+++ packages/udev/udev-uClibc.patch Thu May 19 20:35:26 2011
@@ -243,21 +243,24 @@
#include <sys/types.h>
#include <sys/poll.h>
#include <sys/socket.h>
-@@ -184,11 +185,18 @@
+@@ -185,13 +185,21 @@
conn->refcount = 1;
conn->uctrl = uctrl;
+#ifdef __UCLIBC__
+ conn->sock = accept(uctrl->sock, NULL, NULL);
+#else
- conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC);
+ conn->sock = accept4(uctrl->sock, NULL, NULL,
SOCK_CLOEXEC|SOCK_NONBLOCK);
+#endif
if (conn->sock < 0) {
+ if (errno != EINTR)
+ err(uctrl->udev, "unable to receive ctrl connection:
%m\n");
free(conn);
return NULL;
}
+#ifdef __UCLIBC__
+ fcntl(conn->sock, F_SETFD, FD_CLOEXEC);
++ fcntl(conn->sock, F_SETFL, O_NONBLOCK);
+#endif
/* enable receiving of the sender credentials */
================================================================
Index: packages/udev/udev.spec
diff -u packages/udev/udev.spec:1.349 packages/udev/udev.spec:1.350
--- packages/udev/udev.spec:1.349 Wed May 11 23:30:31 2011
+++ packages/udev/udev.spec Thu May 19 20:35:26 2011
@@ -32,13 +32,13 @@
Summary(pl.UTF-8): Zarządca urządzeń dla Linuksa 2.6
Name: udev
# Verify ChangeLog and NEWS when updating (since there are
incompatible/breaking changes very often)
-Version: 168
-Release: 2
+Version: 169
+Release: 0.1
Epoch: 1
License: GPL v2+
Group: Base
Source0:
ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
-# Source0-md5: 4a466078532ab5dd5c35acc3ea2ec9a1
+# Source0-md5: 967c66e6b8e29d7cfc98326c5b00454d
# rules
Source1: %{name}-alsa.rules
Source2: %{name}.rules
@@ -152,7 +152,7 @@
Requires: coreutils
Requires: filesystem >= 3.0-43
Requires: setup >= 2.6.1-1
-Requires: uname(release) >= 2.6.25
+Requires: uname(release) >= 2.6.32
Suggests: %{name}-compat
Conflicts: udev < 1:118-1
@@ -313,7 +313,11 @@
%{?debug:--enable-debug} \
--libexecdir=/lib/udev \
--with-rootlibdir=/%{_lib} \
- --disable-extras \
+ --disable-rule_generator \
+ --disable-hwdb \
+ --disable-udev_acl \
+ --disable-gudev \
+ --disable-keymap \
--disable-gtk-doc \
--disable-introspection \
--disable-logging \
@@ -339,9 +343,12 @@
--with-html-dir=%{_gtkdocdir} \
--with-rootlibdir=/%{_lib} \
--disable-silent-rules \
- --enable-extras \
+ --enable-edd \
+ --enable-hid2hci \
+ --enable-action_modeswitch \
--enable-gtk-doc \
--enable-introspection \
+ --enable-floppy \
--enable-logging \
--enable-shared \
--enable-static \
@@ -391,7 +398,6 @@
ln -s udevd $RPM_BUILD_ROOT%{_libdir}/initrd/udevstart
install -p udev-initrd/lib/udev/*_id $RPM_BUILD_ROOT%{_libdir}/initrd/udev
install -p udev-initrd/lib/udev/collect $RPM_BUILD_ROOT%{_libdir}/initrd/udev
-install -p udev-initrd/lib/udev/create_floppy_devices
$RPM_BUILD_ROOT%{_libdir}/initrd/udev
install -p udev-initrd/lib/udev/firmware $RPM_BUILD_ROOT%{_libdir}/initrd/udev
%endif
@@ -459,7 +465,7 @@
%attr(755,root,root) /lib/udev/keyboard-force-release.sh
%attr(755,root,root) /lib/udev/*_helper
-%attr(755,root,root) /lib/udev/*_rules
+#%attr(755,root,root) /lib/udev/*_rules
%attr(755,root,root) /lib/udev/ata_id
%attr(755,root,root) /lib/udev/cdrom_id
@@ -479,7 +485,7 @@
%attr(755,root,root) /lib/udev/usb-db
%attr(755,root,root) /lib/udev/findkeyboards
-%attr(755,root,root) /lib/udev/mobile-action-modeswitch
+#%attr(755,root,root) /lib/udev/mobile-action-modeswitch
%attr(755,root,root) %{_sbindir}/start_udev
%attr(755,root,root) %{_sbindir}/udevd
@@ -496,7 +502,7 @@
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/udev.conf
# rules below are NOT supposed to be changed by users
-/lib/udev/rule_generator.functions
+#/lib/udev/rule_generator.functions
%dir /lib/udev/rules.d
/lib/udev/rules.d/42-qemu-usb.rules
/lib/udev/rules.d/50-firmware.rules
@@ -509,10 +515,10 @@
/lib/udev/rules.d/60-persistent-storage-tape.rules
/lib/udev/rules.d/60-persistent-storage.rules
/lib/udev/rules.d/60-persistent-v4l.rules
-/lib/udev/rules.d/61-mobile-action.rules
+#/lib/udev/rules.d/61-mobile-action.rules
/lib/udev/rules.d/61-persistent-storage-edd.rules
-/lib/udev/rules.d/70-hid2hci.rules
-/lib/udev/rules.d/75-cd-aliases-generator.rules
+#/lib/udev/rules.d/70-hid2hci.rules
+#/lib/udev/rules.d/75-cd-aliases-generator.rules
/lib/udev/rules.d/75-net-description.rules
/lib/udev/rules.d/75-probe_mtd.rules
/lib/udev/rules.d/75-tty-description.rules
@@ -579,7 +585,6 @@
%attr(755,root,root) %{_libdir}/initrd/udevstart
%attr(755,root,root) %{_libdir}/initrd/udev/*_id
%attr(755,root,root) %{_libdir}/initrd/udev/collect
-%attr(755,root,root) %{_libdir}/initrd/udev/create_floppy_devices
%attr(755,root,root) %{_libdir}/initrd/udev/firmware
%endif
@@ -595,6 +600,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.350 2011/05/19 18:35:26 arekm
+- up to 169 but rel 0.1 - new configure options are broken and don't make any
effect
+
Revision 1.349 2011/05/11 21:30:31 charles
- removed /lib/udev/hid2hci (conflicts with bluez and this has been removed in
udev 169)
- BR: zlib-devel
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/udev/udev-uClibc.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/udev/udev.spec?r1=1.349&r2=1.350&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
