Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

For full CD/DVD builds, check that we have an "extra" override 

containing task info. If not, use the sid override instead.
This commit is contained in:
Steve McIntyre 2005-11-10 00:50:19 +00:00
parent 7017915ecf
commit d51c1b263c
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -57,7 +57,11 @@ debian-cd (2.2.24) UNRELEASED; urgency=low
* generate_di+k_list: Add hfsutils for powerpc; it's no longer in base but
yaboot-installer needs it.
-- Joey Hess <joeyh@debian.org> Sun, 6 Nov 2005 18:14:40 -0500
[ Steve McIntyre ]
* For full CD/DVD builds, check that we have an "extra" override
containing task info. If not, use the sid override instead.
-- Joey Hess <joeyh@debian.org> Wed, 10 Nov 2005 00:48:24 +0000
debian-cd (2.2.23) unstable; urgency=low

23
tools/scanpackages
View File

@ -164,7 +164,16 @@ for SECT in $SECTIONS; do
done
fi
done
# Creating the config files
# SAM 2005-11-01:
# Nasty hack - we may need to look at extra override files from sid.
# See if the extra override exists; if not redirect.
EXTRA_CODENAME=$CODENAME
if [ ! -e $BDIR/indices/override.$EXTRA_CODENAME.extra.main.gz ] ; then
EXTRA_CODENAME=sid
fi
cat >$PREFIX.generate-binary <<EOF
Dir::ArchiveDir "$2";
Dir::OverrideDir "$BDIR/indices";
@ -178,7 +187,7 @@ Tree "dists/$CODENAME" {
Architectures "$ARCH";
BinOverride "override.$CODENAME.\$(SECTION)";
ExtraOverride "override.$CODENAME.extra.\$(SECTION)";
ExtraOverride "override.$EXTRA_CODENAME.extra.\$(SECTION)";
SrcOverride "override.$CODENAME.\$(SECTION).src";
}
EOF
@ -195,7 +204,7 @@ Tree "dists/$CODENAME/non-US" {
Architectures "$ARCH";
BinOverride "override.$CODENAME.\$(SECTION)";
ExtraOverride "override.$CODENAME.extra.\$(SECTION)";
ExtraOverride "override.$EXTRA_CODENAME.extra.\$(SECTION)";
SrcOverride "override.$CODENAME.\$(SECTION).src";
}
EOF
@ -212,7 +221,7 @@ Tree "dists/$CODENAME/main" {
Architectures "$ARCH";
BinOverride "override.$CODENAME.main.\$(SECTION)";
ExtraOverride "override.$CODENAME.extra.main";
ExtraOverride "override.$EXTRA_CODENAME.extra.main";
SrcOverride "override.$CODENAME.main.src";
Packages::Extensions ".udeb";
}
@ -226,7 +235,7 @@ Tree "dists/$CODENAME/local" {
Architectures "$ARCH";
BinOverride "override.$CODENAME.local.\$(SECTION)";
ExtraOverride "override.$CODENAME.extra.local";
ExtraOverride "override.$EXTRA_CODENAME.extra.local";
SrcOverride "override.$CODENAME.local.src";
Packages::Extensions ".udeb";
}
@ -244,7 +253,7 @@ if [ ! -d "$BDIR/indices" ]; then
gunzip -f $BDIR/indices/*.gz
for SECT in $SECTIONS; do
touch $BDIR/indices/override.$CODENAME.$SECT
touch $BDIR/indices/override.$CODENAME.extra.$SECT
touch $BDIR/indices/override.$EXTRA_CODENAME.extra.$SECT
touch $BDIR/indices/override.$CODENAME.$SECT.src
done
if [ -e "$MIRROR/dists/$DI_CODENAME/main/debian-installer" ]; then
@ -252,7 +261,7 @@ if [ ! -d "$BDIR/indices" ]; then
fi
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.$EXTRA_CODENAME.extra.local
touch $BDIR/indices/override.$CODENAME.local.src
fi
fi
@ -262,7 +271,7 @@ if [ -n "$NONUS" -a ! -d "$BDIR/indices-non-US" ]; then
gunzip -f $BDIR/indices-non-US/*.gz
for SECT in `echo $SECTIONSNONUS | sed -e 's#non-US/##g'`; do
touch $BDIR/indices-non-US/override.$CODENAME.$SECT
touch $BDIR/indices-non-US/override.$CODENAME.extra.$SECT
touch $BDIR/indices-non-US/override.$EXTRA_CODENAME.extra.$SECT
touch $BDIR/indices-non-US/override.$CODENAME.$SECT.src
done
fi