Author: glen Date: Fri Jan 22 10:19:23 2010 GMT
Module: packages Tag: UDEV-124
---- Log message:
- initramfs bcond; initramfs and initrd disabled for ac; rel 8
---- Files affected:
packages/udev:
udev.spec (1.240.2.11 -> 1.240.2.12)
---- Diffs:
================================================================
Index: packages/udev/udev.spec
diff -u packages/udev/udev.spec:1.240.2.11 packages/udev/udev.spec:1.240.2.12
--- packages/udev/udev.spec:1.240.2.11 Tue Jan 19 15:21:53 2010
+++ packages/udev/udev.spec Fri Jan 22 11:19:17 2010
@@ -4,13 +4,19 @@
# - initrd build with uclibc on amd64 produces non-working binary (illegal instruction from open("/dev/null"))
#
# Conditional build:
-%bcond_without initrd # build without udev-initrd
-%bcond_without uClibc # link initrd version with static uClibc
-%bcond_with klibc # link initrd version with static klibc
-%bcond_with dietlibc # link initrd version with static dietlibc (currently broken and unsupported)
-%bcond_with glibc # link initrd version with static glibc
-%bcond_without main # don't compile main package, use for debugging initrd build
-%bcond_without selinux # build without SELinux support
+%if "%{pld_release}" == "ac"
+%bcond_with initrd # build without udev-initrd
+%bcond_with initramfs # build with initramfs-tools
+%else
+%bcond_without initrd # build without udev-initrd
+%bcond_without initramfs # build without initramfs-tools
+%endif
+%bcond_without uClibc # link initrd version with static uClibc
+%bcond_with klibc # link initrd version with static klibc
+%bcond_with dietlibc # link initrd version with static dietlibc (currently broken and unsupported)
+%bcond_with glibc # link initrd version with static glibc
+%bcond_without main # don't compile main package, use for debugging initrd build
+%bcond_without selinux # build without SELinux support
%ifarch sparc sparc64
%define with_glibc 1
@@ -33,7 +39,7 @@
Summary(pl.UTF-8): Zarządca urządzeń dla Linuksa 2.6
Name: udev
Version: 124
-Release: 7
+Release: 8
Epoch: 1
License: GPL
Group: Base
@@ -66,6 +72,7 @@
URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
BuildRequires: device-mapper-devel
%{?with_selinux:BuildRequires: libselinux-devel >= 1.17.13}
+BuildRequires: rpm >= 4.4.9-56
BuildRequires: sed >= 4.0
%if %{with initrd}
%{?with_dietlibc:BuildRequires: dietlibc-static}
@@ -120,10 +127,12 @@
Requires: initramfs-tools
%description initramfs
-A userspace implementation of devfs - support scripts for initramfs-tools.
+A userspace implementation of devfs - support scripts for
+initramfs-tools.
%description initramfs -l pl.UTF-8
-Implementacja devfs w przestrzeni użytkownika - skrypty dla initramfs-tools.
+Implementacja devfs w przestrzeni użytkownika - skrypty dla
+initramfs-tools.
%package initrd
Summary: A userspace implementation of devfs - static binary for initrd
@@ -255,10 +264,10 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
initdir=/etc/rc.d/init.d \
- libudevdir=/lib/udev \
- libdir=/%{_lib} \
- usrlibdir=%{_libdir} \
- udevdir=/dev \
+ libudevdir=/lib/udev \
+ libdir=/%{_lib} \
+ usrlibdir=%{_libdir} \
+ udevdir=/dev \
EXTRAS="%{extras}"
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.rules
@@ -293,14 +302,15 @@
install extras/volume_id/lib/*.a $RPM_BUILD_ROOT%{_libdir}
%endif
-
# install misc
install %{SOURCE32} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/udev_blacklist.conf
+%if %{with initramfs}
# install support for initramfs-tools
install %{SOURCE40} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/scripts/init-bottom/udev
install %{SOURCE41} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/hooks/udev
install %{SOURCE42} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/scripts/init-premount/udev
+%endif
%if %{with initrd}
install -d $RPM_BUILD_ROOT%{_sbindir}
@@ -411,11 +421,13 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_prefix}/sbin/udev_import_usermap
+%if %{with initramfs}
%files initramfs
%defattr(644,root,root,755)
%attr(755,root,root) %{_datadir}/initramfs-tools/scripts/init-bottom/udev
%attr(755,root,root) %{_datadir}/initramfs-tools/hooks/udev
%attr(755,root,root) %{_datadir}/initramfs-tools/scripts/init-premount/udev
+%endif
%files -n libvolume_id
%defattr(644,root,root,755)
@@ -438,6 +450,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.240.2.12 2010/01/22 10:19:17 glen
+- initramfs bcond; initramfs and initrd disabled for ac; rel 8
+
Revision 1.240.2.11 2010/01/19 14:21:53 glen
- package minimal fallback devices to /lib/udev/devices; rel 7
@@ -629,7 +644,7 @@
- rel 4
- added initrd-udevd, initrd-udevtrigger,initrd-udevsettle
- udevtrigger and udevsettle needed in initrd to make nodes for
-staticly linked devices
+ staticly linked devices
- udevd is an alternative for running udev and echoing /sbin/udev > /proc/sys/kernel/hotplug
- now either one runns udevd --daemon in initrd or echoes the above and uses udev
- echo version supported in new geninitrd
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/udev/udev.spec?r1=1.240.2.11&r2=1.240.2.12&f=u