[LON-CAPA-cvs] cvs: loncom /build check-rpms

harris41 lon-capa-cvs@mail.lon-capa.org
Thu, 01 Aug 2002 04:57:18 -0000


harris41		Thu Aug  1 00:57:18 2002 EDT

  Modified files:              
    /loncom/build	check-rpms 
  Log:
  minor fix to aggressively detect AMD/athlon architectures; also
  in accordance with GPL policy, adding a minor note about change to
  code
  
  
Index: loncom/build/check-rpms
diff -u loncom/build/check-rpms:1.3 loncom/build/check-rpms:1.4
--- loncom/build/check-rpms:1.3	Sat Apr 13 15:13:06 2002
+++ loncom/build/check-rpms	Thu Aug  1 00:57:18 2002
@@ -3,6 +3,9 @@
 # check-rpms, version 2.1.1
 # Martin Siegert, SFU, siegert@sfu.ca, Feb 02
 #
+# documentation and minor patches,
+# Scott Harrison sharrison@users.sourceforge.net 2002
+
 =pod
 
 =head1 NAME
@@ -260,7 +263,7 @@
 $DEFRPMDIR = "/mnt/redhat/RedHat/RPMS";
 $DEFFTPSERVER = "updates.redhat.com";
 $DEFFTPUPDATES = "$RHversion/en/os";
-$DEFRPMUSER = "nobody";
+$DEFRPMUSER = "harris41";
 
 $RPMDIR=$DEFRPMDIR;
 
@@ -294,7 +297,7 @@
 
  # $RPMUSER is the user name that check-rpms switches to for most of
  # the script when run as root
- $RPMUSER = "joe";
+ $RPMUSER = "harris41";
 
  # $FTPSERVER and $FTPUPDATES are the hostname of a ftp server and the
  # directory where RPM updates can be found without the <arch> directory.
@@ -392,7 +395,7 @@
     $no_kernel=1;
 }
 
-$PROC = `grep -i athlon /proc/cpuinfo`;
+$PROC = `grep -i "athlon\|amd" /proc/cpuinfo`;
 if ( ! "$PROC" ) {
     $PROC = `uname -m`;
     chomp($PROC);