packages: udev/udev.spec - rel 2 - build initrd package with uClibc (build ...

[baggins]

Author: baggins                      Date: Tue Jan 19 23:00:17 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- build initrd package with uClibc (build and works)
- removed uClibc amd64 TODO comment (long outdated)
- add firmware loader to initrd
- always package introspection stuff

---- Files affected:
packages/udev:
   udev.spec (1.315 -> 1.316) 

---- Diffs:

================================================================
Index: packages/udev/udev.spec
diff -u packages/udev/udev.spec:1.315 packages/udev/udev.spec:1.316
--- packages/udev/udev.spec:1.315	Tue Jan 19 17:53:29 2010
+++ packages/udev/udev.spec	Wed Jan 20 00:00:12 2010
@@ -1,15 +1,14 @@
 # $Revision$, $Date$
 # TODO
 # - initrd needs love (is probably completly unusable in current form)
-# - initrd build with uClibc on amd64 produces non-working binary (illegal instruction from open("/dev/null"))
 # - add compat rules for kernels < 2.6.31 as udev-compat subpackage and then lower uname requirement
 #
 # Conditional build:
 %bcond_without	initrd		# build without udev-initrd
-%bcond_with	uClibc		# link initrd version with static uClibc
+%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_without	glibc		# link initrd version with static glibc
+%bcond_with	glibc		# link initrd version with static glibc
 %bcond_without	selinux		# build without SELinux support
 
 %ifarch sparc sparc64
@@ -33,7 +32,7 @@
 Summary(pl.UTF-8):	Zarządca urządzeń dla Linuksa 2.6
 Name:		udev
 Version:	150
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL
 Group:		Base
@@ -53,6 +52,7 @@
 Source31:	%{name}-initramfs-hook
 Source32:	%{name}-initramfs-premount
 Patch0:		%{name}-so.patch
+Patch1:		%{name}-uClibc.patch
 URL:		http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
 BuildRequires:	ConsoleKit-devel >= 0.4.1
 BuildRequires:	acl-devel
@@ -87,7 +87,7 @@
 BuildRequires:	libusb-static
 %{?with_klibc:BuildRequires:	linux-libc-headers}
 BuildRequires:	pcre-static
-%{?with_uClibc:BuildRequires:	uClibc-static >= 3:0.9.29-23}
+%{?with_uClibc:BuildRequires:	uClibc-static >= 3:0.9.30.2-2}
 %endif
 Requires:	%{name}-core = %{epoch}:%{version}-%{release}
 Provides:	dev = 3.5.0
@@ -262,6 +262,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__gtkdocize}
@@ -359,6 +360,7 @@
 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
 install -p udev-initrd/lib/udev/fstab_import $RPM_BUILD_ROOT%{_libdir}/initrd/udev
 %endif
 
@@ -511,7 +513,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgudev-1.0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgudev-1.0.so.0
-%{?debug:%{_libdir}/girepository-1.0/*.typelib}
+%{_libdir}/girepository-1.0/*.typelib
 
 %files glib-devel
 %defattr(644,root,root,755)
@@ -519,7 +521,7 @@
 %attr(755,root,root) %{_libdir}/libgudev-1.0.so
 %{_includedir}/gudev-1.0
 %{_pkgconfigdir}/gudev-1.0.pc
-%{?debug:%{_datadir}/gir-1.0/*.gir}
+%{_datadir}/gir-1.0/*.gir
 
 %files glib-static
 %defattr(644,root,root,755)
@@ -539,6 +541,7 @@
 %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
 %attr(755,root,root) %{_libdir}/initrd/udev/fstab_import
 %endif
 
@@ -554,6 +557,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.316  2010/01/19 23:00:12  baggins
+- rel 2
+- build initrd package with uClibc (build and works)
+- removed uClibc amd64 TODO comment (long outdated)
+- add firmware loader to initrd
+- always package introspection stuff
+
 Revision 1.315  2010/01/19 16:53:29  baggins
 - disable extras for initrd
 - enable introspection crap for normal build (i was wrong, it's not only debug)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/udev/udev.spec?r1=1.315&r2=1.316&f=u