SPECS: busybox.spec, cryptsetup-luks.spec, dmraid.spec, e2fsprogs.spec, lvm...

baggins baggins at pld-linux.org
Mon Mar 23 13:59:12 CET 2009 

Author: baggins                      Date: Mon Mar 23 12:59:12 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- put programs for initrd into common directory _libdir/initrd

---- Files affected:
SPECS:
   busybox.spec (1.161 -> 1.162) , cryptsetup-luks.spec (1.40 -> 1.41) , dmraid.spec (1.45 -> 1.46) , e2fsprogs.spec (1.203 -> 1.204) , lvm2.spec (1.131 -> 1.132) , mdadm.spec (1.85 -> 1.86) , module-init-tools.spec (1.70 -> 1.71) , splashutils.spec (1.40 -> 1.41) , udev.spec (1.287 -> 1.288) 

---- Diffs:

================================================================
Index: SPECS/busybox.spec
diff -u SPECS/busybox.spec:1.161 SPECS/busybox.spec:1.162
--- SPECS/busybox.spec:1.161	Sat Mar 14 18:34:15 2009
+++ SPECS/busybox.spec	Mon Mar 23 13:59:05 2009
@@ -81,7 +81,6 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_bindir		/bin
-%define		_initrd_bindir	/bin
 
 %if "%{_target_base_arch}" != "%{_arch}"
 	%define CrossOpts CROSS="%{_target_cpu}-pld-linux-"
@@ -234,7 +233,10 @@
 install -d $RPM_BUILD_ROOT{%{_initrd_bindir},%{_bindir},%{_mandir}/man1,%{_libdir}/busybox}
 
 %{?with_static:install built/busybox.static $RPM_BUILD_ROOT%{_bindir}}
-%{?with_initrd:install built/busybox.initrd $RPM_BUILD_ROOT%{_initrd_bindir}/initrd-busybox}
+%if %{with initrd}
+install -d $RPM_BUILD_ROOT%{_libdir}/initrd
+install built/busybox.initrd $RPM_BUILD_ROOT%{_libdir}/initrd/busybox
+%endif
 
 install busybox.links $RPM_BUILD_ROOT%{_libdir}/busybox
 install docs/BusyBox.1 $RPM_BUILD_ROOT%{_mandir}/man1
@@ -276,7 +278,7 @@
 %if %{with initrd}
 %files initrd
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_initrd_bindir}/initrd-busybox
+%attr(755,root,root) %{_libdir}/initrd/busybox
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -285,6 +287,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.162  2009/03/23 12:59:05  baggins
+- put programs for initrd into common directory _libdir/initrd
+
 Revision 1.161  2009/03/14 17:34:15  baggins
 - rel 1
 - restore filterout_ld, it's passed directly to linker so uClibc wrapper

================================================================
Index: SPECS/cryptsetup-luks.spec
diff -u SPECS/cryptsetup-luks.spec:1.40 SPECS/cryptsetup-luks.spec:1.41
--- SPECS/cryptsetup-luks.spec:1.40	Wed Mar 18 22:45:55 2009
+++ SPECS/cryptsetup-luks.spec	Mon Mar 23 13:59:05 2009
@@ -195,7 +195,8 @@
 	$RPM_BUILD_ROOT%{_libdir}/libcryptsetup.so
 
 %if %{with initrd}
-install cryptsetup-initrd $RPM_BUILD_ROOT%{_sbindir}
+install -d $RPM_BUILD_ROOT%{_libdir}/initrd
+install cryptsetup-initrd $RPM_BUILD_ROOT%{_libdir}/initrd/cryptsetup
 %endif
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/conf-hooks.d/cryptsetup
@@ -232,7 +233,7 @@
 %if %{with initrd}
 %files initrd
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/cryptsetup-initrd
+%attr(755,root,root) %{_libdir}/initrd/cryptsetup
 %endif
 
 %files initramfs
@@ -249,6 +250,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2009/03/23 12:59:05  baggins
+- put programs for initrd into common directory _libdir/initrd
+
 Revision 1.40  2009/03/18 21:45:55  baggins
 - fixed dietlibc segfault
 - build initrd stuff with dietlibc

