rpms/module-init-tools/devel module-init-tools.spec, 1.62, 1.63 weak-modules, 1.15, 1.16

[Jon Masters (jcm)]

Author: jcm

Update of /cvs/pkgs/rpms/module-init-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28704

Modified Files:
	module-init-tools.spec weak-modules 
Log Message:
Check for nm and abort silently if not installed.



Index: module-init-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- module-init-tools.spec	19 Feb 2008 05:58:51 -0000	1.62
+++ module-init-tools.spec	2 Apr 2008 21:47:26 -0000	1.63
@@ -1,7 +1,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Kernel
 Source: http://www.kerneltools.org/pub/downloads/module-init-tools/module-init-tools-%{version}.tar.bz2
@@ -103,6 +103,10 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
+* Wed Apr  4 2008 Jon Masters <jcm at redhat.com> - 3.4-4
+- Update weak-modules.
+- Resolves: #207653
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.4-3
 - Autorebuild for GCC 4.3
 


Index: weak-modules
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/devel/weak-modules,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- weak-modules	7 Oct 2007 22:45:09 -0000	1.15
+++ weak-modules	2 Apr 2008 21:47:26 -0000	1.16
@@ -3,12 +3,19 @@
 # weak-modules - determine which modules are kABI compatible with installed
 #                kernels and set up the symlinks in /lib/*/weak-updates.
 #
-
 # Changelog:
 #
+# 2008/04/02 - Updated to latest version of weak-modules.
+#
 # 2006/12/11 - Updated logic for determining the system's initrd location,
 #              to account for IA64 differences. (#215432)
 
+# First check for standard binutils tools
+if [ ! -x /usr/bin/nm ];
+then
+	exit 0;
+fi
+
 unset LANG LC_ALL LC_COLLATE
 
 tmpdir=$(mktemp -td ${0##*/}.XXXXXX)
@@ -22,8 +29,6 @@
 	initrd_prefix="/boot"
 fi
 
-#!/bin/sh
-
 # 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() {
@@ -296,7 +301,7 @@
 --verbose
         Print the commands executed.
 
--dry-run
+--dry-run
         Do not create/remove any files.
 EOF
     exit $1