rpms/mkinitrd/FC-5 .cvsignore, 1.102, 1.103 mkinitrd.spec, 1.115, 1.116 sources, 1.115, 1.116
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Aug 30 19:02:14 UTC 2006
Author: dcantrel
Update of /cvs/dist/rpms/mkinitrd/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7561
Modified Files:
.cvsignore mkinitrd.spec sources
Log Message:
Revert to 5.0.32, rebuild for new parted in FC5 (#189708)
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/FC-5/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- .cvsignore 30 Aug 2006 18:45:20 -0000 1.102
+++ .cvsignore 30 Aug 2006 19:02:10 -0000 1.103
@@ -1,2 +1 @@
-bdevid-0.4.tar.bz2
-mkinitrd-5.1.9.tar.bz2
+mkinitrd-5.0.32.tar.bz2
Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/FC-5/mkinitrd.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- mkinitrd.spec 30 Aug 2006 18:45:20 -0000 1.115
+++ mkinitrd.spec 30 Aug 2006 19:02:10 -0000 1.116
@@ -1,25 +1,18 @@
-%define pyver %(%{__python} -c "import sys; print sys.version[:3]")
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)[1:]")}
-
Summary: Creates an initial ramdisk image for preloading modules.
Name: mkinitrd
-Version: 5.1.9
-Release: 2%{?dist}
+Version: 5.0.32
+Release: 2
License: GPL
Group: System Environment/Base
-Source0: mkinitrd-%{version}.tar.bz2
-%define BDEVID_VERSION 0.4
-Source1: bdevid-%{BDEVID_VERSION}.tar.bz2
-
+Source: mkinitrd-%{version}.tar.bz2
ExclusiveOs: Linux
Prereq: dev
Requires: /bin/sh, /sbin/insmod.static, /sbin/losetup
Requires: fileutils, grep, mount, gzip, tar, mktemp >= 1.5-5, findutils, lvm2
Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.22-1
-Requires: e2fsprogs >= 1.38-12, glib2, libselinux, libsepol
-BuildRequires: popt e2fsprogs-devel parted-devel >= 1.7.1-15, pkgconfig, glib2-devel
-BuildRequires: libdhcp4client-devel, libdhcp6client-devel, libdhcp-devel >= 1.9
-BuildRequires: device-mapper libselinux-devel libsepol-devel, python-devel >= %{pyver}
+Requires: e2fsprogs >= 1.38-12
+BuildRequires: popt e2fsprogs-devel parted-devel pump-devel
+BuildRequires: device-mapper libselinux-devel libsepol-devel
%ifnarch s390 s390x
Requires: dmraid
%endif
@@ -27,8 +20,6 @@
Requires: ppc64-utils >= 0.3-1
%endif
BuildRoot: %{_tmppath}/%{name}-root
-Provides: libbdevid = %{version}-%{release}
-Obsoletes: libbdevid < %{version}-%{release}
%description
Mkinitrd creates filesystem images for use as initial ramdisk (initrd)
@@ -45,46 +36,17 @@
mount the root filesystem. The mkinitrd program creates such a
ramdisk using information found in the /etc/modules.conf file.
-%package devel
-Summary: C header files and library for functionality exported by libnash.
-Group: Development/Libraries
-Requires: glibc-devel, pkgconfig, e2fsprogs-devel, mkinitrd, glib2-devel
-
-%package -n libbdevid-python
-Summary: Python bindings for libbdevid
-Group: System Environment/Libraries
-Requires: glib2, e2fsprogs, libselinux, libsepol, device-mapper, mkinitrd
-Requires: python >= %{pyver}
-
-%description devel
-C header files and library for functionality exported by libnash.
-
-%description -n libbdevid-python
-Python bindings for libbdevid.
-
%prep
-%setup -q -c -a 0
-%setup -q -c -a 1
+%setup -q
%build
-cd mkinitrd-%{version}
-make LIB=%{_lib}
-make LIB=%{_lib} test
+make
+make test
if [ $? != 0 ]; then exit 1; fi
-cd ..
-cp -a mkinitrd-%{version}/nash/libnash.a bdevid-%{BDEVID_VERSION}/bdevid/
-cp -a mkinitrd-%{version}/nash/include/nash* \
- bdevid-%{BDEVID_VERSION}/include/
-cd bdevid-%{BDEVID_VERSION}
-make LIB=%{_lib}
%install
rm -rf $RPM_BUILD_ROOT
-cd mkinitrd-%{version}
-make LIB=%{_lib} BUILDROOT=$RPM_BUILD_ROOT mandir=%{_mandir} install
-cd ../bdevid-%{BDEVID_VERSION}
-make LIB=%{_lib} DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT/sbin/bdevid
+make BUILDROOT=$RPM_BUILD_ROOT mandir=%{_mandir} install
%clean
rm -rf $RPM_BUILD_ROOT
@@ -99,151 +61,10 @@
%attr(755,root,root) /sbin/new-kernel-pkg
%attr(755,root,root) /sbin/grubby
%attr(644,root,root) %{_mandir}/man8/grubby.8*
-/%{_lib}/bdevid
-%{_libdir}/libbdevid.so.*
-
-%files devel
-%defattr(-,root,root)
-%{_libdir}/libnash.a
-%{_libdir}/libbdevid.a
-%{_libdir}/libbdevid.so
-%{_libdir}/pkgconfig/libnash.pc
-%{_libdir}/pkgconfig/libbdevid.pc
-%{_includedir}/nash.h
-%{_includedir}/nash
-%{_includedir}/bdevid.h
-%{_includedir}/bdevid
-
-%files -n libbdevid-python
-/%{python_sitelib}/bdevid.so
%changelog
-* Wed Aug 30 2006 David Cantrell <dcantrell at redhat.com> - 5.1.9-2
-- Rebuild for new parted in FC5 (#189708)
-
-* Fri Aug 17 2006 Peter Jones <pjones at redhat.com> - 5.1.9-1
-- Fix "MOUNT_PROC_USB" warning
-
-* Wed Aug 16 2006 Peter Jones <pjones at redhat.com> - 5.1.8-1
-- Use modprobe to find module deps (#202559, #202596)
-- Fix typo for /dev/efirtc (#202110)
-
-* Wed Aug 16 2006 Peter Jones <pjones at redhat.com> - 5.1.7-1
-- Make "stabilized" work better (patch from Alexandre Oliva)
-- Rewrite usb handling (notting and pjones)
-- Fix libbdevid provides/obsoletes.
-- Include usb hcd drivers by default
-
-* Mon Aug 14 2006 Bill Nottingham <notting at redhat.com> - 5.1.6-1
-- don't make every root device /dev/loop0. Eep.
-
-* Mon Aug 14 2006 Peter Jones <pjones at redhat.com> - 5.1.5-1
-- Provide libbdevid.
-
-* Mon Aug 14 2006 Peter Jones <pjones at redhat.com> - 5.1.4-1
-- Fix requires for libbdevid
-- Make it safe to call nashLogger and nashLoggerV with no context.
-
-* Mon Aug 14 2006 Mark McLoughlin <markmc at redhat.com> - 5.1.3-2
-- Fix compile error
-
-* Fri Aug 11 2006 Bill Nottingham <notting at redhat.com> - 5.1.3-1
-- replace various sed/grep/cut/head calls with bash & awk equivalents
-- fix a typo
-- nfs loop fixes
-- silence xen errors when sysfs layout is different
-
-* Wed Jul 26 2006 Peter Jones <pjones at redhat.com> - 5.1.2-1
-- pull in new libbdevid for scsi probing fix
-- restructure package so things can include libbdevid (and its modules)
- without depending on python
-
-* Wed Jul 19 2006 Bill Nottingham <notting at redhat.com>
-- support for loopback root (including loop-over-NFS)
-
-* Tue Jul 18 2006 Jeremy Katz <katzj at redhat.com> - 5.1.1-1
-- build with -fPIC
-- pull in new libbdevid for linking fix
-
-* Mon Jul 17 2006 Jeremy Katz <katzj at redhat.com> - 5.1.0-1
-- allow rootdev/rootfs/rootopts parsing on the mkinitrd command line (notting)
-- fix case where we'd spin forever resolving a device (#199046)
-
-* Thu Jul 13 2006 Peter Jones <pjones at redhat.com> - 5.0.47-1
-- add libbdevid
-- fix mode handling on open syscall wrapper (patch from Mark McLoughlin)
-- save dhcp lease file after network initialization (patch from markmc)
-
-* Thu Jul 6 2006 Bill Nottingham <notting at redhat.com>
-- if NFS host doesn't resolve, assume it's an IP
-- make sure IP check doesn't get extraneous info
-
-* Wed Jul 5 2006 Peter Jones <pjones at redhat.com>
-- make libnash.a and the nash-devel package
-- use libdhcp instead of pump (patch from Mark McLoughlin)
-
-* Fri Jun 30 2006 Jeremy Katz <katzj at redhat.com> - 5.0.46-1
-- if we don't get a modalias for a net driver, try via
- ethtool (notting, #196104)
-- add patches from Aron Griffis (aron AT hp DOT com) for multiboot
- support on ia64
-
-* Thu Jun 22 2006 Jeremy Katz <katzj at redhat.com> - 5.0.45-1
-- don't emit <empty> for iscsi username/password stuff
-- handle _netdev option for filesystems
-
-* Thu Jun 22 2006 Jeremy Katz <katzj at redhat.com> - 5.0.44-1
-- fix so we only use iscsistart if we're doing root on iscsi
-- fix spurious shell error (noticed by karsten)
-
-* Wed Jun 21 2006 Jeremy Katz <katzj at redhat.com> - 5.0.43-1
-- Add back patches from pjones which had just been in the package for
- * fix bad shell code to detect DMs in use
- * fix "stabilized" to stat where appropriate
- * use stabilized for sbp2
-
-* Wed Jun 21 2006 Jeremy Katz <katzj at redhat.com> - 5.0.42-1
-- add a hack to handle xennet devices not having a modalias (#196104)
-- initial pass at support for root on iscsi (patch from Patrick
- Mansfield <patmans at us.ibm.com>)
-
-* Mon Jun 12 2006 Peter Jones <pjones at redhat.com>
-- Fixes for stateless/diskless configurations (patch from Jeff Law,
- <law at redhat.com>)
-
-* Wed May 24 2006 Peter Jones <pjones at redhat.com> - 5.0.41-1
-- (very) basic multipath support
-- minor fixes for usb
-
-* Thu May 18 2006 Jeremy Katz <katzj at redhat.com> - 5.0.40-1
-- fix multiple netdev handling (#192321)
-
-* Tue May 10 2006 Peter Jones <pjones at redhat.com> - 5.0.39-1
-- handle [eou]hci_hcd even _more_ correctly ;)
-
-* Tue May 9 2006 Peter Jones <pjones at redhat.com> - 5.0.38-1
-- handle bringing up multiple network devices (katzj)
-- make "withusb=yes" default
-- add --without-usb
-- make usb load [euo]hci_hcd correctly
-
-* Mon May 1 2006 Jeremy Katz <katzj at redhat.com> - 5.0.37-1
-- munge rootopts on all non-nfs cases
-
-* Wed Apr 26 2006 Bill Nottingham <notting at redhat.com> - 5.0.36-1
-- NFS root fixes
-- fix typo
-
-* Mon Apr 10 2006 Peter Jones <pjones at redhat.com> - 5.0.34-1
-- fix "!" handling for sysfs paths in mkblkdevs
-- fix argument checking for mknodCommand
-
-* Thu Mar 30 2006 Peter Jones <pjones at redhat.com> - 5.0.33-1
-- fix unbalanced pushd in mkinitrd (patch from Pete Zaitcev, bz# 185822)
-- add "cond" command for simple conditionals (bz# 182938)
-- add "status" command to see/set the exit status for testing
-- add "--remove-args" and "--update" args for new-kernel-pkg (patch from
- Don Zickus, bz# 183917)
+* Wed Aug 30 2006 David Cantrell <dcantrell at redhat.com> - 5.0.32-2
+- Rebuild against new parted in FC5 (#189708)
* Mon Mar 13 2006 Peter Jones <pjones at redhat.com> - 5.0.32-1
- handle sd_mod on scsi_mod in findmodule, not in the scsi setup. This
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/FC-5/sources,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- sources 30 Aug 2006 18:45:20 -0000 1.115
+++ sources 30 Aug 2006 19:02:10 -0000 1.116
@@ -1,2 +1 @@
-d963851dff275f0af392cb25d3ad45fd bdevid-0.4.tar.bz2
-f76e44bbcc67cc1ca8a7c1ecfbf1d4fc mkinitrd-5.1.9.tar.bz2
+73c36d759e845737c9571a856f6f8605 mkinitrd-5.0.32.tar.bz2
More information about the fedora-cvs-commits
mailing list