mirror of
https://salsa.debian.org/images-team/debian-cd.git
synced 2024-11-24 15:19:51 -01:00
- debian-installer task files renamed to include distro name and branched
for etch.
This commit is contained in:
parent
c754493b57
commit
dab6547bfa
4
CONF.sh
4
CONF.sh
@ -266,8 +266,8 @@ export PUBLISH_PATH="/home/jigdo-area/"
|
||||
|
||||
# Only put the installer onto the cd (set NORECOMMENDS,... as well).
|
||||
# INSTALLER_CD=0: nothing special (default)
|
||||
# INSTALLER_CD=1: just add debian-installer (use TASK=tasks/debian-installer)
|
||||
# INSTALLER_CD=2: add d-i and base (use TASK=tasks/debian-installer+kernel)
|
||||
# INSTALLER_CD=1: just add debian-installer (use TASK=tasks/debian-installer-$CODENAME)
|
||||
# INSTALLER_CD=2: add d-i and base (use TASK=tasks/debian-installer+kernel-$CODENAME)
|
||||
#export INSTALLER_CD=0
|
||||
|
||||
# Parameters to pass to kernel when the CD boots. Not currently supported
|
||||
|
4
debian/CONF.sh
vendored
4
debian/CONF.sh
vendored
@ -265,8 +265,8 @@ export PUBLISH_PATH="/home/jigdo-area/"
|
||||
|
||||
# Only put the installer onto the cd (set NORECOMMENDS,... as well).
|
||||
# INSTALLER_CD=0: nothing special (default)
|
||||
# INSTALLER_CD=1: just add debian-installer (use TASK=tasks/debian-installer)
|
||||
# INSTALLER_CD=2: add d-i and base (use TASK=tasks/debian-installer+kernel)
|
||||
# INSTALLER_CD=1: just add debian-installer (use TASK=tasks/debian-installer-$CODENAME)
|
||||
# INSTALLER_CD=2: add d-i and base (use TASK=tasks/debian-installer+kernel-$CODENAME)
|
||||
#export INSTALLER_CD=0
|
||||
|
||||
# Parameters to pass to kernel when the CD boots. Not currently supported
|
||||
|
4
debian/changelog
vendored
4
debian/changelog
vendored
@ -9,6 +9,8 @@ debian-cd (2.2.22) UNRELEASED; urgency=low
|
||||
- Add support for f4.txt that is for systems with the 2.6 kernel.
|
||||
- Exclude new mouse-modules udebs from CDs until something in d-i uses
|
||||
them.
|
||||
- debian-installer task files renamed to include distro name and branched
|
||||
for etch.
|
||||
* Steve McIntyre
|
||||
- Make woody's post-boot-mipsel script cope with extra fields in the
|
||||
output of sarge's isoinfo
|
||||
@ -18,7 +20,7 @@ debian-cd (2.2.22) UNRELEASED; urgency=low
|
||||
- Don't copy the whole d-i cdrom directory onto CD1 for amd64.
|
||||
Closes: #306926
|
||||
- Don't copy boot.img.gz onto amd64 CD1.
|
||||
|
||||
|
||||
-- Joey Hess <joeyh@debian.org> Thu, 14 Apr 2005 00:59:49 -0400
|
||||
|
||||
debian-cd (2.2.21) unstable; urgency=low
|
||||
|
@ -9,7 +9,7 @@
|
||||
#endif
|
||||
|
||||
/* Packages that should really be on CD1 */
|
||||
#include <debian-installer+kernel>
|
||||
#include <debian-installer+kernel-etch>
|
||||
#include <base-etch>
|
||||
#include <forcd1>
|
||||
#include <task-essential-etch>
|
||||
|
@ -9,7 +9,7 @@
|
||||
#endif
|
||||
|
||||
/* Packages that should really be on CD1 */
|
||||
#include <debian-installer+kernel>
|
||||
#include <debian-installer+kernel-sarge>
|
||||
#include <base-sarge>
|
||||
#include <forcd1>
|
||||
#include <task-essential-sarge>
|
||||
|
@ -10,7 +10,7 @@
|
||||
* Last update: Sun Feb 20 16:43:53 MST 2005
|
||||
*/
|
||||
|
||||
#include <debian-installer>
|
||||
#include <debian-installer-etch>
|
||||
eject
|
||||
locales
|
||||
lvm10
|
154
tasks/debian-installer+kernel-sarge
Normal file
154
tasks/debian-installer+kernel-sarge
Normal file
@ -0,0 +1,154 @@
|
||||
/* These files + the ones needed by debootstrap are the ones needed for
|
||||
* debian-installer to be able to complete the installation of the base
|
||||
* system.
|
||||
*
|
||||
* This list can be generated with the command:
|
||||
* ../tools/generate_di+k_list
|
||||
*
|
||||
* DO NOT EDIT THIS FILE, edit the above script
|
||||
*
|
||||
* Last update: Sun Feb 20 16:43:53 MST 2005
|
||||
*/
|
||||
|
||||
#include <debian-installer-sarge>
|
||||
eject
|
||||
locales
|
||||
lvm10
|
||||
libdevmapper1.01
|
||||
lvm-common
|
||||
lvm2
|
||||
mdadm
|
||||
aptitude
|
||||
jfbterm
|
||||
unifont
|
||||
hotplug
|
||||
usbutils
|
||||
iso-codes
|
||||
console-cyrillic
|
||||
console-terminus
|
||||
pcmcia-cs
|
||||
wireless-tools
|
||||
xfsprogs
|
||||
jfsutils
|
||||
reiserfsprogs
|
||||
libfribidi0
|
||||
localization-config
|
||||
#ifdef ARCH_i386
|
||||
discover
|
||||
discover1
|
||||
grub
|
||||
lilo
|
||||
kernel-image-2.4.27-2-386
|
||||
kernel-pcmcia-modules-2.4.27-2-386
|
||||
kernel-image-2.6.8-2-386
|
||||
#endif
|
||||
#ifdef ARCH_amd64
|
||||
kernel-image-2.6.8-9-amd64-generic
|
||||
#endif
|
||||
#ifdef ARCH_alpha
|
||||
aboot
|
||||
aboot-base
|
||||
discover1
|
||||
kernel-image-2.4-generic
|
||||
kernel-image-2.4-smp
|
||||
kernel-image-2.4.27-2-generic
|
||||
kernel-image-2.4.27-2-smp
|
||||
kernel-image-2.6-generic
|
||||
kernel-image-2.6-smp
|
||||
kernel-image-2.6.8-2-generic
|
||||
kernel-image-2.6.8-2-smp
|
||||
kernel-image-netbootable
|
||||
#endif
|
||||
#ifdef ARCH_hppa
|
||||
discover1
|
||||
kernel-image-2.6.8-2-32
|
||||
kernel-image-2.6.8-2-32-smp
|
||||
kernel-image-2.6.8-2-64
|
||||
kernel-image-2.6.8-2-64-smp
|
||||
#endif
|
||||
#ifdef ARCH_ia64
|
||||
discover1
|
||||
initrd-tools
|
||||
kernel-image-2.4.27-2-itanium
|
||||
kernel-image-2.4.27-2-itanium-smp
|
||||
kernel-image-2.4.27-2-mckinley
|
||||
kernel-image-2.4.27-2-mckinley-smp
|
||||
kernel-image-2.4-itanium
|
||||
kernel-image-2.4-itanium-smp
|
||||
kernel-image-2.4-mckinley
|
||||
kernel-image-2.4-mckinley-smp
|
||||
kernel-image-2.6.8-2-itanium
|
||||
kernel-image-2.6.8-2-itanium-smp
|
||||
kernel-image-2.6.8-2-mckinley
|
||||
kernel-image-2.6.8-2-mckinley-smp
|
||||
kernel-image-2.6-itanium
|
||||
kernel-image-2.6-itanium-smp
|
||||
kernel-image-2.6-mckinley
|
||||
kernel-image-2.6-mckinley-smp
|
||||
#endif
|
||||
#ifdef ARCH_mips
|
||||
arcboot
|
||||
kernel-image-2.4.27-r4k-ip22
|
||||
kernel-image-2.4.27-r5k-ip22
|
||||
#endif
|
||||
#ifdef ARCH_mipsel
|
||||
delo
|
||||
kernel-image-2.4.27-r3k-kn02
|
||||
kernel-image-2.4.27-r4k-kn04
|
||||
#endif
|
||||
#ifdef ARCH_powerpc
|
||||
discover1
|
||||
quik
|
||||
yaboot
|
||||
mkvmlinuz
|
||||
module-init-tools
|
||||
initrd-tools
|
||||
kernel-image-2.6.8-powerpc
|
||||
kernel-image-2.6.8-power3
|
||||
kernel-image-2.6.8-power4
|
||||
kernel-image-2.4.27-power3-pmac
|
||||
kernel-image-2.4.27-power3-chrp-rs6k
|
||||
kernel-image-2.4.27-power4-pmac
|
||||
kernel-image-2.4.27-power4-chrp-rs6k
|
||||
kernel-image-2.4.27-powerpc-pmac
|
||||
kernel-image-2.4.27-powerpc-prep
|
||||
kernel-image-2.4.27-powerpc-chrp
|
||||
kernel-image-2.4.27-powerpc-chrp-rs6k
|
||||
kernel-image-2.4.27-apus
|
||||
#endif
|
||||
#ifdef ARCH_sparc
|
||||
discover1
|
||||
initrd-tools
|
||||
kernel-image-2.4-sparc32
|
||||
kernel-image-2.4-sparc32-smp
|
||||
kernel-image-2.4-sparc64
|
||||
kernel-image-2.4-sparc64-smp
|
||||
kernel-image-2.4.27-1-sparc32
|
||||
kernel-image-2.4.27-1-sparc32-smp
|
||||
kernel-image-2.4.27-1-sparc64
|
||||
kernel-image-2.4.27-1-sparc64-smp
|
||||
kernel-image-2.6-sparc32
|
||||
kernel-image-2.6-sparc64
|
||||
kernel-image-2.6-sparc64-smp
|
||||
kernel-image-2.6.8-2-sparc32
|
||||
kernel-image-2.6.8-2-sparc64
|
||||
kernel-image-2.6.8-2-sparc64-smp
|
||||
#endif
|
||||
#ifdef ARCH_m68k
|
||||
fileutils
|
||||
kernel-image-2.2.25-mac
|
||||
kernel-image-2.4.27-amiga
|
||||
kernel-image-2.4.27-atari
|
||||
kernel-image-2.4.27-bvme6000
|
||||
kernel-image-2.4.27-mvme147
|
||||
kernel-image-2.4.27-mvme16x
|
||||
kernel-image-2.4.27-q40
|
||||
#endif
|
||||
#ifdef ARCH_arm
|
||||
discover1
|
||||
kernel-image-2.4.27-bast
|
||||
kernel-image-2.4.27-lart
|
||||
kernel-image-2.4.27-netwinder
|
||||
kernel-image-2.4.27-riscpc
|
||||
kernel-image-2.4.27-riscstation
|
||||
#endif
|
1842
tasks/debian-installer-sarge
Normal file
1842
tasks/debian-installer-sarge
Normal file
File diff suppressed because it is too large
Load Diff
@ -5,7 +5,7 @@
|
||||
# MIRROR, CODENAME
|
||||
|
||||
DATE=`date`
|
||||
cat > debian-installer+kernel << EOF
|
||||
cat > debian-installer+kernel-$CODENAME << EOF
|
||||
/* These files + the ones needed by debootstrap are the ones needed for
|
||||
* debian-installer to be able to complete the installation of the base
|
||||
* system.
|
||||
@ -50,15 +50,15 @@ EOF
|
||||
|
||||
/bin/sed -n 's/Package: \(kernel-image-2.4.*-386\)$/\1/p' \
|
||||
$MIRROR/dists/$CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \
|
||||
>> debian-installer+kernel
|
||||
>> debian-installer+kernel-$CODENAME
|
||||
/bin/sed -n 's/Package: \(kernel-pcmcia-modules-2.4.*-386\)$/\1/p' \
|
||||
$MIRROR/dists/$CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \
|
||||
>> debian-installer+kernel
|
||||
>> debian-installer+kernel-$CODENAME
|
||||
/bin/sed -n 's/Package: \(kernel-image-2.6.*-386\)$/\1/p' \
|
||||
$MIRROR/dists/$CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \
|
||||
>> debian-installer+kernel
|
||||
>> debian-installer+kernel-$CODENAME
|
||||
|
||||
cat >> debian-installer+kernel << EOF
|
||||
cat >> debian-installer+kernel-$CODENAME << EOF
|
||||
#endif
|
||||
#ifdef ARCH_amd64
|
||||
EOF
|
||||
@ -75,7 +75,7 @@ else
|
||||
>> debian-installer+kernel
|
||||
fi
|
||||
|
||||
cat >> debian-installer+kernel << EOF
|
||||
cat >> debian-installer+kernel-$CODENAME << EOF
|
||||
#endif
|
||||
#ifdef ARCH_alpha
|
||||
aboot
|
||||
@ -85,9 +85,9 @@ EOF
|
||||
|
||||
/bin/sed -n 's/Package: \(kernel-image-.*\)$/\1/p' \
|
||||
$MIRROR/dists/$CODENAME/main/binary-alpha/Packages|grep -v 2.4.21 \
|
||||
>> debian-installer+kernel
|
||||
>> debian-installer+kernel-$CODENAME
|
||||
|
||||
cat >> debian-installer+kernel << EOF
|
||||
cat >> debian-installer+kernel-$CODENAME << EOF
|
||||
#endif
|
||||
#ifdef ARCH_hppa
|
||||
discover1
|
||||
@ -95,9 +95,9 @@ EOF
|
||||
|
||||
/bin/sed -n 's/Package: \(kernel-image-2.6.*\)$/\1/p' \
|
||||
$MIRROR/dists/$CODENAME/main/binary-hppa/Packages|tail -n4 \
|
||||
>> debian-installer+kernel
|
||||
>> debian-installer+kernel-$CODENAME
|
||||
|
||||
cat >> debian-installer+kernel << EOF
|
||||
cat >> debian-installer+kernel-$CODENAME << EOF
|
||||
#endif
|
||||
#ifdef ARCH_ia64
|
||||
discover1
|
||||
@ -106,18 +106,18 @@ EOF
|
||||
|
||||
/bin/sed -n 's/Package: \(kernel-image-2\.4\..*\)$/\1/p' \
|
||||
$MIRROR/dists/$CODENAME/main/binary-ia64/Packages | tail -n 4 \
|
||||
>> debian-installer+kernel
|
||||
>> debian-installer+kernel-$CODENAME
|
||||
/bin/sed -n 's/Package: \(kernel-image-2\.4-.*\)$/\1/p' \
|
||||
$MIRROR/dists/$CODENAME/main/binary-ia64/Packages \
|
||||
>> debian-installer+kernel
|
||||
>> debian-installer+kernel-$CODENAME
|
||||
/bin/sed -n 's/Package: \(kernel-image-2\.6\..*\)$/\1/p' \
|
||||
$MIRROR/dists/$CODENAME/main/binary-ia64/Packages | tail -n 4 \
|
||||
>> debian-installer+kernel
|
||||
>> debian-installer+kernel-$CODENAME
|
||||
/bin/sed -n 's/Package: \(kernel-image-2\.6-.*\)$/\1/p' \
|
||||
$MIRROR/dists/$CODENAME/main/binary-ia64/Packages \
|
||||
>> debian-installer+kernel
|
||||
>> debian-installer+kernel-$CODENAME
|
||||
|
||||
cat >> debian-installer+kernel << EOF
|
||||
cat >> debian-installer+kernel-$CODENAME << EOF
|
||||
#endif
|
||||
#ifdef ARCH_mips
|
||||
arcboot
|
||||
@ -128,10 +128,10 @@ for subarch in r4k-ip22 r5k-ip22; do
|
||||
sed -n 's/Package: \(kernel-image-.*-.*\)$/\1/p' \
|
||||
$MIRROR/dists/$CODENAME/main/binary-mips/Packages \
|
||||
| grep -- "-$subarch$" | sort -n | tail -n 1 \
|
||||
>> debian-installer+kernel
|
||||
>> debian-installer+kernel-$CODENAME
|
||||
done
|
||||
|
||||
cat >> debian-installer+kernel << EOF
|
||||
cat >> debian-installer+kernel-$CODENAME << EOF
|
||||
#endif
|
||||
#ifdef ARCH_mipsel
|
||||
delo
|
||||
@ -142,10 +142,10 @@ for subarch in r3k-kn02 r4k-kn04; do
|
||||
sed -n 's/Package: \(kernel-image-.*-.*\)$/\1/p' \
|
||||
$MIRROR/dists/$CODENAME/main/binary-mipsel/Packages \
|
||||
| grep -- "-$subarch$" | sort -n | tail -n 1 \
|
||||
>> debian-installer+kernel
|
||||
>> debian-installer+kernel-$CODENAME
|
||||
done
|
||||
|
||||
cat >> debian-installer+kernel << EOF
|
||||
cat >> debian-installer+kernel-$CODENAME << EOF
|
||||
#endif
|
||||
#ifdef ARCH_powerpc
|
||||
discover1
|
||||
@ -163,10 +163,10 @@ for subarch in powerpc power3 power4 power3-pmac power3-chrp-rs6k \
|
||||
sed -n 's/Package: \(kernel-image-.*-.*\)$/\1/p' \
|
||||
$MIRROR/dists/$CODENAME/main/binary-powerpc/Packages \
|
||||
| grep -- "-$subarch$" | sort -n | tail -n 1 \
|
||||
>> debian-installer+kernel
|
||||
>> debian-installer+kernel-$CODENAME
|
||||
done
|
||||
|
||||
cat >> debian-installer+kernel << EOF
|
||||
cat >> debian-installer+kernel-$CODENAME << EOF
|
||||
#endif
|
||||
#ifdef ARCH_sparc
|
||||
discover1
|
||||
@ -175,9 +175,9 @@ EOF
|
||||
|
||||
/bin/sed -n 's/Package: \(kernel-image-.*-sparc.*\)$/\1/p' \
|
||||
$MIRROR/dists/$CODENAME/main/binary-sparc/Packages \
|
||||
>> debian-installer+kernel
|
||||
>> debian-installer+kernel-$CODENAME
|
||||
|
||||
cat >> debian-installer+kernel << EOF
|
||||
cat >> debian-installer+kernel-$CODENAME << EOF
|
||||
#endif
|
||||
#ifdef ARCH_m68k
|
||||
fileutils
|
||||
@ -186,21 +186,21 @@ EOF
|
||||
# Get all the 2.2 kernels
|
||||
#/bin/sed -n 's/Package: \(kernel-image-2.2.*\)$/\1/p' \
|
||||
# $MIRROR/dists/$CODENAME/main/binary-m68k/Packages | tail -n 6 \
|
||||
# >> debian-installer+kernel
|
||||
# >> debian-installer+kernel-$CODENAME
|
||||
# Get the latest 2.4 kernel for amiga
|
||||
#/bin/sed -n 's/Package: \(kernel-image-2.4.*-amiga\)$/\1/p' \
|
||||
# $MIRROR/dists/$CODENAME/main/binary-m68k/Packages | tail -n 1 \
|
||||
# >> debian-installer+kernel
|
||||
# >> debian-installer+kernel-$CODENAME
|
||||
# Get all the latest 2.2 for mac kernel
|
||||
/bin/sed -n 's/Package: \(kernel-image-2.2.*-mac\)$/\1/p' \
|
||||
$MIRROR/dists/$CODENAME/main/binary-m68k/Packages | tail -n 1 \
|
||||
>> debian-installer+kernel
|
||||
>> debian-installer+kernel-$CODENAME
|
||||
# Get the latest 2.4 kernels, except mac
|
||||
/bin/sed -n 's/Package: \(kernel-image-2.4.*\)$/\1/p' \
|
||||
$MIRROR/dists/$CODENAME/main/binary-m68k/Packages | tail -n 7 | \
|
||||
grep -v mac >> debian-installer+kernel
|
||||
grep -v mac >> debian-installer+kernel-$CODENAME
|
||||
|
||||
cat >> debian-installer+kernel << EOF
|
||||
cat >> debian-installer+kernel-$CODENAME << EOF
|
||||
#endif
|
||||
#ifdef ARCH_arm
|
||||
discover1
|
||||
@ -208,8 +208,8 @@ EOF
|
||||
|
||||
/bin/sed -n 's/Package: \(kernel-image-2.4.*\)$/\1/p' \
|
||||
$MIRROR/dists/$CODENAME/main/binary-arm/Packages|tail -n5 \
|
||||
>> debian-installer+kernel
|
||||
>> debian-installer+kernel-$CODENAME
|
||||
|
||||
cat >> debian-installer+kernel << EOF
|
||||
cat >> debian-installer+kernel-$CODENAME << EOF
|
||||
#endif
|
||||
EOF
|
||||
|
@ -2,11 +2,14 @@
|
||||
# Generate a list of packages required for debian-installer
|
||||
# This script makes use of the following variables that need to be preset:
|
||||
# MIRROR, DI_CODENAME, BASEDIR
|
||||
die "Missing \$MIRROR variable" unless $ENV{MIRROR};
|
||||
die "Missing \$DI_CODENAME variable" unless $ENV{DI_CODENAME};
|
||||
|
||||
my @ARCHES=qw{alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel
|
||||
powerpc s390 sparc sh amd64};
|
||||
my $DATE=`date`;
|
||||
chomp $DATE;
|
||||
open(OUT, ">debian-installer") || die "write: $!";
|
||||
open(OUT, ">debian-installer-$ENV{DI_CODENAME}") || die "write: $!";
|
||||
print OUT << "EOF";
|
||||
/* List of udebs to be included so that debian-installer works fine
|
||||
*
|
||||
@ -21,9 +24,6 @@ EOF
|
||||
|
||||
my @common_excludes = read_exclude("exclude-udebs");
|
||||
|
||||
die "Missing \$MIRROR variable" unless $ENV{MIRROR};
|
||||
die "Missing \$DI_CODENAME variable" unless $ENV{DI_CODENAME};
|
||||
|
||||
foreach my $arch (@ARCHES) {
|
||||
my $packagefile="$ENV{MIRROR}/dists/$ENV{DI_CODENAME}/main/debian-installer/binary-$arch/Packages";
|
||||
unless (-f $packagefile) {
|
||||
|
Loading…
Reference in New Issue
Block a user