From d1aa5609c1845ad8c7bbd123e6e1e7197171719a Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Thu, 12 Jun 2003 02:03:59 +0000 Subject: merge from taroon. fixes driver disks, side effect of pulling in new buildinstall stuff --- Makefile.inc | 4 +- anaconda.spec.in | 2 +- hdrlist.py | 2 +- loader2/driverdisk.c | 10 ++--- scripts/buildinstall | 105 ++++++++++++++++++++++++++++++------------------- scripts/mk-images | 29 ++++++++------ scripts/mk-images.i386 | 2 +- scripts/mk-images.ppc | 2 +- scripts/pkgorder | 26 +++++++++--- scripts/scrubtree | 9 ++++- scripts/upd-instroot | 40 +++++++++++-------- textw/network_text.py | 3 +- utils/Makefile | 4 +- whiteout.py | 3 +- 14 files changed, 150 insertions(+), 91 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 719d39772..ff9dabeea 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1,8 +1,8 @@ # # define destination locations # -VERSION = 9.0.91 -RELEASE = 5 +VERSION = 9.0.92 +RELEASE = 1 TIMESTAMP := $(shell date "+.%Y%m%d%H%M%S") SNAPRELEASE := $(RELEASE)$(TIMESTAMP) diff --git a/anaconda.spec.in b/anaconda.spec.in index a88161a45..4f0b5d9d5 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -7,7 +7,7 @@ License: GPL Summary: The Red Hat Linux installation program. Group: Applications/System Source: anaconda-%{PACKAGE_VERSION}.tar.bz2 -BuildPreReq: pump-devel >= 0.8.15, kudzu-devel >= 1.1.0, pciutils-devel, bzip2-devel, e2fsprogs-devel, python-devel gtk2-devel rpm-python >= 4.2-0.61, newt-devel, rpm-devel, gettext >= 0.11, modutils-devel, rhpl, booty, libxml2-python, zlib-devel, bogl-devel >= 0:0.1.9-17, bogl-bterm >= 0:0.1.9-17, elfutils-devel +BuildPreReq: pump-devel >= 0.8.15, kudzu-devel >= 1.1.0, pciutils-devel, bzip2-devel, e2fsprogs-devel, python-devel gtk2-devel rpm-python >= 4.2-0.61, newt-devel, rpm-devel, gettext >= 0.11, modutils-devel, rhpl, booty, libxml2-python, zlib-devel, bogl-devel >= 0:0.1.9-17, bogl-bterm >= 0:0.1.9-17, elfutils-devel, beecrypt-devel %ifarch i386 BuildRequires: dietlibc %endif diff --git a/hdrlist.py b/hdrlist.py index 382a51862..35aa94f93 100644 --- a/hdrlist.py +++ b/hdrlist.py @@ -376,7 +376,7 @@ class HeaderList: pkg = self.getBestNevra(item) if pkg is None: - raise KeyError, "No such package" + raise KeyError, "No such package %s" %(item,) return self.pkgs[pkg] diff --git a/loader2/driverdisk.c b/loader2/driverdisk.c index ec063193f..7258a3ba8 100644 --- a/loader2/driverdisk.c +++ b/loader2/driverdisk.c @@ -39,7 +39,7 @@ #include "../isys/probe.h" static char * driverDiskFiles[] = { "modinfo", "modules.dep", "pcitable", - "modules.cgz", "rhdd-6.1", NULL }; + "modules.cgz", NULL }; @@ -58,10 +58,10 @@ static int verifyDriverDisk(char *mntpt, int flags) { /* check for both versions */ sprintf(file, "%s/rhdd", mntpt); - if (!access(file, R_OK)) { + if (access(file, R_OK)) { logMessage("not a new format driver disk, checking for old"); sprintf(file, "%s/rhdd-6.1", mntpt); - if (!access(file, R_OK)) { + if (access(file, R_OK)) { logMessage("can't find either driver disk identifier, bad " "driver disk"); } @@ -90,10 +90,10 @@ static int loadDriverDisk(moduleInfoSet modInfo, moduleList modLoaded, /* check for both versions */ sprintf(file, "%s/rhdd", mntpt); - if (!access(file, R_OK)) { + if (access(file, R_OK)) { version = 0; sprintf(file, "%s/rhdd-6.1", mntpt); - if (!access(file, R_OK)) { + if (access(file, R_OK)) { /* this can't happen, we already verified it! */ return LOADER_BACK; } diff --git a/scripts/buildinstall b/scripts/buildinstall index 2dbf60a34..039477281 100755 --- a/scripts/buildinstall +++ b/scripts/buildinstall @@ -6,11 +6,13 @@ usage() { } COMPNAME=dist-7.0 +RUN=1 while [ $# -gt 0 ]; do case $1 in --pkgorder) PKGORDER=$2 + PKGORDERSTR="--pkgorder $2" shift; shift ;; --comp) @@ -29,6 +31,18 @@ while [ $# -gt 0 ]; do PRODUCTSTR=$2 shift; shift ;; + --debug) + DEBUGSTR="--debug" + shift + ;; + --second) + RUN=2 + shift + ;; + --buildinstdir) + BUILDINSTDIR=$2 + shift; shift + ;; *) if [ -n "$DIR" -o ! -d $1/RedHat/RPMS ]; then usage @@ -44,7 +58,7 @@ if [ -z "$PRODUCTSTR" ]; then fi if [ -z "$VERSION" ]; then - usage + VERSION=$(rpm --qf '%{VERSION}' -qp $DIR/RedHat/RPMS/redhat-release-*.rpm) fi if [ -z "$DIR" ]; then @@ -57,47 +71,62 @@ fi p=`cd $DIR; /bin/pwd` -BUILDINSTDIR=$p/buildinstall.tree.$$ +if [ -z "$BUILDINSTDIR" ]; then + BUILDINSTDIR=$p/buildinstall.tree.$$ + rm -rf $BUILDINSTDIR + mkdir -p $BUILDINSTDIR +fi TREEDIR=/tmp/treedir.$$ -rm -rf $BUILDINSTDIR -mkdir -p $BUILDINSTDIR +UPD_INSTROOT=$BUILDINSTDIR/upd-instroot +MK_IMAGES=$BUILDINSTDIR/mk-images +MK_STAMP=$BUILDINSTDIR/makestamp.py +BUILDINSTALL=$BUILDINSTDIR/buildinstall + +BUILDARCH=`rpm -qp --qf "%{ARCH}" $p/RedHat/RPMS/anaconda-runtime-[0-9]*` + +firstRun() { +echo "Running buildinstall..." + +pushd $BUILDINSTDIR +rpm2cpio $p/RedHat/RPMS/anaconda-runtime-[0-9]* | cpio --quiet -iumd './usr*' +popd UPD_INSTROOT=./upd-instroot MK_IMAGES=./mk-images +MK_STAMP=./makestamp.py +BUILDINSTALL=./buildinstall -BUILDARCH=`rpm -qp --qf "%{ARCH}" $p/RedHat/RPMS/anaconda-runtime-[0-9]*` +for f in $UPD_INSTROOT $MK_IMAGES $MK_STAMP $BUILDINSTALL; do + if [ ! -f $f ]; then + cp -a $BUILDINSTDIR/usr/lib/anaconda-runtime/$f* $BUILDINSTDIR/ + else + cp -a $f* $BUILDINSTDIR/ + fi +done -if [ ! -f $UPD_INSTROOT ]; then - cd $BUILDINSTDIR - rpm2cpio $p/RedHat/RPMS/anaconda-runtime-[0-9]* | cpio --quiet -iumd ./usr/lib/anaconda-runtime/upd-instroot usr/lib/anaconda-runtime/upd-instroot - mv usr/lib/anaconda-runtime/upd-instroot . - rm -rf usr -else - cp -a $UPD_INSTROOT $BUILDINSTDIR/upd-instroot -fi UPD_INSTROOT=$BUILDINSTDIR/upd-instroot +MK_IMAGES=$BUILDINSTDIR/mk-images +MK_STAMP=$BUILDINSTDIR/makestamp.py +BUILDINSTALL=$BUILDINSTDIR/buildinstall -if [ ! -f $MK_IMAGES ]; then - cd $BUILDINSTDIR - rpm2cpio $p/RedHat/RPMS/anaconda-runtime-[0-9]* | cpio --quiet -iumd ./usr/lib/anaconda-runtime/mk-images* usr/lib/anaconda-runtime/mk-images* - mv usr/lib/anaconda-runtime/mk-images* . - rm -rf usr +rm -rf $BUILDINSTDIR/usr + +echo "Going to run buildinstall again" +# run it again for the second half +if [ -x /usr/bin/runroot ]; then + runroot $COMPNAME --onlyone --arch $BUILDARCH "$BUILDINSTALL --buildinstdir $BUILDINSTDIR --second $PKGORDERSTR --comp $COMPNAME --version $VERSION --release '\"$RELEASESTR\"' --product '\"$PRODUCTSTR\"' $DIR" else - cp $MK_IMAGES* $BUILDINSTDIR/ + $BUILDINSTALL --buildinstdir $BUILDINSTDIR --second $PKGORDERSTR --comp $COMPNAME --version $VERSION --release \"$RELEASESTR\" --product \"$PRODUCTSTR\" $DIR fi -MK_IMAGES=$BUILDINSTDIR/mk-images +} +secondRun() { echo "Building images..." if [ -x /usr/bin/runroot ]; then - runroot $COMPNAME --onlyone --arch $BUILDARCH "$UPD_INSTROOT --comp $COMPNAME $p/RedHat/RPMS $TREEDIR/image-template $TREEDIR/instimage" + runroot $COMPNAME --onlyone --arch $BUILDARCH "$UPD_INSTROOT $DEBUGSTR --comp $COMPNAME $p/RedHat/RPMS $TREEDIR/image-template $TREEDIR/instimage" else - $UPD_INSTROOT --comp $COMPNAME $p/RedHat/RPMS $TREEDIR/image-template $TREEDIR/instimage -fi - -# XXX hack - msw -if [ $BUILDARCH = "sparc" ]; then - BUILDARCH=sparc64 + $UPD_INSTROOT $DEBUGSTR --comp $COMPNAME $p/RedHat/RPMS $TREEDIR/image-template $TREEDIR/instimage fi if [ -n "$PKGORDER" ]; then @@ -112,23 +141,12 @@ fi echo "Making images..." if [ -x /usr/bin/runroot ]; then - runroot $COMPNAME --onlyone --arch $BUILDARCH "cd $BUILDINSTDIR\; ./mk-images $p/RedHat/RPMS $p $TREEDIR/image-template $TREEDIR/instimage $BUILDARCH '\"$PRODUCTSTR\"' $VERSION" + runroot $COMPNAME --onlyone --arch $BUILDARCH "cd $BUILDINSTDIR\; ./mk-images $DEBUGSTR $p/RedHat/RPMS $p $TREEDIR/image-template $TREEDIR/instimage $BUILDARCH '\"$PRODUCTSTR\"' $VERSION" else - $MK_IMAGES $p/RedHat/RPMS $p $TREEDIR/image-template $TREEDIR/instimage $BUILDARCH "$PRODUCTSTR" $VERSION + $MK_IMAGES $DEBUGSTR $p/RedHat/RPMS $p $TREEDIR/image-template $TREEDIR/instimage $BUILDARCH "$PRODUCTSTR" $VERSION fi -MK_STAMP=./makestamp.py echo "Writing .discinfo file" -if [ ! -f $MK_STAMP ]; then - cd $BUILDINSTDIR - rpm2cpio $p/RedHat/RPMS/anaconda-runtime-[0-9]* | cpio --quiet -iumd ./usr/lib/anaconda-runtime/makestamp* usr/lib/anaconda-runtime/makestamp* - mv usr/lib/anaconda-runtime/makestamp* . - rm -rf usr -else - cp $MK_STAMP* $BUILDINSTDIR/ -fi -MK_STAMP=$BUILDINSTDIR/makestamp.py - $MK_STAMP --releasestr="$RELEASESTR" --arch=$BUILDARCH --discNum="1,2,3" --baseDir=RedHat/base --packagesDir=RedHat/RPMS --pixmapsDir=RedHat/pixmaps --outfile=$p/.discinfo rm -rf $BUILDINSTDIR @@ -137,3 +155,10 @@ if [ -x /usr/bin/runroot ]; then else rm -rf $TREEDIR/image-template $TREEDIR/instimage fi +} + +if [ $RUN == 1 ]; then + firstRun +else + secondRun +fi diff --git a/scripts/mk-images b/scripts/mk-images index 56aa49f6c..2f478134a 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -8,6 +8,11 @@ usage () { exit 0 } +DEBUG="" +if [ "$1" == "--debug" ]; then + DEBUG="--debug" +fi + if [ -z "$1" -o -z "$2" -o -z "$3" -o -z "$4" -o -z "$5" -o -z "$6" -o -z "$7" ]; then usage; fi PRODUCT=$6 @@ -121,7 +126,7 @@ TOPDIR=$(cd $TOPDIR; pwd) echo "Found keymap override, using it" cp $IMGPATH/usr/lib/anaconda-runtime/keymaps-override-$BUILDARCH $KEYMAPS else - echo "Running: GETKEYMAPS $BUILDARCH $KEYMAPS $IMGPATH" + echo "Running: $GETKEYMAPS $BUILDARCH $KEYMAPS $IMGPATH" $GETKEYMAPS $BUILDARCH $KEYMAPS $IMGPATH if [ $? != 0 ]; then echo "Unable to create keymaps and thus can't create initrd." @@ -135,7 +140,7 @@ findPackage() { name=$2 for n in $dir/$name*{${KERNELARCH},noarch}.rpm; do - thisName=$(rpm --qf '%{NAME}' -qp $n) + thisName=$(rpm --nodigest --nosignature --qf '%{NAME}' -qp $n) if [ -z "$thisName" ]; then continue fi @@ -220,7 +225,7 @@ intcopymodules () { for n in $1; do m=$(findmodule $n) if [ -z "$m" ]; then - echo "Module $n not found in kernel rpm" >&2 + [ -n "$DEBUG" ] && echo "Module $n not found in kernel rpm" >&2 else echo $n >> $MODULESUSED for o in $m ; do @@ -482,7 +487,6 @@ EOF install -m 644 $LOADERBINDIR/$MYLOADERTR $MBD_DIR/etc/loader.tr install -m 644 $IMGPATH/usr/share/terminfo/l/linux $MBD_DIR/etc/terminfo/l/linux install -m 644 $IMGPATH/usr/share/terminfo/x/xterm $MBD_DIR/etc/terminfo/x/xterm - install -m 644 $IMGPATH/usr/share/terminfo/x/xterm-color $MBD_DIR/etc/terminfo/x/xterm-color install -m 644 $IMGPATH/usr/share/terminfo/v/vt100 $MBD_DIR/etc/terminfo/v/vt100 makeproductfile $MBD_DIR @@ -559,13 +563,13 @@ EOF EOF ln -s fb0 $MBD_DIR/dev/fb - dd if=/dev/zero of=$MBD_DIR/etc/ramfs.img.big bs=1k count=16000 + dd if=/dev/zero of=$MBD_DIR/etc/ramfs.img.big bs=1k count=16000 2>/dev/null mke2fs -F -q $MBD_DIR/etc/ramfs.img.big gzip -9 < $MBD_DIR/etc/ramfs.img.big > $MBD_DIR/etc/ramfs.img rm -f $MBD_DIR/etc/ramfs.img.big cat > $MBD_DIR/.profile </dev/null - /sbin/mke2fs -F -i 4096 $MI_TMPIMAGE > /dev/null 2>/dev/null + /sbin/mke2fs -q -F -i 4096 $MI_TMPIMAGE > /dev/null 2>/dev/null mount -o loop $MI_TMPIMAGE $MI_MNTPOINT (cd $MI_FROM; find . | cpio --quiet -p $MI_MNTPOINT) @@ -757,8 +761,8 @@ makemainimage () { ERROR=$(du -sk $IMGPATH/usr/lib/anaconda-runtime | awk '{ print $1 }') SIZE=$(expr $SIZE - $ERROR) fi - dd if=/dev/zero bs=1k count=${SIZE} of=$mmi_tmpimage - mke2fs -F $mmi_tmpimage > /dev/null + dd if=/dev/zero bs=1k count=${SIZE} of=$mmi_tmpimage 2>/dev/null + mke2fs -q -F $mmi_tmpimage > /dev/null mount -o loop $mmi_tmpimage $mmi_mntpoint (cd $IMGPATH; find . | fgrep -v "./usr/lib/anaconda-runtime" | @@ -811,7 +815,7 @@ makedriverdisk () { fi dd if=/dev/zero of=/tmp/$diskname.img bs=1k count=$size 2> /dev/null - /sbin/mke2fs -F -i 4096 /tmp/$diskname.img > /dev/null 2>/dev/null + /sbin/mke2fs -q -F -i 4096 /tmp/$diskname.img > /dev/null 2>/dev/null mkdir -p /tmp/mkdd.$$ mount -t ext2 -o loop /tmp/$diskname.img /tmp/mkdd.$$ rmdir /tmp/mkdd.$$/lost+found @@ -879,8 +883,8 @@ for KERNELARCH in $arches; do ppackage="" fi - version=$(rpm --qf '%{VERSION}-%{RELEASE}' -qp $kpackage)${kernelvers} - arch=$(rpm --qf '%{ARCH}\n' -qp $kpackage) + version=$(rpm --nodigest --nosignature --qf '%{VERSION}-%{RELEASE}' -qp $kpackage)${kernelvers} + arch=$(rpm --nodigest --nosignature --qf '%{ARCH}\n' -qp $kpackage) echo "unpacking $kpackage.$arch" rpm2cpio $kpackage | (cd $KERNELROOT; cpio --quiet -iumd) @@ -924,3 +928,4 @@ find $KERNELBASE/*/lib/modules/ > $CACHE makeSecondStage rm -rf $KERNELBASE +cd $TOPDIR diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386 index 9bfe18c60..7047d9ea4 100644 --- a/scripts/mk-images.i386 +++ b/scripts/mk-images.i386 @@ -184,7 +184,7 @@ makeBootImages() { echo "Building isolinux directory" MBD_BOOTTREE=$TOPDESTPATH/isolinux MBD_FSIMAGE=$TOPDESTPATH/images/pxeboot/initrd-everything.img - mkdir $MBD_BOOTTREE + mkdir $MBD_BOOTTREE 2>/dev/null cp $IMGPATH/usr/lib/syslinux/isolinux.bin $MBD_BOOTTREE/isolinux.bin prepareBootTree diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc index bdd2a84d6..37dc26a95 100644 --- a/scripts/mk-images.ppc +++ b/scripts/mk-images.ppc @@ -43,7 +43,7 @@ makeBootImages() { # FIXME: this assumes the file gets there by magic cp $TOPDESTPATH/boot_image $TOPDESTPATH/isopath/boot_image - mkisofs -generic-boot $TOPDESTPATH/isopath/boot_image -A "$PRODUCT $VERSION" -V "PBOOT" -J -R -v -T -allow-multidot -l -o $TOPDESTPATH/images/boot.iso $TOPDESTPATH/isopath + mkisofs -generic-boot $TOPDESTPATH/isopath/boot_image -A "$PRODUCT $VERSION" -V "PBOOT" -J -R -T -allow-multidot -l -o $TOPDESTPATH/images/boot.iso $TOPDESTPATH/isopath rm -rf $TOPDESTPATH/isopath/ elif [ "$KERNELARCH" = "ppc64iseries" ]; then mkdir -p $TOPDESTPATH/ppc/iSeries diff --git a/scripts/pkgorder b/scripts/pkgorder index 33eef6156..3e3092add 100755 --- a/scripts/pkgorder +++ b/scripts/pkgorder @@ -51,19 +51,26 @@ def addIfNeeded(pkg): else: # this is a biarch arch. we want to just have a primary package # for each here + add = -1 for p in pkgHash[pkg.name]: arch1 = p['arch'] arch2 = pkg['arch'] # same arch, don't worry about it if arch1 == arch2: - continue + add = 0 + break # if one of them doesn't work for the canon arch and the other # does, then one of them is for the secondary arch and we want # to add it. - if ( ((diff(prim, arch1) == 0) and (diff(second, arch2) != 0)) or - ((diff(prim, arch2) == 0) and (diff(second, arch1) != 0)) ): - pkgHash[pkg.name].append(pkg) - pkgOrder.append(pkg.nevra()) + if ((((diff(prim, arch1) == 0) and (diff(second, arch2) != 0)) or + ((diff(prim, arch2) == 0) and (diff(second, arch1) != 0))) and + add == -1): + add = 1 + + if add == 1: + pkgHash[pkg.name].append(pkg) + pkgOrder.append(pkg.nevra()) + # set PKGORDER_DEBUG to get rpm debugging @@ -182,7 +189,8 @@ for p in hdlist.pkgs.values(): list.append(p) list.sort(cmpHeaderByName) for item in list: - pkgOrder.append(item.nevra()) + if item.nevra() not in pkgOrder: + pkgOrder.append(item.nevra()) # Now set up rpm to run the transaction deporder testpath = '/tmp/pkgorder-' + str (os.getpid ()) @@ -191,6 +199,11 @@ os.system ("mkdir -p " + testpath + "/var/lib/rpm") ts = rpm.TransactionSet(testpath) ts.setVSFlags(~(rpm.RPMVSF_NORSA|rpm.RPMVSF_NODSA)) ts.setFlags(rpm.RPMTRANS_FLAG_ANACONDA) +# ts coloring, more hacks to workaround #92285 +if (rhpl.arch.canonArch.startswith("ppc64") or + rhpl.arch.canonArch in ("s390x", "sparc64", "x86_64")): + ts.setColor(3) + i = 0 for h in pkgOrder: # sys.stderr.write("%s: %s\n" %(i, h)) @@ -225,6 +238,7 @@ for p in pkgOrder: if p['name'] in outputted: continue + outputted.append(p['name']) pkgs = hdlist.pkgnames[p['name']] pkgs.sort(archSort) for pnevra in pkgs: diff --git a/scripts/scrubtree b/scripts/scrubtree index 3e3b20f33..7d89d8e04 100755 --- a/scripts/scrubtree +++ b/scripts/scrubtree @@ -1,5 +1,12 @@ #!/bin/bash +DEBUG="" + +if [ "$1" == "--debug" ]; then + DEBUG="--debug" + shift +fi + if [ -z "$1" ]; then echo "Usage: $0 /path/to/tree" exit 1 @@ -48,7 +55,7 @@ while [ -n "$1" ]; do if [ ! -f "$1" ]; then ln -sf ./busybox $1 else - echo "Overriding busybox version of $1" + [ -n "$DEBUG" ] && echo "Overriding busybox version of $1" fi fi shift diff --git a/scripts/upd-instroot b/scripts/upd-instroot index fd241647b..795046aa4 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -2,6 +2,12 @@ ORIGDIR=`pwd` COMPONENT="" +DEBUG="" + +if [ "$1" == "--debug" ]; then + DEBUG="--debug" + shift +fi if [ "$1" == "--comp" ]; then COMPONENT=$2 @@ -25,7 +31,7 @@ fi PACKAGEDIR=$1 if [ -z "$ARCH" ]; then - ARCH=`rpm -qp --qf "%{ARCH}" $PACKAGEDIR/anaconda-runtime*.rpm` + ARCH=`rpm --nodigest --nosignature -qp --qf "%{ARCH}" $PACKAGEDIR/anaconda-runtime*.rpm` fi if [ $ARCH = x86_64 -o $ARCH = s390x ]; then @@ -62,7 +68,7 @@ prunePackageList() { PACKAGEFILES=$(ls $PACKAGEFILES | sort -u) - rpm --qf "%{NAME} $PACKAGEPATH/%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm\n" \ + rpm --nodigest --nosignature --qf "%{NAME} $PACKAGEPATH/%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm\n" \ -qp $PACKAGEFILES | egrep "$PATTERN" | sed 's/.* //' } @@ -72,12 +78,12 @@ expandPackageSet() { KEEPFILES=$3 for n in $RPMS; do - echo -ne "\rExpanding packages..." $(basename $n) - if [ $(rpm -qp --qf '%{NAME}' $n) = "glibc-common" ] ; then + [ -n "$DEBUG" ] && echo -ne "\rExpanding packages..." $(basename $n) + if [ $(rpm --nosignature --nodigest -qp --qf '%{NAME}' $n) = "glibc-common" ] ; then GLIBC=$n fi rpm2cpio $n | (cd $PKGDEST; cpio -E $KEEPFILES --quiet -iumd) - echo -ne "\rExpanding packages..." "$(basename $n | sed 's/./ /g')" + [ -n "$DEBUG" ] && echo -ne "\rExpanding packages..." "$(basename $n | sed 's/./ /g')" done } @@ -102,7 +108,7 @@ PACKAGES="glibc glibc-common setup openssl python python2 newt slang procps rpm XFree86 Xconfigurator anaconda anaconda-runtime kudzu hwdata bzip2 beecrypt bzip2-libs dosfstools pciutils reiserfs-utils parted sed - busybox-anaconda rpm-python booty hdparm lvm + busybox-anaconda rpm-python booty hdparm lvm beecrypt rhpl pyxf86config libxml2 libxml2-python glib2 elfutils-libelf bogl-bterm bogl krb5-libs convertdb1 jfsutils" @@ -728,7 +734,9 @@ EOF echo "Assembling package list..." RPMS=$(prunePackageList $PACKAGEDIR "$PACKAGES") +[ -n "$DEBUG" ] && echo "RPMS are $RPMS" RPMSGR=$(prunePackageList $PACKAGEDIR "$PACKAGESGR $PACKAGESRESCUE") +[ -n "$DEBUG" ] && echo "RPMSGR are $RPMSGR" rm -rf $DEST; mkdir -p $DEST/usr/sbin rm -rf $DESTGR; mkdir -p $DESTGR/usr/sbin $DESTGR/var/lib @@ -747,13 +755,13 @@ for file in $KEEPFILE $KEEPFILEGR; do mv -f $file- $file done -echo -n "Expanding packages..." +echo "Expanding text packages..." expandPackageSet "$RPMS" $DEST $KEEPFILE (cd $DEST; tar cSpf - .) | (cd $DESTGR; tar xSpf -) expandPackageSet "$RPMSGR" $DESTGR $KEEPFILEGR -echo -e "\rExpanding packages..." +echo "Expanding graphical packages..." echo "retrieving timezones" TZDIR=/tmp/glibc-timezone-$$ @@ -848,7 +856,7 @@ fi echo "Running mkfontdir..." if [ -n "$NEEDGR" ]; then - /usr/X11R6/bin/mkfontdir -p /usr/X11R6/lib/X11/fonts/encodings/ -e $DESTGR/usr/X11R6/lib/X11/fonts/encodings $DESTGR/usr/X11R6/lib/X11/fonts/* $DESTGR/usr/share/fonts/ISO8859-9/* + /usr/X11R6/bin/mkfontdir -p /usr/X11R6/lib/X11/fonts/encodings/ -e $DESTGR/usr/X11R6/lib/X11/fonts/encodings $DESTGR/usr/X11R6/lib/X11/fonts/* rm -f $DESTGR/usr/X11R6/bin/mkfontdir fi @@ -884,16 +892,15 @@ fi # make the changes we want to fonts.conf for anaconda (#65913) if [ -n "$NEEDGR" ]; then - echo -n "Munging fonts.conf" + echo "Munging fonts.conf" sed s/AR\ PL\ SungtiL\ GB/Fangsong\ ti/g $DESTGR/etc/fonts/fonts.conf > $DESTGR/etc/fonts/fonts.conf.foo mv $DESTGR/etc/fonts/fonts.conf.foo $DESTGR/etc/fonts/fonts.conf fi rm -f $KEEPFILE $KEEPFILEGR $KEEPFILERESCUE -echo -n "Scrubbing trees..." for p in $DEST $DESTGR; do - echo -n -e "\rScrubbing trees..." "$p" + echo "Scrubbing trees..." "$p" 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 @@ -957,17 +964,16 @@ for p in $DEST $DESTGR; do (cd /usr/share/zoneinfo; find . -type f -or -type l | grep '^./[A-Z]' | sort | sed 's/^..//' | - gzip -9) > $p/usr/$LIBDIR/timezones.gz + gzip -9) > $p/usr/lib/timezones.gz if [ -x /usr/bin/runroot -a -n "$COMPONENT" ]; then - runroot $COMPONENT --onlyone --arch $ARCH "cd $p\; usr/lib/anaconda-runtime/scrubtree $p" + runroot $COMPONENT --onlyone --arch $ARCH "cd $p\; usr/lib/anaconda-runtime/scrubtree $DEBUG $p" else $p/usr/lib/anaconda-runtime/scrubtree $p fi - echo -n -e "\rScrubbing trees..." "$(echo $p | sed 's/./ /g')" done -echo -e "\nCompressing .mo files in stage2 images..." +echo "Compressing .mo files in stage2 images..." if [ -d $DEST/usr/share/locale ]; then for i in `find $DEST/usr/share/locale -name anaconda.mo`; do gzip -9 $i @@ -978,7 +984,7 @@ 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 -v" + runroot $COMPONENT --onlyone --arch $ARCH "LD_LIBRARY_PATH=/usr/X11R6/$LIBDIR:$LD_LIBRARY_PATH /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 -v fi diff --git a/textw/network_text.py b/textw/network_text.py index 07d7f710f..9c16025c1 100644 --- a/textw/network_text.py +++ b/textw/network_text.py @@ -184,7 +184,8 @@ class NetworkDeviceWindow: while currentDev < devLen and currentDev >= 0: rc = self.runScreen(screen, network, - self.devices[list[currentDev]], showonboot) + self.devices[list[currentDev]], + showonboot) if rc == INSTALL_BACK: currentDev = currentDev - 1 else: diff --git a/utils/Makefile b/utils/Makefile index 8667fc448..d1ec0f5d6 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -42,8 +42,8 @@ md5.o: md5.c md5.h gcc -c -O -g md5.c genhdlist: genhdlist.c hash.c - $(CC) -s $(RPMCFLAGS) -o genhdlist genhdlist.c hash.c \ - -lrpm -lrpmdb -lrpmio -lbz2 -lz -lpopt -lelf -lpthread + $(CC) $(LDFLAGS) $(RPMCFLAGS) -o genhdlist genhdlist.c hash.c \ + -lrpm -lrpmdb -lrpmio -lbz2 -lz -lpopt -lelf -lpthread -lbeecrypt depends: diff --git a/whiteout.py b/whiteout.py index d33bc4705..8a718ea12 100644 --- a/whiteout.py +++ b/whiteout.py @@ -43,7 +43,8 @@ whiteout=""" xinitrc>XFree86 \ xemacs>apel-xemacs \ gstreamer-tools>gstreamer \ - gimp>gimp-print-plugin + gimp>gimp-print-plugin \ + redhat-lsb>redhat-lsb """ rpm.addMacro("_dependency_whiteout", whiteout) -- cgit