================================================================
Index: SPECS/dmraid.spec
diff -u SPECS/dmraid.spec:1.45 SPECS/dmraid.spec:1.46
--- SPECS/dmraid.spec:1.45	Thu Mar 19 00:20:14 2009
+++ SPECS/dmraid.spec	Mon Mar 23 13:59:05 2009
@@ -142,7 +142,7 @@
 	--enable-static_link
 
 %{__make} -j1
-cp -f tools/dmraid{,-initrd}
+mv -f tools/dmraid dmraid-initrd
 %{__make} clean
 %endif
 
@@ -165,7 +165,8 @@
         $RPM_BUILD_ROOT%{_libdir}/libdmraid.so
 
 %if %{with initrd}
-install -D tools/dmraid-initrd $RPM_BUILD_ROOT/sbin/dmraid-initrd
+install -d $RPM_BUILD_ROOT%{_libdir}/initrd
+install dmraid-initrd $RPM_BUILD_ROOT%{_libdir}/initrd/dmraid
 %endif
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/hooks/dmraid
@@ -196,7 +197,7 @@
 %if %{with initrd}
 %files initrd
 %defattr(644,root,root,755)
-%attr(755,root,root) /sbin/dmraid-initrd
+%attr(755,root,root) %{_libdir}/initrd/dmraid
 %endif
 
 %files initramfs
@@ -210,6 +211,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2009/03/23 12:59:05  baggins
+- put programs for initrd into common directory _libdir/initrd
+
 Revision 1.45  2009/03/18 23:20:14  baggins
 - fix static link (selinux_static patch)
 - clean bconds

================================================================
Index: SPECS/e2fsprogs.spec
diff -u SPECS/e2fsprogs.spec:1.203 SPECS/e2fsprogs.spec:1.204
--- SPECS/e2fsprogs.spec:1.203	Wed Mar 18 16:23:22 2009
+++ SPECS/e2fsprogs.spec	Mon Mar 23 13:59:05 2009
@@ -764,9 +764,10 @@
 touch $RPM_BUILD_ROOT%{_sysconfdir}/blkid.tab
 
 %if %{with initrd}
-install initrd-blkid $RPM_BUILD_ROOT/sbin/initrd-blkid
-install initrd-e2fsck $RPM_BUILD_ROOT/sbin/initrd-e2fsck
-install initrd-mke2fs $RPM_BUILD_ROOT/sbin/initrd-mke2fs
+install -d $RPM_BUILD_ROOT%{_libdir}/initrd
+install initrd-blkid $RPM_BUILD_ROOT%{_libdir}/initrd/blkid
+install initrd-e2fsck $RPM_BUILD_ROOT%{_libdir}/initrd/e2fsck
+install initrd-mke2fs $RPM_BUILD_ROOT%{_libdir}/initrd/mke2fs
 %endif
 
 %{?with_dietlibc:install diet-libuuid.a $RPM_BUILD_ROOT%{dietlibdir}/libuuid.a}
@@ -1079,7 +1080,9 @@
 %if %{with initrd}
 %files initrd
 %defattr(644,root,root,755)
-%attr(755,root,root) /sbin/initrd-*
+%attr(755,root,root) %{_libdir}/initrd/blkid
+%attr(755,root,root) %{_libdir}/initrd/e2fsck
+%attr(755,root,root) %{_libdir}/initrd/mke2fs
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -1088,6 +1091,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.204  2009/03/23 12:59:05  baggins
+- put programs for initrd into common directory _libdir/initrd
+
 Revision 1.203  2009/03/18 15:23:22  baggins
 - rel 2
 - added libuuid-dietlibc (for cryptsetup-initrd)

================================================================
Index: SPECS/lvm2.spec
diff -u SPECS/lvm2.spec:1.131 SPECS/lvm2.spec:1.132
--- SPECS/lvm2.spec:1.131	Wed Mar 18 17:03:25 2009
+++ SPECS/lvm2.spec	Mon Mar 23 13:59:05 2009
@@ -275,8 +275,11 @@
 
 touch $RPM_BUILD_ROOT%{_sysconfdir}/lvm/lvm.conf
 
