summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/buildinstall26
-rwxr-xr-xscripts/mk-images70
-rw-r--r--scripts/mk-images.i3867
-rw-r--r--scripts/mk-images.ia642
-rw-r--r--scripts/mk-images.ppc15
-rw-r--r--scripts/mk-images.s3908
-rw-r--r--scripts/mk-images.x86_647
-rwxr-xr-xscripts/pkgorder6
-rwxr-xr-xscripts/upd-instroot2
9 files changed, 95 insertions, 48 deletions
diff --git a/scripts/buildinstall b/scripts/buildinstall
index e323597cb..2dbf60a34 100755
--- a/scripts/buildinstall
+++ b/scripts/buildinstall
@@ -55,9 +55,10 @@ if [ -z "$RELEASESTR" ]; then
usage
fi
-p=`cd $DIR; /bin/pwd | sed 's,/md1/,/,g'`
+p=`cd $DIR; /bin/pwd`
BUILDINSTDIR=$p/buildinstall.tree.$$
+TREEDIR=/tmp/treedir.$$
rm -rf $BUILDINSTDIR
mkdir -p $BUILDINSTDIR
@@ -88,27 +89,32 @@ fi
MK_IMAGES=$BUILDINSTDIR/mk-images
echo "Building images..."
-$UPD_INSTROOT --comp $COMPNAME $p/RedHat/RPMS $p/image-template $p/RedHat/instimage
+if [ -x /usr/bin/runroot ]; then
+ runroot $COMPNAME --onlyone --arch $BUILDARCH "$UPD_INSTROOT --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
fi
-if [ -n "$PKGORDER" -a -x $p/RedHat/instimage/usr/lib/anaconda-runtime/pkgorder ]; then
+if [ -n "$PKGORDER" ]; then
echo "Getting package order..."
if [ -x /usr/bin/runroot ]; then
runroot --quiet $COMPNAME --onlyone --arch $BUILDARCH \
- "PYTHONPATH=$p/RedHat/instimage/usr/lib/anaconda $p/RedHat/instimage/usr/lib/anaconda-runtime/pkgorder $p $BUILDARCH" > $PKGORDER
+ "PYTHONPATH=$TREEDIR/instimage/usr/lib/anaconda $TREEDIR/instimage/usr/lib/anaconda-runtime/pkgorder $p $BUILDARCH" > $PKGORDER
else
- PYTHONPATH=$p/RedHat/instimage/usr/lib/anaconda $p/RedHat/instimage/usr/lib/anaconda-runtime/pkgorder $p $BUILDARCH > $PKGORDER
+ PYTHONPATH=$TREEDIR/instimage/usr/lib/anaconda $TREEDIR/instimage/usr/lib/anaconda-runtime/pkgorder $p $BUILDARCH > $PKGORDER
fi
fi
+echo "Making images..."
if [ -x /usr/bin/runroot ]; then
- runroot $COMPNAME --onlyone --arch $BUILDARCH "cd $BUILDINSTDIR\; ./mk-images $p/RedHat/RPMS $p $p/image-template $BUILDARCH '\"$PRODUCTSTR\"' $VERSION"
+ runroot $COMPNAME --onlyone --arch $BUILDARCH "cd $BUILDINSTDIR\; ./mk-images $p/RedHat/RPMS $p $TREEDIR/image-template $TREEDIR/instimage $BUILDARCH '\"$PRODUCTSTR\"' $VERSION"
else
- $MK_IMAGES $p/RedHat/RPMS $p $p/image-template $BUILDARCH "$PRODUCTSTR" $VERSION
+ $MK_IMAGES $p/RedHat/RPMS $p $TREEDIR/image-template $TREEDIR/instimage $BUILDARCH "$PRODUCTSTR" $VERSION
fi
MK_STAMP=./makestamp.py
@@ -126,4 +132,8 @@ 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
-rm -rf $p/image-template $p/RedHat/instimage
+if [ -x /usr/bin/runroot ]; then
+ runroot $COMPNAME --onlyone --arch $BUILDARCH "rm -rf $TREEDIR/image-template $TREEDIR/instimage"
+else
+ rm -rf $TREEDIR/image-template $TREEDIR/instimage
+fi
diff --git a/scripts/mk-images b/scripts/mk-images
index 6fe22fc6a..963810fed 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -4,14 +4,14 @@ PATH=$PATH:/sbin:/usr/sbin
IMAGEUUID=$(date +%Y%m%d%H%M)
usage () {
- echo "usage: mk-images <pkgsrc> <toplevel> <template> <buildarch> <productname> <version>"
+ echo "usage: mk-images <pkgsrc> <toplevel> <template> <imgdir> <buildarch> <productname> <version>"
exit 0
}
-if [ -z "$1" -o -z "$2" -o -z "$3" -o -z "$4" -o -z "$5" -o -z "$6" ]; then usage; 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=$5
-VERSION=$6
+PRODUCT=$6
+VERSION=$7
TOPDIR=$(echo $0 | sed "s,/[^/]*$,,")
if [ $TOPDIR = $0 ]; then
@@ -23,15 +23,15 @@ TOPDIR=$(cd $TOPDIR; pwd)
# Set, verify, and create paths
KERNELPATH=$1
TOPDESTPATH=$2
- IMAGEPATH=$2/images
+ IMAGEPATH=$TOPDESTPATH/images
FULLMODPATH=/tmp/instimagemods.$$
- FINALFULLMODPATH=$2/RedHat/instimage/modules
- INSTIMGPATH=$2/RedHat/base
+ FINALFULLMODPATH=$4/modules
+ INSTIMGPATH=$TOPDESTPATH/RedHat/base
INSTIMGTEMPLATE=$3
- IMGPATH=$2/RedHat/instimage
+ IMGPATH=$4
KERNELROOT=/tmp/updboot.kernel.$$
MODDEPS=$KERNELROOT/moddeps
- BUILDARCH=$4
+ BUILDARCH=$5
if [ "$BUILDARCH" = "ppc" -o "$BUILDARCH" = "ppc64" ]; then
KERNELNAME=vmlinux
@@ -40,6 +40,12 @@ TOPDIR=$(cd $TOPDIR; pwd)
KERNELNAME=vmlinuz
KERNELARCH=$BUILDARCH
fi
+
+ if [ "$BUILDARCH" = "ia64" ]; then
+ KERNELDIR="/boot/efi/EFI/redhat"
+ else
+ KERNELDIR="/boot"
+ fi
if [ "$BUILDARCH" = "sparc64" ]; then
BASEARCH=sparc
@@ -113,11 +119,16 @@ TOPDIR=$(cd $TOPDIR; pwd)
if [ "$BUILDARCH" != "s390" -a "$BUILDARCH" != "s390x" ]; then
# go ahead and create the keymaps so we only have to do it once
- echo "Running: GETKEYMAPS $BUILDARCH $KEYMAPS $IMGPATH"
- $GETKEYMAPS $BUILDARCH $KEYMAPS $IMGPATH
- if [ $? != 0 ]; then
- echo "Unable to create keymaps and thus can't create initrd."
- exit 1
+ if [ -f $IMGPATH/usr/lib/anaconda-runtime/keymaps-override-$BUILDARCH ]; then
+ echo "Found keymap override, using it"
+ cp $IMGPATH/usr/lib/anaconda-runtime/keymaps-override-$BUILDARCH $KEYMAPS
+ else
+ echo "Running: GETKEYMAPS $BUILDARCH $KEYMAPS $IMGPATH"
+ $GETKEYMAPS $BUILDARCH $KEYMAPS $IMGPATH
+ if [ $? != 0 ]; then
+ echo "Unable to create keymaps and thus can't create initrd."
+ exit 1
+ fi
fi
fi
@@ -305,7 +316,10 @@ makemoduleball() {
pushd $MMB_DIR/modules > /dev/null
- find . -name '*.o.gz' |xargs gunzip
+ GZIPPED=$(find . -name '*.o.gz')
+ if [ -n "$GZIPPED" ]; then
+ echo $GZIPPED | xargs gunzip
+ fi
$MODLIST --modinfo-file $MODINFO --ignore-missing --modinfo \
$MMB_MODULESET > ../$MMB_MODINFO
@@ -366,6 +380,7 @@ makeinitrd() {
MODULEBALLNAME="modules.cgz"
MYLANGTABLE=$LANGTABLE
MYLOADERTR=loader.tr
+ BOGL=yes
while [ x$(echo $1 | cut -c1-2) = x"--" ]; do
if [ $1 = "--initrdto" ]; then
EXTRAINITRDPATH=$2
@@ -399,6 +414,10 @@ makeinitrd() {
MODULEBALLNAME=$2
shift; shift
continue
+ elif [ $1 = "--nobogl" ]; then
+ BOGL=""
+ shift
+ continue
fi
echo "Unknown option passed to makeinitrd"
exit 1
@@ -434,6 +453,7 @@ makeinitrd() {
mkdir -p $MBD_DIR/etc/terminfo/x
mkdir -p $MBD_DIR/etc/terminfo/v
mkdir -p $MBD_DIR/var/state
+ mkdir -p $MBD_DIR/var/run
ln -s /tmp $MBD_DIR/var/state/xkb
if [ "$BUILDARCH" = "ppc" -o "$BUILDARCH" = "ppc64" ]; then
@@ -466,7 +486,9 @@ EOF
mkdir -p $MBD_DIR/etc/terminfo/b
install -m 644 $IMGPATH/usr/share/terminfo/b/bterm $MBD_DIR/etc/terminfo/b/bterm
- install -m 644 $LOADERBINDIR/font.bgf.gz $MBD_DIR/etc
+ if [ -n "$BOGL" ]; then
+ install -m 644 $LOADERBINDIR/font.bgf.gz $MBD_DIR/etc
+ fi
if [ -n "$PCMCIA" ]; then
mkdir -p $MBD_BOOTTREE/etc
@@ -638,7 +660,7 @@ makebootdisk() {
if [ -n "$EXTRAKERNELPATH" ]; then
mkdir -p `dirname $EXTRAKERNELPATH`
- cp -f $KERNELROOT/boot/${KERNELNAME}-* $EXTRAKERNELPATH
+ cp -f $KERNELROOT/$KERNELDIR/${KERNELNAME}-* $EXTRAKERNELPATH
fi
mkdir -p `dirname $MBD_FILENAME`
@@ -698,7 +720,8 @@ makeinstimage () {
makeproductfile $tmpdir
echo "Running mkcramfs $CRAMBS $tmpdir $INSTIMGPATH/${imagename}2.img"
- mkcramfs $CRAMBS $tmpdir $INSTIMGPATH/${imagename}2.img
+ mkcramfs $CRAMBS $tmpdir /tmp/${imagename}2.img.$$
+ cp /tmp/${imagename}2.img.$$ $INSTIMGPATH/${imagename}2.img
size=$(ls -l $INSTIMGPATH/${imagename}2.img | awk '{print $5}')
size=$(expr $size / 1024)
echo "Wrote $INSTIMGPATH/${imagename}2.img (${size}k)..."
@@ -843,7 +866,7 @@ for kernelvers in $vertag; do
kpackage=$($LATEST $KERNELPATH kernel-$kernelvers)
mkdir -p $KERNELROOT/lib/modules/misc
if [ ! -f "$kpackage" ]; then
- echo 'kernel-$kernelvers does not exist -- using kernel package'
+ echo "kernel-$kernelvers does not exist -- using kernel package"
kpackage=$($LATEST $KERNELPATH kernel)
kernelvers=""
fi
@@ -866,8 +889,8 @@ for kernelvers in $vertag; do
usage
fi
- if [ ! -f "$KERNELROOT/boot/${KERNELNAME}-$version" ]; then
- echo "$KERNELROOT/boot/${KERNELNAME}-$version does not exist"
+ if [ ! -f "$KERNELROOT/$KERNELDIR/${KERNELNAME}-$version" ]; then
+ echo "$KERNELROOT/$KERNELDIR/${KERNELNAME}-$version does not exist"
usage
fi
@@ -877,7 +900,10 @@ for kernelvers in $vertag; do
PCMCIAMODULES=$((perl -e 'while (<>) { s/^.*class.*(network|scsi|ide).*module +"// || next; s/[" ]//g; s/,/\n/g; print }' $KERNELROOT/etc/pcmcia/config | sed 's/\.o//g') | sort -u)
fi
- find $KERNELROOT/lib/modules/$version -name "*.o.gz" |xargs gunzip
+ GZIPPED=$(find $KERNELROOT/lib/modules/$version -name "*.o.gz")
+ if [ -n "$GZIPPED" ]; then
+ echo $GZIPPED |xargs gunzip
+ fi
allmods=$(find $KERNELROOT/lib/modules/$version -name *.o)
rundepmod "$allmods" $MODDEPS
diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386
index e556c540a..e2e3993e1 100644
--- a/scripts/mk-images.i386
+++ b/scripts/mk-images.i386
@@ -25,11 +25,6 @@ prepareBootTree() {
cp $BOOTDISKDIR/splash.lss $MBD_BOOTTREE/splash.lss
rm -f $MBD_BOOTTREE/syslinux-splash.png
if [ -d $BOOTDISKDIR/$BOOTLANG ]; then
- # fb console and kon don't get along...
- if [ "$BOOTLANG" = "ja_JP" ]; then
- sed -e "s/ vga=[0-9]*//g" < $MBD_BOOTTREE/syslinux.cfg > $MBD_BOOTTREE/syslinux.cf2
- mv -f $MBD_BOOTTREE/syslinux.cf2 $MBD_BOOTTREE/syslinux.cfg
- fi
for file in $BOOTDISKDIR/$BOOTLANG/*.msg; do
filename=`basename $file`
sed -e "s/@VERSION@/$VERSION/g" $file > $MBD_BOOTTREE/$filename
@@ -151,7 +146,7 @@ PCMCIAMODULES="$PCMCIAMODULES yenta_socket i82365 tcic pcmcia_core ds"
makeBootImages() {
echo "Building $TOPDESTPATH/images/pxeboot/initrd.img"
makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd.img \
- --pcmcia \
+ --pcmcia --nobogl \
--initrdsize 4750 \
--loaderbin loader \
--modules "$COMMONMODULES"
diff --git a/scripts/mk-images.ia64 b/scripts/mk-images.ia64
index 3b6e31a92..b9ab64172 100644
--- a/scripts/mk-images.ia64
+++ b/scripts/mk-images.ia64
@@ -4,7 +4,7 @@ LATEUSBMODS="mousedev"
SECSTAGE="nfs fat vfat raid0 raid1 raid5 ext3 $LATEUSBMODS"
NETMODULES="3c59x acenic bcm5700 e100 e1000 eepro100 hamachi sk98lin starfire sunhme tulip yellowfin tg3"
-SCSIMODULES="sd_mod sr_mod scsi_mod DAC960 cciss cpqarray aic7xxx aic7xxx_mod megaraid qla1280 qla2200 qla2300 sym53c8xx sym53c8xx_2 mptscsih mptbase"
+SCSIMODULES="sd_mod sr_mod scsi_mod DAC960 cciss cpqarray aic7xxx aic7xxx_mod megaraid qla1280 qla2200 qla2300 sym53c8xx sym53c8xx_2 mptscsih mptbase ips"
IDEMODULES="ide-mod ide-probe-mod ide-disk ide-cd"
prepareBootImage() {
diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc
index 43b66ac0e..0844de063 100644
--- a/scripts/mk-images.ppc
+++ b/scripts/mk-images.ppc
@@ -1,3 +1,4 @@
+COMMONMODULES="nfs fat vfat cramfs loop"
FSMODS="msdos vfat ext3 reiserfs jfs"
IDEMODS="ide-cd"
SCSIMODS="sd_mod sr_mod st"
@@ -8,6 +9,7 @@ NETMODULES="sungem tg3 ne2k-pci 3c59x 8139too
de4x5 acenic pcnet32 tulip natsemi eepro100 airport"
SCSIMODULES="advansys aic7xxx initio sym53c8xx"
+ISERIESMODULES="veth viodasd viocd"
# images we only want on the CD (usually for space reasons)
ISOMODULES="ehci-hcd ieee1394 ohci1394 sbp2"
@@ -25,22 +27,25 @@ makeBootImages() {
makeinitrd --initrdto $TOPDESTPATH/ppc/chrp/ramdisk.image.gz \
--initrdsize 8192 \
--loaderbin loader \
- --modules "nfs fat vfat cramfs $NETMODULES $SCSIMODULES $IDEMODULES $ISOMODULES"
+ --modules "$COMMONMODULES $NETMODULES $SCSIMODULES $IDEMODULES $ISOMODULES"
mkdir -p $TOPDESTPATH/etc $TOPDESTPATH/ppc/chrp
cp $KERNELROOT/boot/vmlinux-*pseries* $TOPDESTPATH/ppc/chrp/vmlinux
cp $BOOTDISKDIR/yaboot.conf $TOPDESTPATH/etc/yaboot.conf
cp $BOOTDISKDIR/bootinfo.txt $TOPDESTPATH/ppc/bootinfo.txt
cp $IMGPATH/usr/lib/yaboot/yaboot $TOPDESTPATH/ppc/chrp
+ $IMGPATH/usr/lib/yaboot/addnote $TOPDESTPATH/ppc/chrp/yaboot
# we also want to make a boot.iso here
mkdir -p $TOPDESTPATH/isopath/ppc/chrp $TOPDESTPATH/isopath/etc
cp $TOPDESTPATH/etc/* $TOPDESTPATH/isopath/etc/
cp $TOPDESTPATH/ppc/chrp/* $TOPDESTPATH/isopath/ppc/chrp
+ cp $TOPDESTPATH/ppc/bootinfo.txt $TOPDESTPATH/isopath/ppc/bootinfo.txt
- # FIXME: still need the magic boot_image file
- # mkisofs -generic-boot $TOPDESTPATH/isopath/boot_image -V "PBOOT" -J -R -v -T -allow-multidot -l -o $TOPDESTPATH/images/boot.iso $TOPDESTPATH/isopath
- # rm -rf $TOPDESTPATH/isopath/
+ # 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
+ rm -rf $TOPDESTPATH/isopath/
elif [ "$kernelvers" = "iseries" ]; then
mkdir -p $TOPDESTPATH/ppc/iSeries
@@ -48,7 +53,7 @@ makeBootImages() {
makeinitrd --initrdto $TOPDESTPATH/ppc/iSeries/ramdisk.image.gz \
--initrdsize 8192 \
--loaderbin loader \
- --modules "nfs fat vfat cramfs veth $NETMODULES $SCSIMODULES $IDEMODULES $ISOMODULES"
+ --modules "$COMMONMODULES $NETMODULES $SCSIMODULES $IDEMODULES $ISOMODULES $ISERIESMODULES"
cp $KERNELROOT/boot/vmlinux-*iseries* $TOPDESTPATH/ppc/iSeries/vmlinux
cp $KERNELROOT/boot/System.map-*iseries* $TOPDESTPATH/ppc/iSeries/System.map
diff --git a/scripts/mk-images.s390 b/scripts/mk-images.s390
index 772e8d571..9bada5f3e 100644
--- a/scripts/mk-images.s390
+++ b/scripts/mk-images.s390
@@ -108,6 +108,7 @@ makeS390initrd() {
mkdir -p $MBD_DIR/proc
mkdir -p $MBD_DIR/tmp
mkdir -p $MBD_DIR/etc/terminfo/{a,d,k,l,s,v,x}
+ mkdir -p $MBD_DIR/var/run
mkdir -p $MBD_DIR/var/state
mkdir -p $MBD_DIR/var/empty/sshd
mkdir -p $MBD_DIR/etc/{pam.d,security}
@@ -120,7 +121,8 @@ makeS390initrd() {
fi
cat > $MBD_DIR/etc/passwd << EOF
-root::0:0:root:/:/bin/bash
+root::0:0:root:/:/sbin/loader
+debug::0:0:debug shell:/:/bin/bash
sshd:x:74:74:Privilege-separated SSH:/var/empty/sshd:/sbin/nologin
EOF
echo "sshd:x:74:" >> $MBD_DIR/etc/group
@@ -130,13 +132,11 @@ EOF
pam_limits.so; do
cp -f $IMGPATH/$LIBDIR/security/$i $MBD_DIR/$LIBDIR/security
done
- cp -f $IMGPATH/$LIBDIR/libpam_misc.so* $IMGPATH/$LIBDIR/libpam.so* $MBD_DIR/$LIBDIR
for i in sshd other; do
cp -f $IMGPATH/etc/pam.d/$i $MBD_DIR/etc/pam.d
done
cat > $MBD_DIR/etc/pam.d/login << EOF
#%PAM-1.0
-auth required pam_securetty.so
auth required pam_stack.so service=system-auth
auth required pam_nologin.so
account required pam_stack.so service=system-auth
@@ -274,6 +274,7 @@ RhostsAuthentication no
RSAAuthentication yes
PasswordAuthentication yes
PermitEmptyPasswords yes
+PermitUserEnvironment yes
EOF
chmod 600 $MBD_DIR/etc/ssh/sshd_config
@@ -283,6 +284,7 @@ EOF
echo "telnet 23/tcp" > $MBD_DIR/etc/services
echo "tcp 6 TCP" > $MBD_DIR/etc/protocols
cp -df $IMGPATH/$LIBDIR/libpam.so* $MBD_DIR/$LIBDIR
+ cp -df $IMGPATH/$LIBDIR/libpam_misc.so* $MBD_DIR/$LIBDIR
cp -df $IMGPATH/$LIBDIR/libdl.so* $MBD_DIR/$LIBDIR
cp -df $IMGPATH/$LIBDIR/libdl-*.so* $MBD_DIR/$LIBDIR
cp -df $IMGPATH/$LIBDIR/libnsl.so* $MBD_DIR/$LIBDIR
diff --git a/scripts/mk-images.x86_64 b/scripts/mk-images.x86_64
index 28f2548a9..dd8571acd 100644
--- a/scripts/mk-images.x86_64
+++ b/scripts/mk-images.x86_64
@@ -85,7 +85,7 @@ mkdir -p $TOPDESTPATH/images/pxeboot
makeBootImages() {
echo "Building initrd-everything.img"
- makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd-everything.img \
+ makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd.img \
--pcmcia \
--initrdsize 8192 \
--loaderbin loader \
@@ -95,7 +95,7 @@ makeBootImages() {
if [ -f $IMGPATH/usr/lib/syslinux/isolinux.bin ]; then
echo "Building isolinux directory"
MBD_BOOTTREE=$TOPDESTPATH/isolinux
- MBD_FSIMAGE=$TOPDESTPATH/images/pxeboot/initrd-everything.img
+ MBD_FSIMAGE=$TOPDESTPATH/images/pxeboot/initrd.img
mkdir $MBD_BOOTTREE
cp $IMGPATH/usr/lib/syslinux/isolinux.bin $MBD_BOOTTREE/isolinux.bin
@@ -107,6 +107,9 @@ makeBootImages() {
echo "No isolinux binaries. Skipping isolinux creation"
fi
+ # symlink the kernel for pxe dir
+ ln $TOPDESTPATH/isolinux/vmlinuz $TOPDESTPATH/images/pxeboot/vmlinuz
+
# now make a boot iso
mkdir -p $TOPDESTPATH/images/isopath
cp -rl $TOPDESTPATH/isolinux $TOPDESTPATH/images/isopath
diff --git a/scripts/pkgorder b/scripts/pkgorder
index d122e6f35..85e72cd1c 100755
--- a/scripts/pkgorder
+++ b/scripts/pkgorder
@@ -77,6 +77,12 @@ except rpm.error:
comps = comps.ComponentSet("file://%s/RedHat/base/comps.xml" %(distDir,),
hdlist, arch = arch, matchAllLang = 0)
+# FIXME: HACK SO THAT PPC TREES WILL SPLIT. MUST BE REMOVED
+# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+import iutil
+if iutil.getArch() == "ppc" and hdlist.packages.has_key("kernel"):
+ del hdlist.packages["kernel"]
+
# work out the order we'd like to install everything in
pkgOrder = []
pkgHash = {}
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 4569487e9..16217307b 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -307,6 +307,7 @@ usr/lib/anaconda-runtime/*
usr/lib/anaconda/*
usr/lib/anaconda/installclasses/*
usr/lib/anaconda/textw/*
+usr/$LIBDIR/bogl/font.bgf.gz
usr/lib/booty/*
usr/kerberos/$LIBDIR/libkrb5.so*
usr/kerberos/$LIBDIR/libk5crypto.so*
@@ -479,7 +480,6 @@ etc/man.config
etc/pango/*
etc/fonts/*
$LIBDIR/libnss_dns*
-$LIBDIR/libnss_nis*
$LIBDIR/libpam*
$LIBDIR/libproc*
sbin/addRamDisk
generated by cgit (git 2.34.1) at 2025-02-23 21:28:12 +0000