diff options
| author | Erwan Velu <erwan@mandriva.org> | 2003-03-05 17:44:13 +0000 |
|---|---|---|
| committer | Erwan Velu <erwan@mandriva.org> | 2003-03-05 17:44:13 +0000 |
| commit | 2afc639a2eabb0bd3990966d309ade84912bac4f (patch) | |
| tree | c799dc646245b18a081f438cd9ec1d38c6d8d470 | |
| parent | 78198e1f77503b01f104ae1b71232f42e6a22a24 (diff) | |
| download | drakx-backup-do-not-use-2afc639a2eabb0bd3990966d309ade84912bac4f.tar drakx-backup-do-not-use-2afc639a2eabb0bd3990966d309ade84912bac4f.tar.gz drakx-backup-do-not-use-2afc639a2eabb0bd3990966d309ade84912bac4f.tar.bz2 drakx-backup-do-not-use-2afc639a2eabb0bd3990966d309ade84912bac4f.tar.xz drakx-backup-do-not-use-2afc639a2eabb0bd3990966d309ade84912bac4f.zip | |
IA64 merge
| -rw-r--r-- | kernel/list_modules.pm | 11 | ||||
| -rwxr-xr-x | kernel/update_kernel | 24 |
2 files changed, 24 insertions, 11 deletions
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm index e3a3138cf..8d178896b 100644 --- a/kernel/list_modules.pm +++ b/kernel/list_modules.pm @@ -27,7 +27,7 @@ our %l = ( qw(sb1000 sis900 sk98lin smc-ultra smc9194 starfire tg3 tlan tmspci tulip via-rhine), #sktr qw(wd winbond-840 yellowfin ns83820), - qw(iph5526), #- fibre channel + qw(iph5526), ), qw(3c59x 8139too sundance dl2k), #rtl8139 ], @@ -62,8 +62,7 @@ our %l = ( qw(eata eata_pio eata_dma), ), '53c7,8xx', - qw(aic7xxx pci2000 qlogicisp sym53c8xx), # ncr53c8xx - if_(arch() =~ /x86_64/, qw(mptbase mptscsih)) + qw(aic7xxx pci2000 qlogicisp sym53c8xx mptscsih mptbase), # ncr53c8xx ], hardware_raid => [ if_(arch() =~ /^sparc/, qw(pluto)), @@ -144,15 +143,15 @@ our %l = ( qw(busmouse msbusmouse logibusmouse serial qpmouse atixlmouse), ], char => [ - qw(amd768_rng applicom n_r3964 nvram pc110pad ppdev), - qw(mxser moxa isicom wdt_pci epca synclink istallion sonypi i810-tco sx), #- what are these??? + qw(amd768_rng applicom n_r3964 nvram pc110pad ppdev efivars), + qw(mxser moxa isicom wdt_pci epca synclink istallion sonypi i810-tco sx), ], other => [ qw(agpgart defxx i810_rng i810fb ide-floppy ide-scsi ide-tape loop lp nbd sg st), qw(parport parport_pc parport_serial), qw(btaudio), - #- these need checking + qw(pcilynx sktr rrunner gmac meye 3c559 buz paep), ], }, diff --git a/kernel/update_kernel b/kernel/update_kernel index 5d815783d..faa298f69 100755 --- a/kernel/update_kernel +++ b/kernel/update_kernel @@ -1,6 +1,7 @@ #!/bin/bash ALL_KERNELS="all.kernels" +RPMS=/RPMS # move stuff to this new "kernel" directory if [ ! -d all.kernels ]; then @@ -43,13 +44,23 @@ function create_modules() { [ -e $ALL_KERNELS/.main ] && main=$(cat $ALL_KERNELS/.main) -rpm=$(rpm -qp --qf '%{name}' /RPMS/kernel-BOOT-*.rpm | perl -pe 's/kernel-BOOT-((\.?[0-9]+){3})\.(.*)/$1-${3}BOOT/') +ARCH=`uname -m | sed -e 's/i.86/i386/' -e 's/sparc.*/sparc/'` + +if [ "$ARCH" == "ia64" ] || [ "$ARCH" == "ppc" ]; then + rpm=$(rpm -qp --qf '%{name}' $RPMS/kernel-smp-*.rpm | perl -pe 's/kernel-smp-((\.?[0-9]+){3})\.(.*)/$1-${3}smp/') +else + rpm=$(rpm -qp --qf '%{name}' $RPMS/kernel-BOOT-*.rpm | perl -pe 's/kernel-BOOT-((\.?[0-9]+){3})\.(.*)/$1-${3}BOOT/') +fi if [ -n "$rpm" -a ! -e $ALL_KERNELS/$rpm ]; then [ -n "$main" ] && rm -rf $ALL_KERNELS/$main cd $ALL_KERNELS rm -rf $rpm ; mkdir $rpm cd $rpm - rpm2cpio /RPMS/kernel-BOOT-*.rpm | cpio -id + if [ "$ARCH" == "ia64" ] || [ "$ARCH" == "ppc" ]; then + rpm2cpio $RPMS/kernel-2*.rpm | cpio -id + else + rpm2cpio $RPMS/kernel-BOOT-*.rpm | cpio -id + fi find -type f -name "*.o.gz" | xargs gunzip cd ../.. @@ -66,7 +77,6 @@ fi cd .. } -ARCH=`uname -m | sed -e 's/i.86/i386/' -e 's/sparc.*/sparc/'` eval `perl modules.pl images` @@ -78,8 +88,12 @@ if [ "$ARCH" == "i386" ]; then else if [ "$ARCH" == "ppc" ]; then cp -f "$KERNEL_BOOT_PATH"/boot/vmlinux . - else - cp -f "$KERNEL_BOOT_PATH"/boot/vmlinux.gz . +else + if [ "$ARCH" == "ia64" ]; then + cp -f "$KERNEL_BOOT_PATH"/boot/efi/vmlinuz* . +else + cp -f "$KERNEL_BOOT_PATH"/boot/vmlinuz* . + fi fi fi |