- pl for -debug

[packages/anaconda.git] / anaconda-upd-instroot

diff --git a/anaconda-upd-instroot b/anaconda-upd-instroot
index eebfe8098fee803b9955f17f7880ec71e7c6852f..3b405d893111aed6c0f12b24416ac6b3290b218f 100644 (file)
--- a/anaconda-upd-instroot
+++ b/anaconda-upd-instroot
@@ -111,17 +111,17 @@ mkdir -p $DESTGR
 
 PACKAGES="glibc glibc-common setup openssl python newt slang libselinux
         libsepol libtermcap zlib ash e2fsprogs util-linux raidtools popt
-        procps rpm rpm-libs XFree86 Xconfigurator anaconda tzdata
+        procps rpm rpm-lib XFree86 Xconfigurator anaconda tzdata
         anaconda-runtime kudzu hwdata bzip2 beecrypt mdadm libsemanage
         bzip2-libs dosfstools pciutils reiserfsprogs parted sed
-        busybox-anaconda rpm-python booty hdparm lvm2 beecrypt device-mapper dlm
-        rhpl pyxf86config libxml2 libxml2-python glib2 sqlite neon
+        busybox-anaconda python-rpm python-booty hdparm lvm2 beecrypt device-mapper dlm
+        python-rhpl pyxf86config libxml2 python-libxml2 glib2 sqlite neon
         elfutils-libelf krb5-libs convertdb1 jfsutils
         xfsprogs xfsdump dmapi libacl libattr attr acl python-urlgrabber
-         policy policycoreutils pyparted xorg-x11 selinux-policy-targeted
+         policy policycoreutils pyparted X11 X11-tools selinux-policy-targeted
         libstdc++ expat libgcc readline ncurses yum python-sqlite
         python-elementtree pykickstart e2fsprogs-libs iscsi-initiator-utils
-        db4"
+        db4 bash glibc-misc python-libs python-parted python-xf86config"
 
 if [ $ARCH = i386 -o $ARCH = x86_64 ]; then
     PACKAGES="$PACKAGES pcmciautils pcmcia-cs"
@@ -428,7 +428,7 @@ usr/$LIBDIR/python?.?/site-packages/*sqlite*
 usr/$LIBDIR/python?.?/site-packages/rhpl
 usr/$LIBDIR/python?.?/site-packages/cElementTree.so
 usr/$LIBDIR/python?.?/site-packages/block
-usr/lib/locale/*
+usr/share/locale/*
 usr/lib/python?.?/site-packages/elementtree/*
 usr/lib/python?.?/site-packages/rpmUtils/*
 usr/lib/python?.?/site-packages/urlgrabber/*
@@ -994,7 +994,7 @@ cat $DESTGR/usr/lib/anaconda/lang-table* | gawk '
   print $2;
 }
 ' | LC_ALL=C sort -u > $DESTGR/locales
-for p in lib share; do (
+for p in share; do (
 cd $DESTGR/usr/$p/locale && {
 ls | grep -v locale.alias | LC_ALL=C sort > $DESTGR/locales.list
 LC_ALL=C comm -13 $DESTGR/locales $DESTGR/locales.list | xargs rm -rf
@@ -1004,18 +1004,18 @@ rm -f $DESTGR/locales $DESTGR/locales.list
 
 # now, create a locale archive and nuke the locale dirs since 
 # that ends up taking less space
-for p in $DEST $DESTGR; do
-    echo "Building locale archive"
-    if [ -x /usr/bin/runroot -a -n "$COMPONENT" ]; then
-       runroot $COMPONENT --onlyone --arch $ARCH "/usr/sbin/chroot $p /usr/sbin/build-locale-archive"
-    else
-       /usr/sbin/chroot $p /usr/sbin/build-locale-archive
-    fi
-    mv $p/usr/lib/locale/locale-archive $p/usr/lib/locale-archive
-    rm -rf $p/usr/lib/locale/*
-    rm -f $p/usr/sbin/build-locale-archive
-    mv $p/usr/lib/locale-archive $p/usr/lib/locale/locale-archive 
-done
+#for p in $DEST $DESTGR; do
+#    echo "Building locale archive"
+#    if [ -x /usr/bin/runroot -a -n "$COMPONENT" ]; then
+#      runroot $COMPONENT --onlyone --arch $ARCH "/usr/sbin/chroot $p /usr/sbin/build-locale-archive"
+#    else
+#      /usr/sbin/chroot $p /usr/sbin/build-locale-archive
+#    fi
+#    mv $p/usr/lib/locale/locale-archive $p/usr/lib/locale-archive
+#    rm -rf $p/usr/lib/locale/*
+#    rm -f $p/usr/sbin/build-locale-archive
+#    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
@@ -1084,7 +1084,7 @@ fi
 
 echo "Running mkfontdir..."
 if [ -n "$NEEDGR" ]; then
-    mkfontdir $DESTGR/usr/share/X11/fonts/*
+    /usr/X11R6/bin/mkfontdir $DESTGR/usr/share/fonts/*
 fi
 
 echo "Creating SELinux policy..."
@@ -1099,8 +1099,6 @@ cp -r $DESTGR/etc/selinux/* $DEST/etc/selinux/
 
 echo "Getting pango modules"
 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"
     else
@@ -1114,7 +1112,8 @@ ModuleFiles=/etc/pango/pango.modules
 EOF
 fi
 
-host=`rpm --nodigest --nosignature -qp --qf "%{POSTIN}\n" $PACKAGEDIR/gtk2*.$ARCH.rpm |grep update-gdk-pixbuf |awk {'print $2;'}`
+host=`rpm -E %{_host}`
+
 
 case "$host" in
   *linux) canonhost="$host-gnu"
@@ -1131,7 +1130,6 @@ mkdir -p $DESTGR/etc/gtk-2.0/$HOSTTRIPLET
 
 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"
     else
@@ -1142,7 +1140,6 @@ fi
 
 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"
     else
@@ -1155,6 +1152,7 @@ rm -f $KEEPFILE $KEEPFILEGR $KEEPFILERESCUE
 
 for p in $DEST $DESTGR; do
        echo "Scrubbing trees..." "$p"
+       install -d $p/usr/bin
        cp $p/usr/lib/anaconda/raidstart-stub $p/usr/bin/raidstart
        cp $p/usr/lib/anaconda/raidstop-stub $p/usr/bin/raidstop
        cp $p/usr/lib/anaconda/losetup-stub $p/usr/bin/losetup