rpms/module-init-tools/devel module-init-tools.spec, 1.89, 1.90 weak-modules, 1.17, 1.18
Jon Masters
jcm at fedoraproject.org
Wed Sep 16 04:19:46 UTC 2009
Author: jcm
Update of /cvs/pkgs/rpms/module-init-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21145
Modified Files:
module-init-tools.spec weak-modules
Log Message:
Sync weak-modules with RHEL.
Index: module-init-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- module-init-tools.spec 25 Jul 2009 14:56:30 -0000 1.89
+++ module-init-tools.spec 16 Sep 2009 04:19:45 -0000 1.90
@@ -2,7 +2,7 @@ Summary: Kernel module management utilit
Name: module-init-tools
Version: 3.9
#define PreRelease
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: System Environment/Kernel
#Source: http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{PreRelease}.tar.bz2
@@ -85,6 +85,9 @@ fi
%ghost %config(noreplace) %verify(not md5 size mtime) /etc/modprobe.d/local.conf
%changelog
+* Wed Sep 16 2009 Jon Masters <jcm at redhat.com> -3.9-3
+- Sync weak-modules with RHEL.
+
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: weak-modules
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/devel/weak-modules,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- weak-modules 19 Mar 2009 18:50:42 -0000 1.17
+++ weak-modules 16 Sep 2009 04:19:46 -0000 1.18
@@ -6,8 +6,7 @@
# Changelog:
#
-# 2006/12/11 - Updated logic for determining the system's initrd location,
-# to account for IA64 differences. (#215432)
+# 2009/09/16 - Rebase and add a bunch of updates for dracut.
unset LANG LC_ALL LC_COLLATE
@@ -27,62 +26,20 @@ fi
# rpmsort: The sort in coreutils can't sort the RPM list how we want it so we
# instead transform the list into a form it will sort correctly, then sort.
rpmsort() {
-
+ local IFS=$' '
+ REVERSE=""
rpmlist=($(cat))
- if [ "$1" == "-r" ]; then
- reverse=1
- else
- reverse=0
+ if [ "-r" == "$1" ];
+ then
+ REVERSE="-r"
fi
- if [ ${#rpmlist[@]} = 1 ]; then
- # By definition already sorted
- echo ${rpmlist[@]}
- return
- fi
-
- # Hash every value in the rpmlist
- for ((i = 0; i < ${#rpmlist[@]}; i++)); do
- rpmhash[i]="$(echo ${rpmlist[i]} | awk '{decode="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-."; split($1,tmp,"");for (i=1;i<=length($1);i++){ printf "%02x",index(decode,tmp[i]) } }')"
- done
-
- for ((i = 0; i < ${#rpmlist[@]}; i++)); do
-
- for ((j = 0; j < ${#rpmlist[@]}-1; j++)); do
-
- rpm1=${rpmlist[j]} rpm2=${rpmlist[j+1]}
- hex1=${rpmhash[j]} hex2=${rpmhash[j+1]}
-
- if [ ${#rpm1} -lt ${#rpm2} ]; then
- len=$((${#rpm1}*2));
- else
- len=$((${#rpm2}*2));
- fi
-
- # BZ249537 - don't use head -n 1 to rip out the first line
- # and instead use a read loop to do it. There are better
- # ways to do this, but this solution works too :-).
-
- if [ "$(printf "%s\n" ${hex1:0:$len} ${hex2:0:$len} \
- | sort | (read input; echo "$input"; \
- while read input; do true; done))" = \
- "$hex2" ]; then
- rpmlist[j]=$rpm2; rpmlist[j+1]=$rpm1
- rpmhash[j]=$hex2; rpmhash[j+1]=$hex1
- fi
- done
- done
-
- if [ $reverse = 0 ]; then
- for ((n = 0; n < ${#rpmlist[@]} ; n++)); do
- echo "${rpmlist[$n]}"
- done
- else
- for ((n = ${#rpmlist[@]}-1; n >= 0; n--)); do
- echo "${rpmlist[$n]}"
- done
- fi
+ echo ${rpmlist[@]} | \
+ sed -e 's/-/../g' | \
+ sort ${REVERSE} -n -t"." -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 -k6,6 -k7,7 \
+ -k8,8 -k9,9 -k10,10 | \
+ sed -e 's/\.\./-/g'
}
# read_modules_list:
@@ -153,27 +110,13 @@ compare_initrd_modules() {
# check_initrd:
check_initrd() {
local kernel=$1
- local kernel_is_xen=0
- local xen_kverrel=0
-
- if [ "xen" == "`echo $kernel|sed -nre 's:^.*(xen)$:\1:p'`" ];
- then
- kernel_is_xen=1
- xen_kverrel="`echo $kernel|sed -nre 's:^(.*)xen$:\1:p'`"
- else
- kernel_is_xen=0
- fi
# This logic probably isn't needed. When are we ever actually likely to have
# an unbootable system, with no kernel, *before* we run this script? :-)
if [ ! -e "$initrd_prefix/initrd-$kernel.img" ];
then
new_initrd="$initrd_prefix/initrd-$kernel.img"
- if [ "$kernel_is_xen" == "0" ]; then
- /sbin/new-kernel-pkg --mkinitrd --initrdfile="$new_initrd" --depmod --install "$kernel"
- else
- /sbin/new-kernel-pkg --mkinitrd --initrdfile="$new_initrd" --depmod --install --multiboot="$initrd_prefix/xen.gz-$xen_kverrel" "$kernel"
- fi
+ /sbin/new-kernel-pkg --mkinitrd --initrdfile="$new_initrd" --depmod --install "$kernel"
else
old_initrd="$initrd_prefix/initrd-$kernel.img"
tmp_initrd="$initrd_prefix/initrd-$kernel.tmp"
@@ -183,14 +126,9 @@ check_initrd() {
if ! $(compare_initrd_modules "$old_initrd" "$tmp_initrd");
then
- mv "$old_initrd" "$old_initrd".dup_orig
mv "$tmp_initrd" "$new_initrd"
- if [ "$kernel_is_xen" == "0" ]; then
- /sbin/new-kernel-pkg --initrdfile="$new_initrd" --depmod --install "$kernel"
- else
- /sbin/new-kernel-pkg --initrdfile="$new_initrd" --depmod --install --multiboot="$initrd_prefix/xen.gz-$xen_kverrel" "$kernel"
- fi
+ /sbin/new-kernel-pkg --initrdfile="$new_initrd" --depmod --install "$kernel"
else
rm -f "$tmp_initrd"
fi
@@ -222,7 +160,8 @@ module_is_compatible() {
# Symbols that other add-on modules of the "old" kernel export
# (and that this module may require)
if [ ! -e "$tmpdir/extra-symvers-$module_krel" ]; then
- if [ -e /lib/modules/$module_krel/extra ]; then
+ if [ -e /lib/modules/$module_krel/extra ] && \
+ [ -n "`find /lib/modules/$module_krel/extra -type f`" ]; then
find /lib/modules/$module_krel/extra -name '*.ko' \
| xargs nm \
| sed -nre 's:^[0]*([0-9a-f]{8}) A __crc_(.*):0x\1 \2:p'
@@ -341,11 +280,7 @@ add_modules() {
# kernel. We need to create symlinks for compatible kernels
# under /lib/modules and rerun depmod/mkinitrd for those.
- # BZ249537 - don't use head -n 1 to rip out the first line
- # and instead use a read loop to do it. There are better
- # ways to do this, but this solution works too :-).
-
- subpath="${module#/lib/modules/$module_krel/extra}"
+ subpath=`echo $module | sed -nre "s:/lib/modules/$module_krel/([^/]*)/(.*):\2:p"`
weak_module="/lib/modules/$krel/weak-updates/${subpath#/}"
if [ -r "$weak_module" ]; then
weak_krel=$(krel_of_module "$weak_module")
More information about the fedora-extras-commits
mailing list