diff options
-rw-r--r-- | isys/stubs.h | 1 | ||||
-rw-r--r-- | loader/Makefile | 16 | ||||
-rw-r--r-- | loader/lang.c | 2 | ||||
-rw-r--r-- | loader/loader.c | 6 | ||||
-rw-r--r-- | loader/loader.h | 2 | ||||
-rw-r--r-- | loader/md5.c | 2 | ||||
-rw-r--r-- | loader/module-info | 4 | ||||
-rw-r--r-- | loader/modules.c | 1 | ||||
-rw-r--r-- | packages.py | 2 | ||||
-rw-r--r-- | scripts/mk-images.ia64 | 21 | ||||
-rwxr-xr-x | scripts/upd-instroot | 8 | ||||
-rw-r--r-- | xf86config.py | 6 |
12 files changed, 49 insertions, 22 deletions
diff --git a/isys/stubs.h b/isys/stubs.h index b7da85226..040a376ce 100644 --- a/isys/stubs.h +++ b/isys/stubs.h @@ -14,6 +14,7 @@ #define gunzip_close gzclose #define gunzip_read gzread #define gzip_write gzwrite +#define gzip_open(x, y, z) gzopen(x, "w") #else #include "gzlib/gzlib.h" diff --git a/loader/Makefile b/loader/Makefile index d74723dc6..7cdcf9bce 100644 --- a/loader/Makefile +++ b/loader/Makefile @@ -28,12 +28,17 @@ MODULELINKAGE :=-lmodutils -lmodutilutil -lmodutilobj COPTS = $(DEBUG) -Wall -DVERSION='"$(VERSION)"' -CFLAGS = $(COPTS) $(OPTS) -ffunction-sections -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64 -I/usr/include/kudzu -I/usr/include/rpm -I.. -DHAVE_LIBIO_H -DPRODUCTNAME='$(PRODUCTNAME)' -DGZLIB=1 +CFLAGS = $(COPTS) $(OPTS) -ffunction-sections -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64 -I/usr/include/kudzu -I/usr/include/rpm -I.. -I../isys -DHAVE_LIBIO_H -DPRODUCTNAME='$(PRODUCTNAME)' + +# XXX diet is i386 only at the moment +ifeq (i386, $(ARCH)) +CFLAGS += -DGZLIB=1 +endif ALLOBJS = $(OBJS) $(PCMCIAOBJS) ISYS = ../isys/libisys.a -GUNZIP = ../isys/gzlib/libgunzip.a +GUNZIP = -lz LOADERLIBS = -lpci # XXX Japanese is i386 only at the moment @@ -95,6 +100,7 @@ REALCC=gcc CC=$(DIET) $(REALCC) STATIC=-static else +REALCC=$(CC) ifeq (sparc, $(ARCH)) MINILIBC=minilibc.o /usr/lib/libc.a CFLAGS+=-DUSE_MINILIBC=1 -DUSE_LOGDEV @@ -148,13 +154,13 @@ loader: loader.o $(OBJS) $(NETOBJS) $(CC) -g $(STATIC) -o $@ $^ -lpopt \ -lkudzu_loader $(ISYS) ../balkan/libbalkan.a \ $(MODULELINKAGE) $(GUNZIP) \ - -lpump -lz $(NEWTLIB) $(SLANGLIB) $(LOADERLIBS) $(KONOBJS) + -lpump $(NEWTLIB) $(SLANGLIB) $(LOADERLIBS) $(KONOBJS) loader-local: loader-local.o $(OBJS) $(CC) -g $(STATIC) -o $@ $^ -lpopt \ -lkudzu_loader $(ISYS) ../balkan/libbalkan.a \ $(MODULELINKAGE) $(GUNZIP) \ - -L ../stubs -lz $(NEWTLIB) $(SLANGLIB) $(LOADERLIBS) $(KONOBJS) + -L ../stubs $(NEWTLIB) $(SLANGLIB) $(LOADERLIBS) $(KONOBJS) loader-network: loader-net.o $(OBJS) $(NETOBJS) $(CC) -g $(STATIC) -o $@ $^ -lpopt \ @@ -168,7 +174,7 @@ loader-pcmcia: loader-pcmcia.o pcmcia.o popen.o $(OBJS) $(PCMCIAOBJS) -lpopt \ -lkudzu_loader $(ISYS) ../balkan/libbalkan.a \ $(MODULELINKAGE) $(GUNZIP) \ - -lpump -lz -lresolv $(NEWTLIB) $(SLANGLIB) $(LOADERLIBS) $(KONOBJS) + -lpump -lresolv $(NEWTLIB) $(SLANGLIB) $(LOADERLIBS) $(KONOBJS) loader.o: loader.c $(CC) -DINCLUDE_LOCAL -DINCLUDE_NETWORK $(CFLAGS) -o $@ -c $< diff --git a/loader/lang.c b/loader/lang.c index 98d6ed189..1c979d6d0 100644 --- a/loader/lang.c +++ b/loader/lang.c @@ -21,7 +21,7 @@ #include "log.h" #include "misc.h" #include "windows.h" -#include "isys/gzlib/gzlib.h" +#include "stubs.h" #include "kickstart.h" #define errorWindow(String) \ diff --git a/loader/loader.c b/loader/loader.c index f66eea9ce..8c796ca30 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -65,7 +65,7 @@ #include "isys/imount.h" #include "isys/isys.h" #include "isys/probe.h" -#include "isys/gzlib/gzlib.h" +#include "stubs.h" #include "cdrom.h" #include "devices.h" @@ -144,9 +144,11 @@ static struct installMethod installMethods[] = { { "FTP", 1, CLASS_NETWORK, mountUrlImage }, { "HTTP", 1, CLASS_NETWORK, mountUrlImage }, #endif +#if !defined(__ia64__) #if defined(INCLUDE_LOCAL) { N_("Hard drive"), 0, CLASS_HD, mountHardDrive }, #endif +#endif }; static int numMethods = sizeof(installMethods) / sizeof(struct installMethod); @@ -1976,7 +1978,7 @@ static char * doMountImage(char * location, #if defined(__alpha__) || defined(__ia64__) \ || defined(__s390__ ) || defined(__s390x__) - for (i = ; i < numMethods; i++) { + for (i = 0; i < numMethods; i++) { installNames[numValidMethods] = _(installMethods[i].name); validMethods[numValidMethods++] = i; } diff --git a/loader/loader.h b/loader/loader.h index 88836603d..aa97da452 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -1,3 +1,5 @@ +#include "stubs.h" + #define LOADER_OK 0 #define LOADER_BACK 1 #define LOADER_NOOP 2 diff --git a/loader/md5.c b/loader/md5.c index fe032ebba..559298b6c 100644 --- a/loader/md5.c +++ b/loader/md5.c @@ -43,6 +43,8 @@ static void byteReverse(unsigned char *buf, unsigned longs) #endif #endif +void MD5_Transform(uint32 buf[4], uint32 const in[16]); + /* * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious * initialization constants. diff --git a/loader/module-info b/loader/module-info index 2e70167c1..a2f7b9a29 100644 --- a/loader/module-info +++ b/loader/module-info @@ -750,6 +750,10 @@ sym53c8xx scsi_hostadapter "Symbios 53C896" +sym53c8xx_2 + scsi_hostadapter + "Alternate Symbios 53C896 Driver" + tmscsim scsi_hostadapter "Tekram DC-390(T) PCI" diff --git a/loader/modules.c b/loader/modules.c index acd1b811e..ccacfe574 100644 --- a/loader/modules.c +++ b/loader/modules.c @@ -24,6 +24,7 @@ #include "moduledeps.h" #include "devices.h" #include "windows.h" +#include "stubs.h" static int ethCount(void); static int scsiCount(void); diff --git a/packages.py b/packages.py index ad1af24f4..6b49af316 100644 --- a/packages.py +++ b/packages.py @@ -1090,7 +1090,7 @@ def copyExtraModules(instPath, comps, extraModules): def recreateInitrd (kernelTag, instRoot): log("recreating initrd for %s" % (kernelTag,)) if iutil.getArch() == 'ia64': - initrd = "/boot/efi/initrd-%s.img" % (kernelTag, ) + initrd = "/boot/efi/EFI/redhat/initrd-%s.img" % (kernelTag, ) else: initrd = "/boot/initrd-%s.img" % (kernelTag, ) diff --git a/scripts/mk-images.ia64 b/scripts/mk-images.ia64 index 6b2131060..aa7b104aa 100644 --- a/scripts/mk-images.ia64 +++ b/scripts/mk-images.ia64 @@ -1,21 +1,23 @@ # LATEUSBMODS go in the second stage -USBMODS="usb-uhci hid keybdev" +USBMODS="usb-uhci usb-ohci hid keybdev" LATEUSBMODS="mousedev" SECSTAGE="nfs fat vfat raid0 raid1 raid5 ext3 $LATEUSBMODS" -NETMODULES="3c59x acenic bcm5700 e100 e1000 eepro100 hamachi sk98lin starfire sunhme tulip yellowfin" -SCSIMODULES="DAC960 cciss cpqarray aic7xxx aic7xxx_mod megaraid qla1280 qla2x00 qla2200 qla2300 sym53c8xx" +NETMODULES="3c59x acenic bcm5700 e100 e1000 eepro100 hamachi sk98lin starfire sunhme tulip yellowfin tg3" +SCSIMODULES="DAC960 cciss cpqarray aic7xxx aic7xxx_mod megaraid qla1280 qla2200 qla2300 sym53c8xx sym53c8xx_2 mptscsih mptbase" IDEMODULES="ide-mod ide-probe-mod ide-disk ide-cd" prepareBootImage() { dd if=/dev/zero bs=1k count=$BOOTDISKSIZE of=$MBD_TMPIMAGE 2>/dev/null mkdosfs -C $MBD_TMPIMAGE $BOOTDISKSIZE >/dev/null mount -o loop -t vfat $MBD_TMPIMAGE $MBD_BOOTTREE - cp $MBD_FSIMAGE $MBD_BOOTTREE/initrd.img + mkdir -p $MBD_BOOTTREE/EFI/boot + cp $MBD_FSIMAGE $MBD_BOOTTREE/EFI/boot/initrd.img - cp -a $BOOTDISKDIR/* $MBD_BOOTTREE/ - cp $KERNELROOT/boot/efi/vmlinuz-* $MBD_BOOTTREE/vmlinuz - cat > $MBD_BOOTTREE/elilo.conf << EOF + cp -a $BOOTDISKDIR/* $MBD_BOOTTREE/EFI/boot/ + cp $KERNELROOT/boot/efi/EFI/redhat/vmlinuz-* $MBD_BOOTTREE/EFI/boot/vmlinuz + cp $MBD_BOOTTREE/EFI/boot/elilo.efi $MBD_BOOTTREE/EFI/boot/bootia64.efi + cat > $MBD_BOOTTREE/EFI/boot/elilo.conf << EOF prompt timeout=50 @@ -25,11 +27,14 @@ image=vmlinuz append="ramdisk_size=12288 maxcpus=1" initrd=initrd.img EOF + + # make a copy in the root of the image + cp $MBD_BOOTTREE/EFI/boot/* $MBD_BOOTTREE/ } makebootdisk --kernelto $TOPDESTPATH/kernels/vmlinuz \ --imagename boot.img \ - --bootdisksize 10240 \ + --bootdisksize 20480 \ --initrdflags '--initrdto $TOPDESTPATH/images/ramdisk.img \ --initrdsize 8192 \ --loaderbin loader \ diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 433291395..09f6d898e 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -175,8 +175,7 @@ fi KEEPFILE=/tmp/keepfile.$$ cat > $KEEPFILE <<EOF -boot/efi/elilo.efi -boot/efi/efi/boot/bootia64.efi +boot/efi/EFI/redhat/elilo.efi bin/ash bin/fdisk* bin/mkfs* @@ -401,8 +400,7 @@ fi KEEPFILEGR=/tmp/keepfilegr.$$ cp $KEEPFILE $KEEPFILEGR cat >> $KEEPFILEGR <<EOF -boot/efi/elilo.efi -boot/efi/efi/boot/bootia64.efi +boot/efi/EFI/redhat/elilo.efi bin/bash bin/cat bin/chmod @@ -812,7 +810,7 @@ for p in $DEST $DESTGR; do # copy bootloader files for ia64 if [ $ARCH = ia64 -a $p = $DESTGR ]; then mkdir -p $p/usr/lib/anaconda-runtime/boot - cp -af $p/boot/efi/* $p/usr/lib/anaconda-runtime/boot + cp -af $p/boot/efi/EFI/redhat//* $p/usr/lib/anaconda-runtime/boot fi rm -rf $p/boot $p/home $p/root $p/tmp diff --git a/xf86config.py b/xf86config.py index 2377df355..05f53a12f 100644 --- a/xf86config.py +++ b/xf86config.py @@ -640,6 +640,12 @@ class XF86Config: # see if 16 bpp is available, and if it should be the # default depth + # HACK: if we have nodri in the Cards file, let's make sure it + # really gets disabled since all of the drivers in X don't + # seem to listen :( + if string.find(cardoptions, 'Option "nodri"') != -1: + data["driMod"] = '\n#\tLoad "dri"', + if self.keyboard["variant"]: data["enableVariant"] = "" if self.keyboard["options"]: |