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

Make use of MAXISOS and MAXJIGDOS more consistent

This commit is contained in:
Frans Pop 2008-10-14 08:21:57 +00:00
parent 53a5657a7b
commit d48db452d6
4 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CONF.sh
View File

@ -43,6 +43,8 @@ unset BASE_INCLUDE || true
unset BASE_EXCLUDE || true unset BASE_EXCLUDE || true
unset INSTALLER_CD || true unset INSTALLER_CD || true
unset MAXCDS || true unset MAXCDS || true
unset MAXISOS || true
unset MAXJIGDOS || true
unset SPLASHPNG || true unset SPLASHPNG || true
unset OMIT_MANUAL || true unset OMIT_MANUAL || true
unset OMIT_RELEASE_NOTES || true unset OMIT_RELEASE_NOTES || true
@ -203,14 +205,12 @@ export NORECOMMENDS=1
export IMAGESUMS=1 export IMAGESUMS=1
# Produce iso/jigdo files: specify how many iso/jigdo files should be # Produce iso/jigdo files: specify how many iso/jigdo files should be
# produced in your set, or "ALL". Replaces the old "DOJIGDO" setting # produced in your set. If not set or when the value is "ALL" they will
# with something much more flexible # be created for all images. One of the variables can be set to zero if
if [ "$MAXISOS"x = ""x ] ; then # either iso or jigdo files are not wanted, but not both.
export MAXISOS="ALL" # Replaces the old "DOJIGDO" setting with something much more flexible.
fi #export MAXISOS=0
if [ "$MAXJIGDOS"x = ""x ] ; then #export MAXJIGDOS=0
export MAXJIGDOS="ALL"
fi
# HTTP/FTP URL for directory where you intend to make the templates # HTTP/FTP URL for directory where you intend to make the templates
# available. You should not need to change this; the default value "" # available. You should not need to change this; the default value ""

23
build.sh
View File

@ -56,15 +56,28 @@ if [ -z "$IMAGETARGET" ] ; then
fi fi
echo " ... building the images; using target(s) \"$IMAGETARGET\"" echo " ... building the images; using target(s) \"$IMAGETARGET\""
NUMISOS="up to $MAXISOS" if [ "$MAXISOS"x = ""x ] ; then
if [ "$MAXISOS"x = "all"x ] || [ "$MAXISOS"x = "ALL"x ] ; then export MAXISOS="ALL"
fi
if [ "$MAXJIGDOS"x = ""x ] ; then
export MAXJIGDOS="ALL"
fi
if [ "$MAXISOS" = "all" ] || [ "$MAXISOS" = "ALL" ] ; then
NUMISOS="all available" NUMISOS="all available"
elif [ "$MAXISOS" -eq 0 ] ; then
NUMISOS="no"
else
NUMISOS="up to $MAXISOS"
fi fi
NUMJIGDOS="up to $MAXJIGDOS" if [ "$MAXJIGDOS" = "all" ] || [ "$MAXJIGDOS" = "ALL" ] ; then
if [ "$MAXJIGDOS"x = "all"x ] || [ "$MAXJIGDOS"x = "ALL"x ] ; then
NUMJIGDOS="all available" NUMJIGDOS="all available"
elif [ "$MAXJIGDOS" -eq 0 ] ; then
NUMJIGDOS="no"
else
NUMJIGDOS="up to $MAXJIGDOS"
fi fi
echo "Building $NUMJIGDOS jigdos and $NUMISOS isos for $ARCH $DISKTYPE" echo "Building $NUMJIGDOS jigdos and $NUMISOS isos for $ARCHES $DISKTYPE"
make $IMAGETARGET make $IMAGETARGET

16
debian/CONF.sh vendored
View File

@ -43,6 +43,8 @@ unset BASE_INCLUDE || true
unset BASE_EXCLUDE || true unset BASE_EXCLUDE || true
unset INSTALLER_CD || true unset INSTALLER_CD || true
unset MAXCDS || true unset MAXCDS || true
unset MAXISOS || true
unset MAXJIGDOS || true
unset SPLASHPNG || true unset SPLASHPNG || true
unset OMIT_MANUAL || true unset OMIT_MANUAL || true
unset OMIT_RELEASE_NOTES || true unset OMIT_RELEASE_NOTES || true
@ -203,14 +205,12 @@ export NORECOMMENDS=1
export IMAGESUMS=1 export IMAGESUMS=1
# Produce iso/jigdo files: specify how many iso/jigdo files should be # Produce iso/jigdo files: specify how many iso/jigdo files should be
# produced in your set, or "ALL". Replaces the old "DOJIGDO" setting # produced in your set. If not set or when the value is "ALL" they will
# with something much more flexible # be created for all images. One of the variables can be set to zero if
if [ "$MAXISOS"x = ""x ] ; then # either iso or jigdo files are not wanted, but not both.
export MAXISOS="ALL" # Replaces the old "DOJIGDO" setting with something much more flexible.
fi #export MAXISOS=0
if [ "$MAXJIGDOS"x = ""x ] ; then #export MAXJIGDOS=0
export MAXJIGDOS="ALL"
fi
# HTTP/FTP URL for directory where you intend to make the templates # HTTP/FTP URL for directory where you intend to make the templates
# available. You should not need to change this; the default value "" # available. You should not need to change this; the default value ""

4
tools/make_image
View File

@ -70,12 +70,12 @@ do
date date
# Work out whether we want ISO, jigdo or both # Work out whether we want ISO, jigdo or both
if [ "$MAXISOS" = "all" ] || [ "$MAXISOS" = "ALL" ] || [ "$n" -le "$MAXISOS" ] ; then if [ "$MAXISOS"x = ""x ] || [ "$MAXISOS" = "all" ] || [ "$MAXISOS" = "ALL" ] || [ "$n" -le "$MAXISOS" ] ; then
ISO_WANTED=1 ISO_WANTED=1
else else
ISO_WANTED=0 ISO_WANTED=0
fi fi
if [ "$MAXJIGDOS" = "all" ] || [ "$MAXJIGDOS" = "ALL" ] || [ "$n" -le "$MAXJIGDOS" ] ; then if [ "$MAXJIGDOS"x = ""x ] || [ "$MAXJIGDOS" = "all" ] || [ "$MAXJIGDOS" = "ALL" ] || [ "$n" -le "$MAXJIGDOS" ] ; then
JIGDO_WANTED=1 JIGDO_WANTED=1
else else
JIGDO_WANTED=0 JIGDO_WANTED=0