Start to add armel support.
This commit is contained in:
Santiago Garcia Mantinan
parent
f91df1f669
commit
c580e320e8
|
|
@ -19,6 +19,9 @@ debian-cd (3.0.5) UNRELEASED; urgency=low
|
|||
* Add support for a split syslinux.cfg file, which will later be provided
|
||||
to support the syslinux vesa menu.
|
||||
|
||||
[ Santiago Garcia ]
|
||||
* Start to add armel support.
|
||||
|
||||
-- Frans Pop <fjp@debian.org> Fri, 11 Apr 2008 20:18:10 +0200
|
||||
|
||||
debian-cd (3.0.4) unstable; urgency=low
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
*
|
||||
* DO NOT EDIT THIS FILE, edit the above script
|
||||
*
|
||||
* Last update: Sun Apr 20 11:27:15 CEST 2008
|
||||
* Last update: Sun May 4 11:54:40 CEST 2008
|
||||
*/
|
||||
|
||||
#include <debian-installer-lenny>
|
||||
|
|
@ -184,6 +184,20 @@ linux-image-2.6-rpc
|
|||
linux-image-2.6-s3c2410
|
||||
#endif
|
||||
|
||||
#ifdef ARCH_armel
|
||||
initramfs-tools
|
||||
busybox
|
||||
discover1
|
||||
libdiscover1
|
||||
slugimage
|
||||
flash-kernel
|
||||
nslu2-utils
|
||||
apex-nslu2
|
||||
linux-image-2.6-iop32x
|
||||
linux-image-2.6-ixp4xx
|
||||
linux-image-2.6-versatile
|
||||
#endif
|
||||
|
||||
#ifdef ARCH_sparc
|
||||
initramfs-tools
|
||||
busybox
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
*
|
||||
* DO NOT EDIT THIS FILE, edit the above script
|
||||
*
|
||||
* Last update: Sun Apr 20 11:33:00 CEST 2008
|
||||
* Last update: Sun May 4 12:03:07 CEST 2008
|
||||
*/
|
||||
|
||||
#include <debian-installer-sid>
|
||||
|
|
@ -184,6 +184,20 @@ linux-image-2.6-rpc
|
|||
linux-image-2.6-s3c2410
|
||||
#endif
|
||||
|
||||
#ifdef ARCH_armel
|
||||
initramfs-tools
|
||||
busybox
|
||||
discover1
|
||||
libdiscover1
|
||||
slugimage
|
||||
flash-kernel
|
||||
nslu2-utils
|
||||
apex-nslu2
|
||||
linux-image-2.6-iop32x
|
||||
linux-image-2.6-ixp4xx
|
||||
linux-image-2.6-versatile
|
||||
#endif
|
||||
|
||||
#ifdef ARCH_sparc
|
||||
initramfs-tools
|
||||
busybox
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*
|
||||
* DO NOT EDIT THIS FILE, edit the above script
|
||||
*
|
||||
* Last update: Sun Apr 20 11:27:13 CEST 2008
|
||||
* Last update: Sun May 4 11:54:38 CEST 2008
|
||||
*/
|
||||
#ifdef ARCH_alpha
|
||||
aboot-installer
|
||||
|
|
@ -361,6 +361,137 @@ wireless-tools-udeb
|
|||
xfsprogs-udeb
|
||||
zlib1g-udeb
|
||||
#endif /* ARCH_arm */
|
||||
#ifdef ARCH_armel
|
||||
apt-cdrom-setup
|
||||
apt-mirror-setup
|
||||
apt-setup-udeb
|
||||
archdetect
|
||||
base-installer
|
||||
beep-udeb
|
||||
bootstrap-base
|
||||
bterm-unifont
|
||||
cdebconf-newt-entropy
|
||||
cfdisk-udeb
|
||||
choose-mirror
|
||||
choose-mirror-bin
|
||||
clock-setup
|
||||
console-keymaps-acorn
|
||||
console-keymaps-amiga
|
||||
console-keymaps-at
|
||||
console-keymaps-atari
|
||||
console-keymaps-dec
|
||||
console-keymaps-mac
|
||||
console-keymaps-sun
|
||||
console-keymaps-usb
|
||||
console-setup-amiga-ekmap
|
||||
console-setup-ataritt-ekmap
|
||||
console-setup-macintoshold-ekmap
|
||||
console-setup-pc-ekmap
|
||||
console-setup-sun4-ekmap
|
||||
console-setup-sun5-ekmap
|
||||
console-setup-udeb
|
||||
cryptsetup-udeb
|
||||
debian-archive-keyring-udeb
|
||||
debootstrap-udeb
|
||||
devio-udeb
|
||||
dhcp3-client-udeb
|
||||
di-utils
|
||||
di-utils-mapdevfs
|
||||
disk-detect
|
||||
dmraid-udeb
|
||||
dmsetup-udeb
|
||||
e2fsprogs-udeb
|
||||
eject-udeb
|
||||
etch-support
|
||||
ethdetect
|
||||
fdisk-udeb
|
||||
finish-install
|
||||
flash-kernel-installer
|
||||
glantank-installer
|
||||
gnupg-udeb
|
||||
gpgv-udeb
|
||||
gtk2-engines-udeb
|
||||
initrd-kickseed
|
||||
jfsutils-udeb
|
||||
kbd-chooser
|
||||
kickseed-common
|
||||
klibc-utils-floppy-udeb
|
||||
libblkid1-udeb
|
||||
libc6-udeb
|
||||
libcrypto0.9.8-udeb
|
||||
libdebian-installer4-udeb
|
||||
libdevmapper1.02.1-udeb
|
||||
libiw29-udeb
|
||||
libnss-dns-udeb
|
||||
libnss-files-udeb
|
||||
libparted1.7-udeb
|
||||
libpopt0-udeb
|
||||
libslang2-udeb
|
||||
libsysfs2-udeb
|
||||
libtextwrap1-udeb
|
||||
libusb-0.1-udeb
|
||||
libuuid1-udeb
|
||||
localization-config-udeb
|
||||
lowmem
|
||||
lvm2-udeb
|
||||
lvmcfg
|
||||
lvmcfg-utils
|
||||
mdadm-udeb
|
||||
mdcfg
|
||||
mdcfg-utils
|
||||
mii-diag-udeb
|
||||
mkreiserfs-udeb
|
||||
mount-aes-udeb
|
||||
mountfloppy
|
||||
net-retriever
|
||||
netcfg
|
||||
network-console
|
||||
network-preseed
|
||||
nobootloader
|
||||
ntfsprogs-udeb
|
||||
oldsys-preseed
|
||||
openssh-client-udeb
|
||||
openssh-server-udeb
|
||||
os-prober-udeb
|
||||
partconf-find-partitions
|
||||
partconf-mkfstab
|
||||
parted-udeb
|
||||
partman-auto
|
||||
partman-auto-crypto
|
||||
partman-auto-lvm
|
||||
partman-auto-raid
|
||||
partman-base
|
||||
partman-basicfilesystems
|
||||
partman-basicmethods
|
||||
partman-crypto
|
||||
partman-crypto-dm
|
||||
partman-crypto-loop
|
||||
partman-dmraid
|
||||
partman-ext3
|
||||
partman-jfs
|
||||
partman-lvm
|
||||
partman-md
|
||||
partman-partitioning
|
||||
partman-reiserfs
|
||||
partman-target
|
||||
partman-utils
|
||||
partman-xfs
|
||||
pciutils-udeb
|
||||
pcmciautils-udeb
|
||||
pkgsel
|
||||
ppp-udeb
|
||||
rdate-udeb
|
||||
rescue-mode
|
||||
save-logs
|
||||
strace-udeb
|
||||
tzsetup-udeb
|
||||
usbutils-udeb
|
||||
user-setup-udeb
|
||||
userdevfs
|
||||
wireless-tools-udeb
|
||||
xfsprogs-udeb
|
||||
zlib1g-udeb
|
||||
#endif /* ARCH_armel */
|
||||
#ifdef ARCH_hppa
|
||||
apt-cdrom-setup
|
||||
apt-mirror-setup
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*
|
||||
* DO NOT EDIT THIS FILE, edit the above script
|
||||
*
|
||||
* Last update: Sun Apr 20 11:32:58 CEST 2008
|
||||
* Last update: Sun May 4 12:03:06 CEST 2008
|
||||
*/
|
||||
#ifdef ARCH_alpha
|
||||
aboot-installer
|
||||
|
|
@ -18,7 +18,9 @@ base-installer
|
|||
beep-udeb
|
||||
bootstrap-base
|
||||
bterm-unifont
|
||||
cdebconf-gtk-entropy
|
||||
cdebconf-newt-entropy
|
||||
cdebconf-text-entropy
|
||||
cdrom-core-modules-2.6.24-1-alpha-generic-di
|
||||
cfdisk-udeb
|
||||
choose-mirror
|
||||
|
|
@ -84,6 +86,7 @@ libnss-dns-udeb
|
|||
libnss-files-udeb
|
||||
libparted1.7-udeb
|
||||
libpcre3-udeb
|
||||
libpixman-1-0-udeb
|
||||
libpopt0-udeb
|
||||
libslang2-udeb
|
||||
libsysfs2-udeb
|
||||
|
|
@ -371,6 +374,196 @@ wireless-tools-udeb
|
|||
xfsprogs-udeb
|
||||
zlib1g-udeb
|
||||
#endif /* ARCH_arm */
|
||||
#ifdef ARCH_armel
|
||||
apt-cdrom-setup
|
||||
apt-mirror-setup
|
||||
apt-setup-udeb
|
||||
archdetect
|
||||
ata-modules-2.6.24-1-ixp4xx-di
|
||||
base-installer
|
||||
beep-udeb
|
||||
bootstrap-base
|
||||
bterm-unifont
|
||||
cdebconf-gtk-entropy
|
||||
cdebconf-newt-entropy
|
||||
cdebconf-text-entropy
|
||||
cdrom-core-modules-2.6.24-1-iop32x-di
|
||||
cfdisk-udeb
|
||||
choose-mirror
|
||||
choose-mirror-bin
|
||||
clock-setup
|
||||
console-keymaps-acorn
|
||||
console-keymaps-amiga
|
||||
console-keymaps-at
|
||||
console-keymaps-atari
|
||||
console-keymaps-dec
|
||||
console-keymaps-mac
|
||||
console-keymaps-sun
|
||||
console-keymaps-usb
|
||||
console-setup-amiga-ekmap
|
||||
console-setup-ataritt-ekmap
|
||||
console-setup-macintoshold-ekmap
|
||||
console-setup-pc-ekmap
|
||||
console-setup-sun4-ekmap
|
||||
console-setup-sun5-ekmap
|
||||
console-setup-udeb
|
||||
core-modules-2.6.24-1-iop32x-di
|
||||
core-modules-2.6.24-1-ixp4xx-di
|
||||
core-modules-2.6.24-1-versatile-di
|
||||
crc-modules-2.6.24-1-iop32x-di
|
||||
crc-modules-2.6.24-1-ixp4xx-di
|
||||
crc-modules-2.6.24-1-versatile-di
|
||||
crypto-modules-2.6.24-1-iop32x-di
|
||||
crypto-modules-2.6.24-1-ixp4xx-di
|
||||
crypto-modules-2.6.24-1-versatile-di
|
||||
cryptsetup-udeb
|
||||
debian-archive-keyring-udeb
|
||||
debootstrap-udeb
|
||||
devio-udeb
|
||||
dhcp3-client-udeb
|
||||
di-utils
|
||||
di-utils-mapdevfs
|
||||
disk-detect
|
||||
dmraid-udeb
|
||||
dmsetup-udeb
|
||||
e2fsprogs-udeb
|
||||
eject-udeb
|
||||
etch-support
|
||||
ethdetect
|
||||
ext2-modules-2.6.24-1-iop32x-di
|
||||
ext2-modules-2.6.24-1-ixp4xx-di
|
||||
ext3-modules-2.6.24-1-iop32x-di
|
||||
ext3-modules-2.6.24-1-ixp4xx-di
|
||||
fat-modules-2.6.24-1-iop32x-di
|
||||
fat-modules-2.6.24-1-ixp4xx-di
|
||||
fat-modules-2.6.24-1-versatile-di
|
||||
fdisk-udeb
|
||||
finish-install
|
||||
flash-kernel-installer
|
||||
glantank-installer
|
||||
gnupg-udeb
|
||||
gpgv-udeb
|
||||
gtk2-engines-udeb
|
||||
ide-core-modules-2.6.24-1-iop32x-di
|
||||
ide-modules-2.6.24-1-iop32x-di
|
||||
initrd-kickseed
|
||||
input-modules-2.6.24-1-ixp4xx-di
|
||||
jfsutils-udeb
|
||||
kbd-chooser
|
||||
kickseed-common
|
||||
klibc-utils-floppy-udeb
|
||||
libblkid1-udeb
|
||||
libc6-udeb
|
||||
libcrypto0.9.8-udeb
|
||||
libdebian-installer4-udeb
|
||||
libdevmapper1.02.1-udeb
|
||||
libiw29-udeb
|
||||
libnss-dns-udeb
|
||||
libnss-files-udeb
|
||||
libparted1.7-udeb
|
||||
libpcre3-udeb
|
||||
libpixman-1-0-udeb
|
||||
libpopt0-udeb
|
||||
libslang2-udeb
|
||||
libsysfs2-udeb
|
||||
libtextwrap1-udeb
|
||||
libusb-0.1-udeb
|
||||
libuuid1-udeb
|
||||
localization-config-udeb
|
||||
loop-aes-modules-2.6.24-1-iop32x-di
|
||||
loop-aes-modules-2.6.24-1-ixp4xx-di
|
||||
loop-modules-2.6.24-1-iop32x-di
|
||||
loop-modules-2.6.24-1-ixp4xx-di
|
||||
loop-modules-2.6.24-1-versatile-di
|
||||
lowmem
|
||||
lvm2-udeb
|
||||
lvmcfg
|
||||
lvmcfg-utils
|
||||
md-modules-2.6.24-1-iop32x-di
|
||||
md-modules-2.6.24-1-ixp4xx-di
|
||||
md-modules-2.6.24-1-versatile-di
|
||||
mdadm-udeb
|
||||
mdcfg
|
||||
mdcfg-utils
|
||||
mii-diag-udeb
|
||||
mkreiserfs-udeb
|
||||
mount-aes-udeb
|
||||
mountfloppy
|
||||
multipath-modules-2.6.24-1-iop32x-di
|
||||
multipath-modules-2.6.24-1-ixp4xx-di
|
||||
multipath-modules-2.6.24-1-versatile-di
|
||||
net-retriever
|
||||
netcfg
|
||||
network-console
|
||||
network-preseed
|
||||
nic-modules-2.6.24-1-iop32x-di
|
||||
nic-modules-2.6.24-1-ixp4xx-di
|
||||
nic-usb-modules-2.6.24-1-iop32x-di
|
||||
nic-usb-modules-2.6.24-1-ixp4xx-di
|
||||
nic-usb-modules-2.6.24-1-versatile-di
|
||||
nobootloader
|
||||
ntfsprogs-udeb
|
||||
oldsys-preseed
|
||||
openssh-client-udeb
|
||||
openssh-server-udeb
|
||||
os-prober-udeb
|
||||
partconf-find-partitions
|
||||
partconf-mkfstab
|
||||
parted-udeb
|
||||
partman-auto
|
||||
partman-auto-crypto
|
||||
partman-auto-lvm
|
||||
partman-auto-raid
|
||||
partman-base
|
||||
partman-basicfilesystems
|
||||
partman-basicmethods
|
||||
partman-crypto
|
||||
partman-crypto-dm
|
||||
partman-crypto-loop
|
||||
partman-dmraid
|
||||
partman-ext3
|
||||
partman-jfs
|
||||
partman-lvm
|
||||
partman-md
|
||||
partman-multipath
|
||||
partman-partitioning
|
||||
partman-reiserfs
|
||||
partman-target
|
||||
partman-utils
|
||||
partman-xfs
|
||||
pata-modules-2.6.24-1-ixp4xx-di
|
||||
pciutils-udeb
|
||||
pcmciautils-udeb
|
||||
pkgsel
|
||||
ppp-udeb
|
||||
rdate-udeb
|
||||
reiserfs-modules-2.6.24-1-iop32x-di
|
||||
reiserfs-modules-2.6.24-1-ixp4xx-di
|
||||
reiserfs-modules-2.6.24-1-versatile-di
|
||||
rescue-mode
|
||||
sata-modules-2.6.24-1-iop32x-di
|
||||
sata-modules-2.6.24-1-ixp4xx-di
|
||||
sata-modules-2.6.24-1-versatile-di
|
||||
save-logs
|
||||
scsi-core-modules-2.6.24-1-iop32x-di
|
||||
scsi-core-modules-2.6.24-1-ixp4xx-di
|
||||
squashfs-modules-2.6.24-1-iop32x-di
|
||||
squashfs-modules-2.6.24-1-ixp4xx-di
|
||||
strace-udeb
|
||||
tzsetup-udeb
|
||||
usb-modules-2.6.24-1-iop32x-di
|
||||
usb-modules-2.6.24-1-ixp4xx-di
|
||||
usb-modules-2.6.24-1-versatile-di
|
||||
usb-storage-modules-2.6.24-1-iop32x-di
|
||||
usb-storage-modules-2.6.24-1-ixp4xx-di
|
||||
usb-storage-modules-2.6.24-1-versatile-di
|
||||
usbutils-udeb
|
||||
user-setup-udeb
|
||||
userdevfs
|
||||
wireless-tools-udeb
|
||||
xfsprogs-udeb
|
||||
zlib1g-udeb
|
||||
#endif /* ARCH_armel */
|
||||
#ifdef ARCH_hppa
|
||||
apt-cdrom-setup
|
||||
apt-mirror-setup
|
||||
|
|
@ -588,6 +781,7 @@ libdebian-installer4-udeb
|
|||
libnss-dns-udeb
|
||||
libnss-files-udeb
|
||||
libpcre3-udeb
|
||||
libpixman-1-0-udeb
|
||||
libpopt0-udeb
|
||||
libslang2-udeb
|
||||
libsysfs2-udeb
|
||||
|
|
@ -1677,7 +1871,9 @@ base-installer
|
|||
beep-udeb
|
||||
bootstrap-base
|
||||
bterm-unifont
|
||||
cdebconf-gtk-entropy
|
||||
cdebconf-newt-entropy
|
||||
cdebconf-text-entropy
|
||||
cdrom-core-modules-2.6.24-1-sparc64-di
|
||||
choose-mirror
|
||||
choose-mirror-bin
|
||||
|
|
|
|||
|
|
@ -0,0 +1,61 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Do install stuff for armel, including making bootable CDs
|
||||
# Works with debian-installer
|
||||
#
|
||||
# $1 is the CD number
|
||||
# $2 is the temporary CD build dir
|
||||
#
|
||||
# This is copied from the arm script and it is currently disabled as there
|
||||
# doesn't seem to be any bootable armel machines.
|
||||
|
||||
. $BASEDIR/tools/boot/$CODENAME/common.sh
|
||||
|
||||
set -e
|
||||
|
||||
N=$1
|
||||
CDDIR=$2
|
||||
INSTALLDIR=$CDDIR/install
|
||||
if [ "$DI_WWW_HOME" = "default" ];then
|
||||
DI_WWW_HOME="http://people.debian.org/~kmuto/d-i/images/daily"
|
||||
if [ -n "$DI_DIR" ];then
|
||||
DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
|
||||
DI_WWW_HOME=""
|
||||
fi
|
||||
fi
|
||||
if [ ! "$DI_DIST" ]; then
|
||||
DI_DIST="$DI_CODENAME"
|
||||
fi
|
||||
|
||||
cd $CDDIR/..
|
||||
|
||||
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
|
||||
|
||||
# Armel is currently not bootable in lenny, so bail out here
|
||||
echo "Armel booting disabled, check with Sledge/fjp/tbm"
|
||||
exit 0
|
||||
|
||||
# Only disk 1* bootable
|
||||
if [ $N != 1 ] && [ $N != 1_NONUS ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
cd $INSTALLDIR
|
||||
|
||||
# Netwinder currently disabled - fails to boot at the moment, as it's too big. SAM 2008/03/05
|
||||
#for subarch in netwinder; do
|
||||
# if [ ! "$DI_WWW_HOME" ];then
|
||||
# if [ ! "$DI_DIR" ];then
|
||||
# DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
|
||||
# fi
|
||||
# DI_DIR2="$DI_DIR/$subarch/cdrom"
|
||||
# else
|
||||
# DI_DIR2="di_stuff"
|
||||
# wget -r -nd --no-parent --level=1 -P "$DI_DIR2" "$DI_WWW_HOME/$subarch/cdrom/"
|
||||
# rm -f "$DI_DIR2"/index*
|
||||
# fi
|
||||
# cp -a "$DI_DIR2" "$subarch"
|
||||
# rm -rf di_stuff
|
||||
#done
|
||||
|
||||
exit 0
|
||||
|
|
@ -206,6 +206,20 @@ linux-image-2.6-rpc
|
|||
linux-image-2.6-s3c2410
|
||||
#endif
|
||||
|
||||
#ifdef ARCH_armel
|
||||
initramfs-tools
|
||||
busybox
|
||||
discover1
|
||||
libdiscover1
|
||||
slugimage
|
||||
flash-kernel
|
||||
nslu2-utils
|
||||
apex-nslu2
|
||||
linux-image-2.6-iop32x
|
||||
linux-image-2.6-ixp4xx
|
||||
linux-image-2.6-versatile
|
||||
#endif
|
||||
|
||||
#ifdef ARCH_sparc
|
||||
initramfs-tools
|
||||
busybox
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ die "Missing \$MIRROR variable" unless $ENV{MIRROR};
|
|||
die "Missing \$DI_CODENAME variable" unless $ENV{DI_CODENAME};
|
||||
die "Missing \$BASEDIR variable" unless $ENV{BASEDIR};
|
||||
|
||||
my @ARCHES=qw{alpha arm hppa hurd-i386 i386 ia64 mips mipsel
|
||||
my @ARCHES=qw{alpha arm armel hppa hurd-i386 i386 ia64 mips mipsel
|
||||
powerpc s390 sparc amd64};
|
||||
my $DATE=`date`;
|
||||
chomp $DATE;
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ do
|
|||
DIR = ""
|
||||
}' | sort | uniq >> $OUT
|
||||
;;
|
||||
alpha|amd64|arm|hppa|i386|ia64|m68k|mips|mipsel|powerpc|s390|sparc)
|
||||
alpha|amd64|arm|armel|hppa|i386|ia64|m68k|mips|mipsel|powerpc|s390|sparc)
|
||||
FILES=`find $LOCATIONS -name Packages.gz | grep binary-$ARCH`
|
||||
echo -e "Using MD5 sums from Packages files:\n$FILES"
|
||||
zcat -f $FILES | awk -v MIRROR=$MIRROR '
|
||||
|
|
|
|||
Loading…
Reference in New Issue