use latest and a component to get packages rather then a componsed tree

1 files changed, 26 insertions, 24 deletions

diff --git a/upd-instroot b/upd-instroot
index d9c8ff703..7f05fe037 100755
--- a/upd-instroot
+++ b/upd-instroot
@@ -2,9 +2,13 @@
 
 ORIGDIR=`pwd`
 
-if [ -z "$1" -o ! -d "$1" ]; then
+# latest is a script which returns the file containing the most recent
+# binary RPM for the given package names
+LATEST=latest
+
+if [ -z "$1" ]; then
 	echo "$0: updates instimage from a Red Hat RPMS directory"
-	echo "usage: $0 <dir>"
+	echo "usage: $0 <component>"
 	exit 1
 fi
 
@@ -37,7 +41,7 @@ pythondeps() {
 	rm -rf $DIR/dev
 }
 
-SRC=$1/RedHat/RPMS
+COMPONENT=$1
 
 mkdir -p ../trees/hdimage
 cd ../trees/hdimage
@@ -52,21 +56,29 @@ cd -
 echo "DEST is $DEST"
 echo "DESTGR is $DESTGR"
 
-PACKAGES="glibc-2 ldconfig setup e2fsprogs-1 XFree86-libs XFree86-SVGA
+PACKAGES="glibc ldconfig setup e2fsprogs XFree86-libs XFree86-SVGA
           XFree86-S3 XFree86-S3V XFree86-Mach32 XFree86-Mach64
           XFree86-FBDev XFree86-I128 XFree86-3DLabs XFree86-VGA16
-          XFree86-Sun XFree86-TGA XFree86-75dpi-fonts
+          XFree86-75dpi-fonts XFree86-ISO8859-2-75dpi-fonts 
+	  XFree86-ISO8859-9-75dpi-fonts
           XFree86-100dpi-fonts XFree86-ISO8859-2 XFree86-ISO8859-9
-          XFree86-cyrillic-fonts XFree86-3.  xpm-3 glib- gtk+-
-          gnome-libs python-1 newt imlib-1 libpng libtiff libjpeg-
-          libtermcap-2 zlib rpm rpm-devel rpm-python ash- bash- pygtk-
-          pygnome- util-linux procps esound-0 audiofile-0
-          kernel-pcmcia-cs Xconfigurator raidtools- locale-ja open-
-          cpio- tar- fileutils- net-tools- grep- sed- mt-st- gzip-
-          iputils- traceroute- sh-utils- textutils- pine- less- rsh-
-          ncurses- popt mtools- ftp- readline- mount- modutils-
+          XFree86-cyrillic-fonts XFree86  xpm glib gtk+
+          gnome-libs python newt imlib libpng libtiff libjpeg
+          libtermcap zlib rpm rpm-devel rpm-python ash bash pygtk
+          pygnome pygtk-libglade pygnome-libglade pygnome-applet pygnome-capplet 
+	  util-linux procps esound audiofile
+          kernel-pcmcia-cs Xconfigurator raidtools locale-ja open
+          cpio tar fileutils net-tools grep sed mt-st gzip
+          iputils traceroute sh-utils textutils pine less rsh
+          ncurses popt mtools ftp readline mount modutils
           specspo"
 
+if [ $ARCH = sparc ]; then
+    PACKAGES="$PACKAGES XFree86-Sun"
+elif [ $ARCH = alpha ]; then
+    PACKAGES="$PACKAGES XFree86-TGA"
+fi
+
 KEEPFILE=/tmp/keepfile.$$
 cat > $KEEPFILE <<EOF
 sbin/ldconfig
@@ -319,17 +331,7 @@ usr/share/fonts/ISO8859-2/100dpi/fonts*
 EOF
 fi
 
-for I in $PACKAGES; do
-    for J in `ls $SRC/$I* 2> /dev/null`; do
-	if [ "$I" != "rpm-devel" ]; then
-            if ! echo $J | egrep "(devel|sparcv9)" > /dev/null; then
-	        RPMS="$RPMS $J"
-            fi
-        else
-                RPMS="$RPMS $J"
-	fi
-    done
-done
+RPMS=$($LATEST --arch $ARCH $COMPONENT $PACKAGES)
 
 rm -rf $DEST; mkdir -p $DEST/usr/sbin
 rm -rf $DESTGR; mkdir -p $DESTGR/usr/sbin