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

Tweak the volume ID generation code to cope with longer arch names (e.g. freebsd arches)

This commit is contained in:
cd-builder user 2010-10-18 14:24:22 +00:00
parent eb308455ce
commit 2881090376
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/start_new_disc
View File

@ -26,22 +26,31 @@ CAPCODENAME=`perl -e "print ucfirst("$CODENAME")"`
NUM_ARCHES=`echo $ARCHES | wc -w` NUM_ARCHES=`echo $ARCHES | wc -w`
if [ "$VOLID_BASE"x = ""x ] ; then
VOLID_BASE="Debian $DEBVERSION"
fi
if [ $NUM_ARCHES = 1 ] ; then if [ $NUM_ARCHES = 1 ] ; then
case $ARCHES in case $ARCHES in
source) source)
SOURCEDISK=1 SOURCEDISK=1
export DISKINFO="Debian GNU/Linux $DEBVERSION \"$CAPCODENAME\" - $OFFICIAL $DISKTYPE Source-$DISKNUM $BUILD_DATE" export DISKINFO="Debian GNU/Linux $DEBVERSION \"$CAPCODENAME\" - $OFFICIAL $DISKTYPE Source-$DISKNUM $BUILD_DATE"
export VOLID="Debian $DEBVERSION Src-$DISKNUM" export VOLID="$VOLID_BASE Src-$DISKNUM"
export SOURCEONLY=yes export SOURCEONLY=yes
;; ;;
*) *)
BINARYDISK=1 BINARYDISK=1
export DISKINFO="Debian GNU/Linux $DEBVERSION \"$CAPCODENAME\" - $OFFICIAL $ARCHES $DISKTYPE Binary-$DISKNUM $BUILD_DATE" export DISKINFO="Debian GNU/Linux $DEBVERSION \"$CAPCODENAME\" - $OFFICIAL $ARCHES $DISKTYPE Binary-$DISKNUM $BUILD_DATE"
if [ $ARCHES = powerpc ] ; then case "$ARCHES" in
export VOLID="Debian $DEBVERSION ppc Bin-$DISKNUM" powerpc)
else export VOLID="$VOLID_BASE ppc Bin-$DISKNUM" ;;
export VOLID="Debian $DEBVERSION $ARCHES Bin-$DISKNUM" kfreebsd-i386)
fi export VOLID="$VOLID_BASE f-i386 Bin-$DISKNUM" ;;
kfreebsd-amd64)
export VOLID="$VOLID_BASE f-amd64 Bin-$DISKNUM" ;;
*)
export VOLID="$VOLID_BASE $ARCHES Bin-$DISKNUM" ;;
esac
;; ;;
esac esac
export ARCHDEF=$ARCHES export ARCHDEF=$ARCHES
@ -52,7 +61,7 @@ else
esac esac
export ARCHDEF=`echo $ARCHES | sed 's? ?/?g'` export ARCHDEF=`echo $ARCHES | sed 's? ?/?g'`
export DISKINFO="Debian GNU/Linux $DEBVERSION \"$CAPCODENAME\" - $OFFICIAL Multi-architecture $ARCHDEF $DISKTYPE #$DISKNUM $BUILD_DATE" export DISKINFO="Debian GNU/Linux $DEBVERSION \"$CAPCODENAME\" - $OFFICIAL Multi-architecture $ARCHDEF $DISKTYPE #$DISKNUM $BUILD_DATE"
export VOLID="Debian $DEBVERSION M-A $DISKNUM" export VOLID="$VOLID_BASE M-A $DISKNUM"
fi fi
echo "Starting new $ARCHDEF $DISKTYPE $DISKNUM at $CDDIR" echo "Starting new $ARCHDEF $DISKTYPE $DISKNUM at $CDDIR"