2006-05-16 Jeremy Katz <katzj@redhat.com>

	* scripts/upd-instroot: Remove references to /usr/X11R6.
	* scripts/mk-images: Likewise.
	* scripts/scrubtree: Likewise.

4 files changed, 26 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index 0b78115f8..88e71d1c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2006-05-16  Jeremy Katz  <katzj@redhat.com>
 
+	* scripts/upd-instroot: Remove references to /usr/X11R6.
+	* scripts/mk-images: Likewise.
+	* scripts/scrubtree: Likewise.
+
+	* scripts/mk-rescueimage.x86_64: Let's autogenerate this from the
+	i386 script.
+	* scripts/Makefile: Autogenerating.
+
 	* scripts/mk-images.x86: Merge i386 and x86_64 script into one.
 	* scripts/mk-images.i386: And then remove the old.
 	* scripts/mk-images.x86_64: Likewise.
diff --git a/scripts/mk-images b/scripts/mk-images
index 94b072602..19d19c276 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -487,12 +487,12 @@ EOF
 	       $IMGPATH/$LIBDIR/libe2p* \
 	       $IMGPATH/$LIBDIR/libuuid* \
 	       $IMGPATH/usr/$LIBDIR/libwrap*.so* \
-               $IMGPATH/usr/X11R6/$LIBDIR/libX11.so* \
-	       $IMGPATH/usr/X11R6/$LIBDIR/libXmuu.so* \
-	       $IMGPATH/usr/X11R6/$LIBDIR/libXext.so* \
-	       $IMGPATH/usr/X11R6/$LIBDIR/libXt.so* \
-	       $IMGPATH/usr/X11R6/$LIBDIR/libSM.so* \
-	       $IMGPATH/usr/X11R6/$LIBDIR/libICE.so* ; do
+               $IMGPATH/usr/$LIBDIR/libX11.so* \
+	       $IMGPATH/usr/$LIBDIR/libXmuu.so* \
+	       $IMGPATH/usr/$LIBDIR/libXext.so* \
+	       $IMGPATH/usr/$LIBDIR/libXt.so* \
+	       $IMGPATH/usr/$LIBDIR/libSM.so* \
+	       $IMGPATH/usr/$LIBDIR/libICE.so* ; do
 	if [ -e $lib ]; then cp -df $lib $MBD_DIR/$LIBDIR/ ; fi
     done 
 
