rpms/mkinitrd/F-7 mkinitrd-6.0.9-nosegneg.patch, NONE, 1.1 mkinitrd-6.0.9-mdadm.patch, 1.1, 1.2 mkinitrd.spec, 1.200, 1.201
Jeremy Katz (katzj)
fedora-extras-commits at redhat.com
Mon May 21 16:53:15 UTC 2007
- Previous message (by thread): rpms/blender/devel blender-2.44.config, 1.1, 1.2 blender.spec, 1.56, 1.57 blender-2.42-scons.patch, 1.2, NONE
- Next message (by thread): rpms/blender/devel blender-2.44-scons.patch, NONE, 1.1 blender.spec, 1.57, 1.58
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: katzj
Update of /cvs/pkgs/rpms/mkinitrd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29190
Modified Files:
mkinitrd-6.0.9-mdadm.patch mkinitrd.spec
Added Files:
mkinitrd-6.0.9-nosegneg.patch
Log Message:
sync with -devel
mkinitrd-6.0.9-nosegneg.patch:
--- NEW FILE mkinitrd-6.0.9-nosegneg.patch ---
--- mkinitrd.jj 2007-04-16 17:55:39.000000000 -0400
+++ mkinitrd 2007-05-04 12:27:56.000000000 -0400
@@ -206,6 +206,20 @@ requires ${NAMES[$n]} n order to properl
EOF
exit 1
fi
+ case "$FILE" in
+ /lib*)
+ LIBDIR=`echo "$FILE" | sed 's,\(/lib[^/]*\)/.*$,\1,'`
+ BASE=`basename "$FILE"`
+ # Prefer nosegneg libs over direct segment accesses on i686.
+ if [ -f "$LIBDIR/i686/nosegneg/$BASE" ]; then
+ FILE="$LIBDIR/i686/nosegneg/$BASE"
+ # Otherwise, prefer base libraries rather than their optimized
+ # variants.
+ elif [ -f "$LIBDIR/$BASE" ]; then
+ FILE="$LIBDIR/$BASE"
+ fi
+ ;;
+ esac
dynamic="yes"
let n++
done
@@ -426,7 +440,12 @@ inst() {
get_dso_deps "$file"
local DEPS="$DSO_DEPS"
for x in $DEPS ; do
- inst "$x" "$root"
+ l=`echo "$x" | sed -n 's,\(/lib[^/]*\)/.*$,\1,p'`
+ if [ -n "$l" ]; then
+ inst "$x" "$root" "$l"/`basename "$x"`
+ else
+ inst "$x" "$root"
+ fi
done
RET=$?
fi
mkinitrd-6.0.9-mdadm.patch:
Index: mkinitrd-6.0.9-mdadm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mkinitrd/F-7/mkinitrd-6.0.9-mdadm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mkinitrd-6.0.9-mdadm.patch 10 May 2007 15:40:03 -0000 1.1
+++ mkinitrd-6.0.9-mdadm.patch 21 May 2007 16:53:09 -0000 1.2
@@ -5,9 +5,9 @@
fi
+if [ -n "$raiddevices" ]; then
-+ inst /sbin/mdadm.static "$MNTIMAGE/bin/mdadm"
++ inst /sbin/mdadm "$MNTIMAGE/bin/mdadm"
+ if [ -f /etc/mdadm.conf ]; then
-+ cp $verbose /etc/mdadm.conf "$MNTIMAGE/etc/mdadm.conf"
++ inst /etc/mdadm.conf "$MNTIMAGE/etc/mdadm.conf"
+ fi
+fi
+
Index: mkinitrd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkinitrd/F-7/mkinitrd.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- mkinitrd.spec 10 May 2007 15:40:03 -0000 1.200
+++ mkinitrd.spec 21 May 2007 16:53:09 -0000 1.201
@@ -3,11 +3,12 @@
Summary: Creates an initial ramdisk image for preloading modules.
Name: mkinitrd
Version: 6.0.9
-Release: 2
+Release: 4
License: GPL
Group: System Environment/Base
Source0: mkinitrd-%{version}.tar.bz2
Patch0: mkinitrd-6.0.9-mdadm.patch
+Patch1: mkinitrd-6.0.9-nosegneg.patch
ExclusiveOs: Linux
Prereq: dev
@@ -66,6 +67,7 @@
%prep
%setup -q -n mkinitrd-%{version}
%patch0 -p0 -b .mdadm
+%patch1 -p0 -b .nosegneg
%build
make LIB=%{_lib}
@@ -113,6 +115,12 @@
%{_libdir}/libbdevid.so.*
%changelog
+* Mon May 21 2007 Peter Jones <pjones at redhat.com> - 6.0.9-4
+- Update patch from -2 to use dynamic mdadm.
+
+* Mon May 21 2007 Peter Jones <pjones at redhat.com> - 6.0.9-3
+- Fix building non-xen initrds on xen and vice-versa (Patch from Jakub, #235251)
+
* Thu May 10 2007 Peter Jones <pjones at redhat.com> - 6.0.9-2
- Use mdadm not raidautorun so that newer metadata is supported (#213586)
- Previous message (by thread): rpms/blender/devel blender-2.44.config, 1.1, 1.2 blender.spec, 1.56, 1.57 blender-2.42-scons.patch, 1.2, NONE
- Next message (by thread): rpms/blender/devel blender-2.44-scons.patch, NONE, 1.1 blender.spec, 1.57, 1.58
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list