From b9ea7cfc3350c7c9b06c2465d02344ae5285beb8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Thu, 7 Apr 2011 15:04:46 -0400 Subject: [PATCH] sync with Centos 5.6 --- mkinitrd.spec | 48 +++++++++++++++++++++++++++++++++++++++++------- sources | 2 +- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/mkinitrd.spec b/mkinitrd.spec index c802e23..1468511 100644 --- a/mkinitrd.spec +++ b/mkinitrd.spec @@ -17,7 +17,7 @@ URL: %(echo %{url} | cut -d ' ' -f 2) Summary: Creates an initial ramdisk image for preloading modules. Name: %{name} Version: %{version} -Release: 61.%{release} +Release: 68.%{release} License: GPL Group: System Environment/Base Source0: mkinitrd-%{version}.tar.bz2 @@ -88,12 +88,15 @@ Patch61: mkinitrd-5.1.19.6-bz438887-activate-all-mpaths.patch Patch62: mkinitrd-5.1.19.6-bz516047-replace-nashDmGetDevName-with-a-cache.patch Patch63: mkinitrd-5.1.19.6-bz560567-Do-not-attempt-nonexistent-DmNameCac.patch Patch64: mkinitrd-5.1.19.6-bz540641-locatemodule-returns-canonical-name.patch +Patch65: mkinitrd-5.1.19.6-bz593050-Use-location-of-bindings-file-from-multipath-conf.patch +Patch66: mkinitrd-5.1.19.6-bz499781-iscsi-duplicate-interfaces.patch +Patch67: mkinitrd-5.1.19.6-bz513961-handle-missing-dmraid.patch +Patch68: mkinitrd-5.1.19.6-bz568325-add-virtio_pci-before-virtio_net.patch Patch70: mkinitrd-5.1.19.6-newer-kernels.patch Patch71: mkinitrd-5.1.19.6-mkdmnod.patch Patch72: mkinitrd-5.1.19.6-rtc0.patch - ExclusiveOs: Linux Prereq: dev Requires: /bin/sh, /sbin/insmod.static, /sbin/losetup @@ -101,6 +104,9 @@ 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, coreutils Requires: device-mapper-multipath >= 0.4.7-9, kpartx >= 0.4.7-9 +%ifnarch s390 s390x +Requires: iscsi-initiator-utils +%endif Requires: hmaccalc BuildRequires: popt e2fsprogs-devel parted-devel >= 1.7.1-15, pkgconfig, glib2-devel BuildRequires: libdhcp4client-devel, libdhcp6client-devel, libdhcp-devel >= 1.20-6 @@ -224,6 +230,10 @@ nash shell used by initrd %patch62 -p1 %patch63 -p1 %patch64 -p1 +%patch65 -p1 +%patch66 -p1 +%patch67 -p1 +%patch68 -p1 %patch70 -p1 %patch71 -p1 @@ -276,11 +286,35 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) /sbin/nash %changelog -* Mon Feb 21 2011 S.Çağlar Onur - mkinitrd-5.1.19.6-2 -- fix rtc symlink - -* Mon Feb 21 2011 S.Çağlar Onur - mkinitrd-5.1.19.6-1 -- adopt to new style rtc +* Fri Dec 23 2010 Martin Sivak - 5.1.19.6-68 +- No iSCSI on s390 + Related: rhbz#664389 + +* Mon Dec 20 2010 Martin Sivak - 5.1.19.6-67 +- Add /sbin/iscsiadm to dependencies + Resolves: rhbz#664389 + +* Thu Nov 18 2010 Peter Jones - 5.1.19.6-66 +- Attempt to pull in virtio_pci whenever any virtio module is used. + Related: rhbz#568325 + +* Mon Sep 27 2010 Peter Jones - 5.1.19.6-65 +- Fix a spec file and patch error + Related: rhbz#499781 + +* Fri Sep 24 2010 Peter Jones - 5.1.19.6-64 +- Set up each network interface only once. + Resolves: rhbz#499781 +- Don't fail on s390* when dmraid.static isn't there but withdmraid is true + Resolves: rhbz#513961 + +* Tue May 24 2010 Brian C. Lane - 5.1.19.6-63.1 +- Use location of bindings file from multipath.conf + Resolves: rhbz#593050 + +* Thu Apr 15 2010 Peter Jones - 5.1.19.6-62.1 +- Update patch for 540641 to correctly use nash's builtin readlink + Resolves: rhbz#578236 * Mon Mar 08 2010 Peter Jones - 5.1.19.6-61 - Use "sg" not "scsi_wait_scan" on RHEL-5 diff --git a/sources b/sources index 11c0353..41a4ede 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -95acddd474efbee0c13b5b25b55dbf913c00a8db http://build.planet-lab.org/third-party/mkinitrd-5.1.19.6-61.src.rpm +d008a9da20ed2f30b83b3c672ecf08e84d4b6538 http://build.planet-lab.org/third-party/mkinitrd-5.1.19.6-68.el5.src.rpm -- 2.43.0