@@ -585,7 +585,7 @@ makeinitrd() {
 	mkdir -p $MBD_DIR/$LIBDIR/security
 	cp $IMGPATH/$LIBDIR/libpam_misc.so.0.* $MBD_DIR/$LIBDIR/libpam_misc.so.0
 	ln -s /tmp $MBD_DIR/var/state/xkb
-	cp $IMGPATH/usr/X11R6/bin/xauth $MBD_DIR/sbin/xauth
+	cp $IMGPATH/usr/bin/xauth $MBD_DIR/sbin/xauth
         cp $IMGPATH/usr/sbin/cmsfs* $MBD_DIR/sbin/
     fi
 
@@ -646,7 +646,7 @@ EOF
     fi
 
 cat > $MBD_DIR/.profile <<EOF
-PATH=/bin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/mnt/sysimage/sbin:/mnt/sysimage/usr/sbin:/mnt/sysimage/bin:/mnt/sysimage/usr/bin
+PATH=/bin:/usr/bin:/usr/sbin:/mnt/sysimage/sbin:/mnt/sysimage/usr/sbin:/mnt/sysimage/bin:/mnt/sysimage/usr/bin
 export PATH
 EOF
 
diff --git a/scripts/scrubtree b/scripts/scrubtree
index 16fcd1603..af6800d0b 100755
--- a/scripts/scrubtree
+++ b/scripts/scrubtree
@@ -32,7 +32,6 @@ fi
 touch $p/etc/ld.so.conf
 mkdir $p/proc
 mount -t proc proc $p/proc
-[ -d $p/usr/X11R6/$LIBDIR ] && echo /usr/X11R6/$LIBDIR > $p/etc/ld.so.conf
 echo /usr/kerberos/$LIBDIR > $p/etc/ld.so.conf
 (cd $p; /usr/sbin/chroot $p usr/sbin/ldconfig )
 
@@ -69,7 +68,7 @@ done
 
 umount $p/proc
 
-for l in `find $p -type f -perm +100 | grep -v "usr/X11R6/$LIBDIR/modules" | xargs file | sed -n 's/^\([^:]*\):.*ELF.*$/\1/p'`; do
+for l in `find $p -type f -perm +100 | xargs file | sed -n 's/^\([^:]*\):.*ELF.*$/\1/p'`; do
     $STRIP $l -R .comment -R .note `objdump -h $l | \
 	sed -n 's/^.*\(\.gnu\.warning\.[^ ]*\) .*$/-R \1/p'`
 done
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 3b7dd78dc..bca08e0cb 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -1013,18 +1013,6 @@ for p in $DEST $DESTGR; do
     mv $p/usr/lib/locale-archive $p/usr/lib/locale/locale-archive 
 done
 
-# Remove unneeded XFree86 modules
-rm -rf $DESTGR/usr/X11R6/$LIBDIR/modules/dri
-rm -f $DESTGR/usr/X11R6/$LIBDIR/modules/libscanpci.a
-rm -f $DESTGR/usr/X11R6/$LIBDIR/modules/libxf1bpp.a
-rm -f $DESTGR/usr/X11R6/$LIBDIR/modules/fonts/libspeedo.a
-rm -f $DESTGR/usr/X11R6/$LIBDIR/modules/drivers/linux/v4l_drv.o
-rm -f $DESTGR/usr/X11R6/$LIBDIR/modules/extensions/libdri.a
-rm -f $DESTGR/usr/X11R6/$LIBDIR/modules/extensions/libxtrap.a
-rm -f $DESTGR/usr/X11R6/$LIBDIR/modules/extensions/librecord.a
-
-rm -f $DESTGR/usr/X11R6/$LIBDIR/modules/extensions/lib{GLcore,glx,pex5}*
-
 # fixup joe links
 ln -fs jpicorc $DESTGR/etc/joe/picorc
 ln -fs jpicorc $DESTGR/etc/joe/jnanorc
@@ -1113,9 +1101,9 @@ if [ -n "$NEEDGR" ]; then
     # sick sick sick hack for pango-querymodules being -32 or -64
     mv $DESTGR/usr/bin/pango-querymodules* $DESTGR/usr/bin/pango-querymodules
     if [ -x /usr/bin/runroot -a -n "$COMPONENT" ]; then
-    	runroot $COMPONENT --onlyone --arch $ARCH "LD_LIBRARY_PATH=/usr/X11R6/$LIBDIR:$LD_LIBRARY_PATH /usr/sbin/chroot $DESTGR /usr/bin/pango-querymodules 2> $DESTGR/etc/pango/pango.modules"
+    	runroot $COMPONENT --onlyone --arch $ARCH "/usr/sbin/chroot $DESTGR /usr/bin/pango-querymodules 2> $DESTGR/etc/pango/pango.modules"
     else
-	LD_LIBRARY_PATH=/usr/X11R6/$LIBDIR:$LD_LIBRARY_PATH /usr/sbin/chroot $DESTGR /usr/bin/pango-querymodules > $DESTGR/etc/pango/pango.modules
+	/usr/sbin/chroot $DESTGR /usr/bin/pango-querymodules > $DESTGR/etc/pango/pango.modules
     fi
     rm -f $DESTGR/usr/bin/pango-querymodules
     # more sick hackery since it doesn't fall back to this like owen thought
@@ -1144,9 +1132,9 @@ echo "Getting gtk2 input method modules"
 if [ -n "$NEEDGR" ]; then
     mv $DESTGR/usr/bin/gtk-query-immodules-2.0* $DESTGR/usr/bin/gtk-query-immodules-2.0
     if [ -x /usr/bin/runroot -a -n "$COMPONENT" ]; then
-	runroot $COMPONENT --onlyone --arch $ARCH "LD_LIBRARY_PATH=/usr/X11R6/$LIBDIR:$LD_LIBRARY_PATH /usr/sbin/chroot $DESTGR /usr/bin/gtk-query-immodules-2.0 2> $DESTGR/etc/gtk-2.0/$HOSTTRIPLET/gtk.immodules"
+	runroot $COMPONENT --onlyone --arch $ARCH "/usr/sbin/chroot $DESTGR /usr/bin/gtk-query-immodules-2.0 2> $DESTGR/etc/gtk-2.0/$HOSTTRIPLET/gtk.immodules"
     else
-	LD_LIBRARY_PATH=/usr/X11R6/$LIBDIR:$LD_LIBRARY_PATH /usr/sbin/chroot $DESTGR /usr/bin/gtk-query-immodules-2.0 > $DESTGR/etc/gtk-2.0/$HOSTTRIPLET/gtk.immodules
+	/usr/sbin/chroot $DESTGR /usr/bin/gtk-query-immodules-2.0 > $DESTGR/etc/gtk-2.0/$HOSTTRIPLET/gtk.immodules
     fi
     rm -f $DESTGR/usr/bin/gtk-query-immodules-2.0
 fi
@@ -1155,9 +1143,9 @@ echo "Getting gtk2 gdk-pixbuf loaders"
 if [ -n "$NEEDGR" ]; then
     mv $DESTGR/usr/bin/gdk-pixbuf-query-loaders* $DESTGR/usr/bin/gdk-pixbuf-query-loaders
     if [ -x /usr/bin/runroot -a -n "$COMPONENT" ]; then
-	runroot $COMPONENT --onlyone --arch $ARCH "LD_LIBRARY_PATH=/usr/X11R6/$LIBDIR:$LD_LIBRARY_PATH /usr/sbin/chroot $DESTGR /usr/bin/gdk-pixbuf-query-loaders 2> $DESTGR/etc/gtk-2.0/$HOSTTRIPLET/gdk-pixbuf.loaders"
+	runroot $COMPONENT --onlyone --arch $ARCH "/usr/sbin/chroot $DESTGR /usr/bin/gdk-pixbuf-query-loaders 2> $DESTGR/etc/gtk-2.0/$HOSTTRIPLET/gdk-pixbuf.loaders"
     else
-	LD_LIBRARY_PATH=/usr/X11R6/$LIBDIR:$LD_LIBRARY_PATH /usr/sbin/chroot $DESTGR /usr/bin/gdk-pixbuf-query-loaders > $DESTGR/etc/gtk-2.0/$HOSTTRIPLET/gdk-pixbuf.loaders
+	/usr/sbin/chroot $DESTGR /usr/bin/gdk-pixbuf-query-loaders > $DESTGR/etc/gtk-2.0/$HOSTTRIPLET/gdk-pixbuf.loaders
     fi
     rm -f $DESTGR/usr/bin/gdk-pixbuf-query-loaders
 fi
@@ -1228,7 +1216,7 @@ for p in $DEST $DESTGR; do
 
 	rm -rf $p/boot $p/home $p/root $p/tmp
 
-	find $p -name "*.a" | grep -v "usr/X11R6/$LIBDIR/modules" | xargs rm -rf
+	find $p -name "*.a" | xargs rm -rf
 	find $p -name "lib*.la" |grep -v "usr/$LIBDIR/gtk-2.0" | xargs rm -rf
 	for f in newt popt rpm rpmio; do
 	    rm -f $p/usr/$LIBDIR/lib$f.so
@@ -1269,9 +1257,9 @@ fi
 echo "Creating fontconfig cache"
 if [ -n "$NEEDGR" ]; then
     if [ -x /usr/bin/runroot -a -n "$COMPONENT" ]; then
-	runroot $COMPONENT --onlyone --arch $ARCH "LD_LIBRARY_PATH=/usr/X11R6/$LIBDIR:$LD_LIBRARY_PATH /usr/sbin/chroot $DESTGR /usr/bin/fc-cache"
+	runroot $COMPONENT --onlyone --arch $ARCH "/usr/sbin/chroot $DESTGR /usr/bin/fc-cache"
     else
-	LD_LIBRARY_PATH=/usr/X11R6/$LIBDIR:$LD_LIBRARY_PATH /usr/sbin/chroot $DESTGR /usr/bin/fc-cache
+	/usr/sbin/chroot $DESTGR /usr/bin/fc-cache
     fi
     rm -f $DESTGR/usr/bin/fc-cache
 fi