Author: patrys Date: Sun Jun 28 21:26:51 2009 GMT
Module: packages Tag: DEVEL
---- Log message:
- make initrd work at least with glibc
---- Files affected:
packages/udev:
udev.spec (1.294.2.2 -> 1.294.2.3)
---- Diffs:
================================================================
Index: packages/udev/udev.spec
diff -u packages/udev/udev.spec:1.294.2.2 packages/udev/udev.spec:1.294.2.3
--- packages/udev/udev.spec:1.294.2.2 Sun Jun 28 20:43:06 2009
+++ packages/udev/udev.spec Sun Jun 28 23:26:46 2009
@@ -4,11 +4,11 @@
# - initrd build with uclibc on amd64 produces non-working binary (illegal
instruction from open("/dev/null"))
#
# Conditional build:
-%bcond_with initrd # build without udev-initrd
-%bcond_without uClibc # link initrd version with static uClibc
+%bcond_without initrd # build without udev-initrd
+%bcond_with 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 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
@@ -64,9 +64,14 @@
BuildRequires: libusb-devel
BuildRequires: pciutils
BuildRequires: sed >= 4.0
+BuildRequires: usbutils >= 0.82
%if %{with initrd}
%{?with_dietlibc:BuildRequires: dietlibc-static}
-%{?with_glibc:BuildRequires: glibc-static}
+%if %{with glibc}
+BuildRequires: glibc-static
+BuildRequires: libselinux-static
+BuildRequires: libsepol-static
+%endif
%{?with_klibc:BuildRequires: klibc-static}
%{?with_klibc:BuildRequires: linux-libc-headers}
%{?with_uClibc:BuildRequires: uClibc-static >= 3:0.9.29-23}
@@ -248,20 +253,26 @@
%{?with_dietlibc:CC="diet %{__cc} %{rpmcflags} %{rpmldflags} -Os"} \
%{?with_klibc:CC="%{_bindir}/klcc"} \
%{?debug:--enable-debug} \
- --exec-prefix="" \
- --libdir=/%{_lib} \
+ --libexecdir=/lib/udev \
+ --with-rootlibdir=/%{_lib} \
--disable-extras \
+ --disable-gtk-doc \
--disable-logging \
--disable-shared \
--enable-static \
- --with-libdir-name=%{_lib} \
- --with-udev-prefix="" \
- --without-selinux
+ --with-pci-ids-path=%{_sysconfdir} \
+ --with-selinux \
+ --with-udev-prefix=/
%{__make} \
LDFLAGS="-all-static"
-%{__make} install \
- DESTDIR=$(pwd)/udev-initrd
+DEST=$(pwd)/udev-initrd
+for dir in extras udev; do
+ cd $dir
+ %{__make} -j 1 install \
+ DESTDIR=$DEST
+ cd ..
+done
%if %{with main}
%{__make} clean
@@ -275,6 +286,7 @@
--with-html-dir=%{_gtkdocdir} \
--with-rootlibdir=/%{_lib} \
--enable-extras \
+ --enable-gtk-doc \
--enable-logging \
--enable-shared \
--enable-static \
@@ -289,8 +301,7 @@
%if %{with main}
install -d $RPM_BUILD_ROOT%{_sysconfdir}/{modprobe.d,udev/rules.d} \
- $RPM_BUILD_ROOT/lib/udev/devices \
-
$RPM_BUILD_ROOT%{_datadir}/initramfs-tools/{hooks,scripts/init-{bottom,premount}}
+ $RPM_BUILD_ROOT/lib/udev/devices
%{__make} -j 1 install \
DESTDIR=$RPM_BUILD_ROOT
@@ -313,17 +324,18 @@
# install executables (scripts, helpers, etc.)
install %{SOURCE10} $RPM_BUILD_ROOT/lib/udev/net_helper
install %{SOURCE11} $RPM_BUILD_ROOT%{_sbindir}/start_udev
-%endif
# install misc
install %{SOURCE20}
$RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/udev_blacklist.conf
+%endif
+%if %{with initrd}
+install -d
$RPM_BUILD_ROOT%{_datadir}/initramfs-tools/{hooks,scripts/init-{bottom,premount}}
# install support for initramfs-tools
install %{SOURCE30}
$RPM_BUILD_ROOT%{_datadir}/initramfs-tools/scripts/init-bottom/udev
install %{SOURCE31} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/hooks/udev
install %{SOURCE32}
$RPM_BUILD_ROOT%{_datadir}/initramfs-tools/scripts/init-premount/udev
-%if %{with initrd}
install -d $RPM_BUILD_ROOT%{_libdir}/initrd/udev
install udev-initrd/sbin/udevadm $RPM_BUILD_ROOT%{_libdir}/initrd/udevadm
install udev-initrd/sbin/udevd $RPM_BUILD_ROOT%{_libdir}/initrd/udevd
@@ -519,6 +531,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.294.2.3 2009/06/28 21:26:46 patrys
+- make initrd work at least with glibc
+
Revision 1.294.2.2 2009/06/28 18:43:06 patrys
- more BR:
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/udev/udev.spec?r1=1.294.2.2&r2=1.294.2.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