-%{?with_initrd:install initrd-lvm $RPM_BUILD_ROOT%{_sbindir}/initrd-lvm}
-%{?with_initrd:install initrd-dmsetup $RPM_BUILD_ROOT%{_sbindir}/initrd-dmsetup}
+%if %{with initrd}
+install -d $RPM_BUILD_ROOT%{_libdir}/initrd
+install initrd-lvm $RPM_BUILD_ROOT%{_libdir}/initrd/lvm
+install initrd-dmsetup $RPM_BUILD_ROOT%{_libdir}/initrd/dmsetup
+%endif
 
 %{?with_dietlibc:install diet-libdevmapper.a $RPM_BUILD_ROOT%{dietlibdir}/libdevmapper.a}
 
@@ -298,7 +301,6 @@
 %exclude %{_sbindir}/dmeventd
 %exclude %{_sbindir}/dmsetup
 %{?with_clvmd:%attr(755,root,root) %{_usrsbindir}/clvmd}
-%{?with_initrd:%exclude %{_sbindir}/initrd-*}
 %{_mandir}/man?/*
 %exclude %{_mandir}/man8/dmsetup.8*
 %attr(750,root,root) %dir %{_sysconfdir}/lvm
@@ -334,11 +336,11 @@
 %if %{with initrd}
 %files -n device-mapper-initrd
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/initrd-dmsetup
+%attr(755,root,root) %{_libdir}/initrd/dmsetup
 
 %files initrd
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/initrd-lvm
+%attr(755,root,root) %{_libdir}/initrd/lvm
 %endif
 
 %files initramfs
@@ -352,6 +354,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.132  2009/03/23 12:59:05  baggins
+- put programs for initrd into common directory _libdir/initrd
+
 Revision 1.131  2009/03/18 16:03:25  baggins
 - rel 3
 

================================================================
Index: SPECS/mdadm.spec
diff -u SPECS/mdadm.spec:1.85 SPECS/mdadm.spec:1.86
--- SPECS/mdadm.spec:1.85	Sun Mar 15 15:26:12 2009
+++ SPECS/mdadm.spec	Mon Mar 23 13:59:05 2009
@@ -24,11 +24,11 @@
 BuildRequires:	groff
 BuildRequires:	rpmbuild(macros) >= 1.213
 %if %{with initrd}
-%{!?with_dietlibc:BuildRequires:	glibc-static}
-%if %{with dietlibc}
+	%if %{with dietlibc}
 BuildRequires:	dietlibc-static
-%endif
-Requires:	%{name}-initrd = %{epoch}:%{version}-%{release}
+	%else
+BuildRequires:	glibc-static
+	%endif
 %endif
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
@@ -123,9 +123,10 @@
 	$RPM_BUILD_ROOT%{_datadir}/initramfs-tools/{hooks,scripts/local-top}
 
 %if %{with initrd}
-install initrd-mdadm $RPM_BUILD_ROOT%{_sbindir}
-install initrd-mdassemble $RPM_BUILD_ROOT%{_sbindir}
-ln -s initrd-mdadm $RPM_BUILD_ROOT%{_sbindir}/initrd-mdctl
+install -d $RPM_BUILD_ROOT%{_libdir}/initrd
+install initrd-mdadm $RPM_BUILD_ROOT%{_libdir}/initrd/mdadm
+install initrd-mdassemble $RPM_BUILD_ROOT%{_libdir}/initrd/mdassemble
+ln -s mdadm $RPM_BUILD_ROOT%{_libdir}/initrd/mdctl
 %endif
 
 install mdadm $RPM_BUILD_ROOT%{_sbindir}
@@ -170,11 +171,11 @@
 %config(noreplace) %attr(640,root,root) /etc/cron.d/mdadm-checkarray
 
 %if %{with initrd}
-%exclude %{_sbindir}/initrd-*
-
 %files initrd
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/initrd-*
+%attr(755,root,root) %{_libdir}/initrd/mdadm
+%attr(755,root,root) %{_libdir}/initrd/mdassemble
+%attr(755,root,root) %{_libdir}/initrd/mdctl
 %endif
 
 %files initramfs
@@ -188,6 +189,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.86  2009/03/23 12:59:05  baggins
+- put programs for initrd into common directory _libdir/initrd
+
 Revision 1.85  2009/03/15 14:26:12  arekm
 - up to 2.6.9
 

================================================================
Index: SPECS/module-init-tools.spec
diff -u SPECS/module-init-tools.spec:1.70 SPECS/module-init-tools.spec:1.71
--- SPECS/module-init-tools.spec:1.70	Mon Mar  2 16:32:08 2009
+++ SPECS/module-init-tools.spec	Mon Mar 23 13:59:05 2009
@@ -113,11 +113,12 @@
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/modprobe.d/usb.conf
 
 %if %{with initrd}
-install initrd-mod/sbin/depmod $RPM_BUILD_ROOT%{_sbindir}/initrd-depmod
-install initrd-mod/sbin/insmod $RPM_BUILD_ROOT%{_sbindir}/initrd-insmod
-install initrd-mod/sbin/lsmod $RPM_BUILD_ROOT%{_sbindir}/initrd-lsmod
-install initrd-mod/sbin/modprobe $RPM_BUILD_ROOT%{_sbindir}/initrd-modprobe
-install initrd-mod/sbin/rmmod $RPM_BUILD_ROOT%{_sbindir}/initrd-rmmod
+install -d $RPM_BUILD_ROOT%{_libdir}/initrd
+install initrd-mod/sbin/depmod $RPM_BUILD_ROOT%{_libdir}/initrd/depmod
+install initrd-mod/sbin/insmod $RPM_BUILD_ROOT%{_libdir}/initrd/insmod
+install initrd-mod/sbin/lsmod $RPM_BUILD_ROOT%{_libdir}/initrd/lsmod
+install initrd-mod/sbin/modprobe $RPM_BUILD_ROOT%{_libdir}/initrd/modprobe
+install initrd-mod/sbin/rmmod $RPM_BUILD_ROOT%{_libdir}/initrd/rmmod
 %endif
 
 %clean
@@ -136,9 +137,6 @@
 %dir /etc/modprobe.d
 %attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/*.conf
 %attr(755,root,root) %{_sbindir}/*
-%if %{with initrd}
-%exclude %{_sbindir}/initrd-*
-%endif
 %{_mandir}/man5/depmod.conf.5*
 %{_mandir}/man5/modprobe.conf.5*
 %{_mandir}/man5/modules.dep.5*
@@ -147,7 +145,11 @@
 %if %{with initrd}
 %files initrd
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/initrd-*
+%attr(755,root,root) %{_libdir}/initrd/depmod
+%attr(755,root,root) %{_libdir}/initrd/insmod
+%attr(755,root,root) %{_libdir}/initrd/lsmod
+%attr(755,root,root) %{_libdir}/initrd/modprobe
+%attr(755,root,root) %{_libdir}/initrd/rmmod
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -156,6 +158,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.71  2009/03/23 12:59:05  baggins
+- put programs for initrd into common directory _libdir/initrd
+
 Revision 1.70  2009/03/02 15:32:08  baggins
 - rel 4
 - use dietlibc

================================================================
Index: SPECS/splashutils.spec
diff -u SPECS/splashutils.spec:1.40 SPECS/splashutils.spec:1.41
--- SPECS/splashutils.spec:1.40	Sun Nov 30 22:33:53 2008
+++ SPECS/splashutils.spec	Mon Mar 23 13:59:05 2009
@@ -233,7 +233,6 @@
 %dir /var/run/splashutils
 
 # for initrd
-#%dir %{_libdir}/initrd
 #%{_libdir}/initrd/fbcondecor_helper
 
 %files devel
@@ -257,6 +256,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2009/03/23 12:59:05  baggins
+- put programs for initrd into common directory _libdir/initrd
+
 Revision 1.40  2008/11/30 21:33:53  arekm
 - fix combreloc
 

================================================================
Index: SPECS/udev.spec
diff -u SPECS/udev.spec:1.287 SPECS/udev.spec:1.288
--- SPECS/udev.spec:1.287	Wed Mar 18 19:57:52 2009
+++ SPECS/udev.spec	Mon Mar 23 13:59:05 2009
@@ -291,20 +291,14 @@
 install %{SOURCE32} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/scripts/init-premount/udev
 
 %if %{with initrd}
-install -d $RPM_BUILD_ROOT%{_sbindir}
-install udev-initrd/sbin/udevadm $RPM_BUILD_ROOT%{_sbindir}/initrd-udevadm
-install udev-initrd/sbin/udevd $RPM_BUILD_ROOT%{_sbindir}/initrd-udevd
-ln -s initrd-udevd $RPM_BUILD_ROOT%{_sbindir}/udevstart.initrd
-install udev-initrd/lib/udev/ata_id $RPM_BUILD_ROOT/lib/udev/initrd-ata_id
-install udev-initrd/lib/udev/cdrom_id $RPM_BUILD_ROOT/lib/udev/initrd-cdrom_id
-install udev-initrd/lib/udev/edd_id $RPM_BUILD_ROOT/lib/udev/initrd-edd_id
-install udev-initrd/lib/udev/path_id $RPM_BUILD_ROOT/lib/udev/initrd-path_id
-install udev-initrd/lib/udev/scsi_id $RPM_BUILD_ROOT/lib/udev/initrd-scsi_id
-install udev-initrd/lib/udev/usb_id $RPM_BUILD_ROOT/lib/udev/initrd-usb_id
-install udev-initrd/lib/udev/vol_id $RPM_BUILD_ROOT/lib/udev/initrd-vol_id
-install udev-initrd/lib/udev/collect $RPM_BUILD_ROOT/lib/udev/initrd-collect
-install udev-initrd/lib/udev/create_floppy_devices $RPM_BUILD_ROOT/lib/udev/initrd-create_floppy_devices
-install udev-initrd/lib/udev/fstab_import $RPM_BUILD_ROOT/lib/udev/initrd-fstab_import
+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
+ln -s udevd $RPM_BUILD_ROOT%{_libdir}/initrd/udevstart
+install udev-initrd/lib/udev/*_id $RPM_BUILD_ROOT%{_libdir}/initrd/udev/
+install udev-initrd/lib/udev/collect $RPM_BUILD_ROOT%{_libdir}/initrd/udev/collect
+install udev-initrd/lib/udev/create_floppy_devices $RPM_BUILD_ROOT%{_libdir}/initrd/udev/create_floppy_devices
+install udev-initrd/lib/udev/fstab_import $RPM_BUILD_ROOT%{_libdir}/initrd/udev/fstab_import
 %endif
 
 %clean
@@ -426,9 +420,13 @@
 %if %{with initrd}
 %files initrd
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/initrd-*
-%attr(755,root,root) %{_sbindir}/udevstart.initrd
-%attr(755,root,root) /lib/udev/initrd-*
+%attr(755,root,root) %{_libdir}/initrd/udevd
+%attr(755,root,root) %{_libdir}/initrd/udevadm
+%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/fstab_import
 %endif
 
 %files initramfs
@@ -458,6 +456,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.288  2009/03/23 12:59:05  baggins
+- put programs for initrd into common directory _libdir/initrd
+
 Revision 1.287  2009/03/18 18:57:52  arekm
 - up to 140
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/busybox.spec?r1=1.161&r2=1.162&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cryptsetup-luks.spec?r1=1.40&r2=1.41&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dmraid.spec?r1=1.45&r2=1.46&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/e2fsprogs.spec?r1=1.203&r2=1.204&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/lvm2.spec?r1=1.131&r2=1.132&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mdadm.spec?r1=1.85&r2=1.86&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/module-init-tools.spec?r1=1.70&r2=1.71&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/splashutils.spec?r1=1.40&r2=1.41&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/udev.spec?r1=1.287&r2=1.288&f=u

More information about the pld-cvs-commit mailing list