+ Slightly change the output naming of the disc images to make it safer

to produce more then one type of multi-arch disc
This commit is contained in:
Steve McIntyre 2006-12-30 15:13:07 +00:00
parent cd48ec7761
commit 55f4db876a
2 changed files with 5 additions and 6 deletions

2
debian/changelog vendored
View File

@ -215,6 +215,8 @@ debian-cd (3.0.0) UNRELEASED; urgency=low
exclude groups of related packages), and EXCLUDE<m> should be used in exclude groups of related packages), and EXCLUDE<m> should be used in
preference to EXCLUDE for packages that are just being shifted to preference to EXCLUDE for packages that are just being shifted to
later in the set by using UNEXCLUDE<n>. later in the set by using UNEXCLUDE<n>.
+ Slightly change the output naming of the disc images to make it safer
to produce more then one type of multi-arch disc
[ Joey Hess ] [ Joey Hess ]
* Added an update-tasks target to the Makefile and moved the code out of * Added an update-tasks target to the Makefile and moved the code out of

View File

@ -64,11 +64,8 @@ do
relname=`echo $DEBVERSION | sed -e 's/[. ]//g'` relname=`echo $DEBVERSION | sed -e 's/[. ]//g'`
DISKINFO=`cat $DIR/$n.diskinfo` DISKINFO=`cat $DIR/$n.diskinfo`
if [ $NUM_ARCHES = 1 ] ; then ARCHLIST=`echo "$ARCHES" | tr ' ' '-'`
OUTFILE="${CDNAME:-debian}-$relname-$ARCHES-$DISKTYPE-$n" OUTFILE="${CDNAME:-debian}-$relname-$ARCHLIST-$DISKTYPE-$n"
else
OUTFILE="${CDNAME:-debian}-$relname-MULTI-$DISKTYPE-$n"
fi
# Clean up any old files # Clean up any old files
rm -f $OUT/$OUTFILE.iso $OUT/$OUTFILE.jigdo $OUT/$OUTFILE.template rm -f $OUT/$OUTFILE.iso $OUT/$OUTFILE.jigdo $OUT/$OUTFILE.template