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

add support for excluding contrib.

This commit is contained in:
Tollef Fog Heen 2002-12-07 10:22:40 +00:00
parent deebd75f9f
commit 916440cf9a
4 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONF.sh
View File

@ -6,6 +6,7 @@
unset NONUS || true unset NONUS || true
unset FORCENONUSONCD1 || true unset FORCENONUSONCD1 || true
unset NONFREE || true unset NONFREE || true
unset CONTRIB || true
unset EXTRANONFREE || true unset EXTRANONFREE || true
unset LOCAL || true unset LOCAL || true
unset LOCALDEBS || true unset LOCALDEBS || true
@ -81,6 +82,9 @@ export APTTMP=/ftp/tmp/apt
# Do I want to have NONFREE merged in the CD set # Do I want to have NONFREE merged in the CD set
# export NONFREE=1 # export NONFREE=1
# Do I want to have CONTRIB merged in the CD set
export CONTRIB=1
# Do I want to have NONFREE on a separate CD (the last CD of the CD set) # Do I want to have NONFREE on a separate CD (the last CD of the CD set)
# WARNING: Don't use NONFREE and EXTRANONFREE at the same time ! # WARNING: Don't use NONFREE and EXTRANONFREE at the same time !
# export EXTRANONFREE=1 # export EXTRANONFREE=1

4
debian/changelog vendored
View File

@ -11,8 +11,10 @@ debian-cd (2.2.16) unstable; urgency=low
task mechanism, cf tasks/debian-installer for the current list) task mechanism, cf tasks/debian-installer for the current list)
* Added all files for sarge (in tasks/ data/ and tools/). * Added all files for sarge (in tasks/ data/ and tools/).
* Updated isolinux.bin from syslinux 1.75-1. * Updated isolinux.bin from syslinux 1.75-1.
* Make it possible to exclude contrib from the CDs. Useful if you only
have a mirror of main.
-- Raphael Hertzog <hertzog@debian.org> Thu, 10 Oct 2002 14:52:15 +0200 -- Tollef Fog Heen <tfheen@debian.org> Sat, 7 Dec 2002 10:58:53 +0100
debian-cd (2.2.15) unstable; urgency=low debian-cd (2.2.15) unstable; urgency=low

8
tools/apt-selection
View File

@ -28,10 +28,12 @@ options=" -q -o Dir::State::status=$APTTMP/$CODENAME-$ARCH/status \
-o APT::Cache::AllVersions=0 \ -o APT::Cache::AllVersions=0 \
-o APT::Architecture=$ARCH " -o APT::Architecture=$ARCH "
sections=main
if [ "${NONFREE:-0}" != "0" -o "${EXTRANONFREE:-0}" != "0" ]; then if [ "${NONFREE:-0}" != "0" -o "${EXTRANONFREE:-0}" != "0" ]; then
sections="main contrib non-free" sections="$sections non-free"
else fi
sections="main contrib" if [ "${CONTRIB:-0}" != "0" ]; then
sections="$sections contrib"
fi fi
# Check for the necessary dirs and files ... # Check for the necessary dirs and files ...

13
tools/scanpackages
View File

@ -13,12 +13,15 @@ BDIR=$TDIR/$CODENAME-$ARCH
PREFIX=`echo $2 | sed "s?$BDIR/CD?$BDIR/?"` PREFIX=`echo $2 | sed "s?$BDIR/CD?$BDIR/?"`
SECTIONS="main"
SECTIONSNONUS="non-US/main"
if [ "${NONFREE:-0}" != "0" -o "${EXTRANONFREE:-0}" != "0" ]; then if [ "${NONFREE:-0}" != "0" -o "${EXTRANONFREE:-0}" != "0" ]; then
SECTIONS="main contrib non-free" SECTIONS="${SECTIONS} non-free"
SECTIONSNONUS="non-US/main non-US/contrib non-US/non-free" SECTIONSNONUS="${SECTIONSNONUS} non-US/non-free"
else fi
SECTIONS="main contrib" if [ "${CONTRIB:-0}" != "0" ]; then
SECTIONSNONUS="non-US/main non-US/contrib" SECTIONS="${SECTIONS} contrib"
SECTIONSNONUS="${SECTIONSNONUS} non-US/contrib"
fi fi
if [ -n "$LOCAL" ]; then if [ -n "$LOCAL" ]; then