Add DI_CODENAME variable make it posible to build cds with a special

debian-installer version.
This commit is contained in:
Santiago Garcia Mantinan 2004-03-08 13:43:40 +00:00
parent b4ce10409f
commit 80faafdf64
7 changed files with 29 additions and 14 deletions

View File

@ -49,6 +49,12 @@ export BASEDIR=`pwd`
# Building woody cd set ...
export CODENAME=woody
# By default use Debian installer packages from $CODENAME
if [ ! "$DI_CODENAME" ]
then
export DI_CODENAME=$CODENAME
fi
# Version number, "2.2 r0", "2.2 r1" etc.
export DEBVERSION="3.0"

6
debian/CONF.sh vendored
View File

@ -37,6 +37,12 @@ export BASEDIR=/usr/share/debian-cd
# Building woody cd set ...
export CODENAME=woody
# By default use Debian installer packages from $CODENAME
if [ ! "$DI_CODENAME" ]
then
export DI_CODENAME=$CODENAME
fi
# Version number, "2.2 r0", "2.2 r1" etc.
export DEBVERSION="3.0"

3
debian/changelog vendored
View File

@ -54,6 +54,9 @@ debian-cd (2.2.17) UNRELEASED; urgency=low
data.
- Avoid acorn-fdisk, cfdisk-utf8 and lots of kernels on the first CD.
It should be enough with one kernel package on the first CD.
* Santiago Garcia
- Add DI_CODENAME variable make it posible to build cds with a special
debian-installer version.
-- Raphael Hertzog <hertzog@debian.org> Wed, 20 Aug 2003 20:17:06 +0200

View File

@ -44,7 +44,7 @@ if [ "${NONFREE:-0}" != "0" ]; then
mkdir -p dists/$CODENAME/non-free/binary-$ARCH
mkdir -p dists/$CODENAME/non-free/source
fi
if [ -e "$MIRROR/dists/$CODENAME/main/debian-installer" ]; then
if [ -e "$MIRROR/dists/$DI_CODENAME/main/debian-installer" ]; then
mkdir -p dists/$CODENAME/main/debian-installer/binary-$ARCH
fi

View File

@ -65,12 +65,12 @@ if [ ! -e "$APTTMP/$CODENAME-$ARCH/apt/sources.list" ]; then
>> $APTTMP/$CODENAME-$ARCH/apt/sources.list
fi
# Debian-installer
if [ -e "$MIRROR/dists/$CODENAME/main/debian-installer" ]; then
echo "deb file:$MIRROR $CODENAME main/debian-installer" \
if [ -e "$MIRROR/dists/$DI_CODENAME/main/debian-installer" ]; then
echo "deb file:$MIRROR $DI_CODENAME main/debian-installer" \
>> $APTTMP/$CODENAME-$ARCH/apt/sources.list
fi
if [ -n "$LOCAL" -a -e "${LOCALDEBS:-$MIRROR}/dists/$CODENAME/local/debian-installer" ]; then
echo "deb file:${LOCALDEBS:-$MIRROR} $CODENAME local/debian-installer" \
if [ -n "$LOCAL" -a -e "${LOCALDEBS:-$MIRROR}/dists/$DI_CODENAME/local/debian-installer" ]; then
echo "deb file:${LOCALDEBS:-$MIRROR} $DI_CODENAME local/debian-installer" \
>> $APTTMP/$CODENAME-$ARCH/apt/sources.list
fi
fi

View File

@ -1,7 +1,7 @@
#!/usr/bin/perl -w
# Generate a list of packages required for debian-installer
# This script makes use of the following variables that need to be preset:
# MIRROR, CODENAME, BASEDIR
# MIRROR, DI_CODENAME, BASEDIR
my @ARCHES=qw{alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel
powerpc s390 sparc sh};
my $DATE=`date`;
@ -24,7 +24,7 @@ foreach my $arch (@ARCHES) {
my @exclude = @common_excludes;
push @exclude, read_exclude("exclude-udebs-$arch")
if -e exclude_path("exclude-udebs-$arch");
my $packagefile="$ENV{MIRROR}/dists/$ENV{CODENAME}/main/debian-installer/binary-$arch/Packages";
my $packagefile="$ENV{MIRROR}/dists/$ENV{DI_CODENAME}/main/debian-installer/binary-$arch/Packages";
UDEB: foreach my $udeb (map { chomp; $_ } `grep-dctrl -n -s Package '' $packagefile`) {
foreach my $pattern (@exclude) {
if ($udeb =~ /^$pattern$/) {
@ -54,5 +54,5 @@ sub read_exclude {
sub exclude_path {
my $file=shift;
return "$ENV{BASEDIR}/data/$ENV{CODENAME}/$file";
return "$ENV{BASEDIR}/data/$ENV{DI_CODENAME}/$file";
}

View File

@ -91,8 +91,8 @@ if [ -n "$LOCALDEBS" -a -n "$LOCAL" ]; then
fi
fi
if [ -e "$MIRROR/dists/$CODENAME/main/debian-installer/binary-$ARCH/Release" ]; then
cp $MIRROR/dists/$CODENAME/main/debian-installer/binary-$ARCH/Release \
if [ -e "$MIRROR/dists/$DI_CODENAME/main/debian-installer/binary-$ARCH/Release" ]; then
cp $MIRROR/dists/$DI_CODENAME/main/debian-installer/binary-$ARCH/Release \
dists/$CODENAME/main/debian-installer/binary-$ARCH/
fi
@ -101,7 +101,7 @@ apt-ftparchive generate $PREFIX.generate-binary
if [ -n "$NONUS" ]; then
apt-ftparchive generate $PREFIX.generate-binary-non-US
fi
if [ -e "$MIRROR/dists/$CODENAME/main/debian-installer" ]; then
if [ -e "$MIRROR/dists/$DI_CODENAME/main/debian-installer" ]; then
apt-ftparchive generate $PREFIX.generate-binary-debian-installer
fi
@ -214,7 +214,7 @@ Tree "dists/$CODENAME/main" {
Packages::Extensions ".udeb";
}
EOF
if [ -n "$LOCAL" -a -e "${LOCALDEBS:-$MIRROR}/dists/$CODENAME/local/debian-installer" ]; then
if [ -n "$LOCAL" -a -e "${LOCALDEBS:-$MIRROR}/dists/$DI_CODENAME/local/debian-installer" ]; then
cat >>$PREFIX.generate-binary-debian-installer <<EOF
Tree "dists/$CODENAME/local" {
@ -243,10 +243,10 @@ if [ ! -d "$BDIR/indices" ]; then
touch $BDIR/indices/override.$CODENAME.extra.$SECT
touch $BDIR/indices/override.$CODENAME.$SECT.src
done
if [ -e "$MIRROR/dists/$CODENAME/main/debian-installer" ]; then
if [ -e "$MIRROR/dists/$DI_CODENAME/main/debian-installer" ]; then
touch $BDIR/indices/override.$CODENAME.main.debian-installer
fi
if [ -n "$LOCAL" -a -e "${LOCALDEBS:-$MIRROR}/dists/$CODENAME/local/debian-installer" ]; then
if [ -n "$LOCAL" -a -e "${LOCALDEBS:-$MIRROR}/dists/$DI_CODENAME/local/debian-installer" ]; then
touch $BDIR/indices/override.$CODENAME.local.debian-installer
touch $BDIR/indices/override.$CODENAME.extra.local
touch $BDIR/indices/override.$CODENAME.local.src