diff options
| author | Matt Wilson <msw@redhat.com> | 2000-06-14 03:40:40 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 2000-06-14 03:40:40 +0000 |
| commit | 322a73e5c14be4628efdf0c63e8b55d7d61b911e (patch) | |
| tree | b33f2b75ce37b8ec5e534a882894564ebb490267 | |
| parent | 6bb2f40fa779ee70f65e480a22c719660a68c96c (diff) | |
| download | anaconda-322a73e5c14be4628efdf0c63e8b55d7d61b911e.tar.gz anaconda-322a73e5c14be4628efdf0c63e8b55d7d61b911e.tar.xz anaconda-322a73e5c14be4628efdf0c63e8b55d7d61b911e.zip | |
some more tweaks for sparc
| -rwxr-xr-x | scripts/mk-images | 12 | ||||
| -rw-r--r-- | scripts/mk-images.sparc64 | 6 | ||||
| -rw-r--r-- | scripts/pythondeps | 2 |
3 files changed, 13 insertions, 7 deletions
diff --git a/scripts/mk-images b/scripts/mk-images index 7f1122a80..13adf3b93 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -27,6 +27,12 @@ TOPDIR=$(cd $TOPDIR; pwd) KERNELROOT=/tmp/updboot.kernel.$$ MODDEPS=$KERNELROOT/moddeps BUILDARCH=$4 + + if [ $BUILDARCH = "sparc64" ]; + BASEARCH=sparc + else + BASEARCH=$BUILDARCH + fi if [ ! -d "$1" ]; then LATEST=latest --arch $BUILDARCH @@ -44,8 +50,8 @@ TOPDIR=$(cd $TOPDIR; pwd) # Stuff that we need TRIMPCITABLE=$IMGPATH/usr/lib/anaconda-runtime/trimpcitable - KEYMAPS=$IMGPATH/usr/lib/anaconda-runtime/keymaps-${BUILDARCH} - FONTS=$IMGPATH/usr/lib/anaconda-runtime/fonts-${BUILDARCH} + KEYMAPS=$IMGPATH/usr/lib/anaconda-runtime/keymaps-${BASEARCH} + FONTS=$IMGPATH/usr/lib/anaconda-runtime/fonts-${BASEARCH} GETMODDEPS=$IMGPATH/usr/lib/anaconda-runtime/moddeps MODLIST=$IMGPATH/usr/lib/anaconda-runtime/modlist MODINFO=$IMGPATH/usr/lib/anaconda-runtime/loader/module-info @@ -84,7 +90,7 @@ findPackage() { name=$2 for n in $dir/$name*; do - thisName=$(rpm --qf '%{NAME}' -qp $n) + thisName=$(rpm --qf '%{NAME}' -qp $n.{${BUILDARCH},noarch}.rpm) if [ -z "$thisName" ]; then return fi diff --git a/scripts/mk-images.sparc64 b/scripts/mk-images.sparc64 index c8834a339..21a95a552 100644 --- a/scripts/mk-images.sparc64 +++ b/scripts/mk-images.sparc64 @@ -57,9 +57,9 @@ elf2aout -o $TOPDESTPATH/kernels/vmlinux64 $KERNELROOT/boot/vmlinux-* gzip -9 $TOPDESTPATH/kernels/vmlinux64 makekinitrd --initrdto $TOPDESTPATH/boot/initrd64.img \ - --initrdsize 2000 \ - --loaderbin loader \ - --modules "=scsi =net" + --initrdsize 2000 \ + --loaderbin loader \ + --modules "=scsi =net" maketftp --kernel $TOPDESTPATH/kernels/vmlinux64.gz \ --imagename $TOPDESTPATH/boot/tftp64.img \ diff --git a/scripts/pythondeps b/scripts/pythondeps index e6c12b6a5..a28d77a2c 100644 --- a/scripts/pythondeps +++ b/scripts/pythondeps @@ -12,7 +12,7 @@ ARCH=`uname -m | sed -e 's/i.86/i386/'` mkdir -p $DIR/proc mount -t proc /proc $DIR/proc -if [ $ARCH = "sparc" ]; then +if [ $ARCH = "sparc" -o $ARCH = "sparc64" ]; then mkdir $DIR/dev mknod $DIR/dev/openprom c 10 139 fi |