contrib: Updated from setup.git/bullseye/.

Signed-off-by: Holger Levsen <holger@layer-acht.org>

contrib/CONF.sh

@@ -47,8 +47,8 @@ unset BASE_EXCLUDE      || true
 # Where I am (hoping I'm in the debian-cd dir)
 export BASEDIR=`pwd`
 
-# Building buster cd set ...
-export CODENAME=buster
+# Building bullseye cd set ...
+export CODENAME=bullseye
 
 if [ ! "$DI_CODENAME" ]
 then
@@ -150,26 +150,12 @@ export CONTRIB=1
 #export MKISOFS_OPTS="-joliet-long -jigdo-template-compress bzip2 -r -checksum_algorithm_iso md5,sha1,sha256,sha512" #-checksum_algorithm_iso md5,sha1"
 # export MKISOFS_OPTS="-r"		#For normal users
 # export MKISOFS_OPTS="-r -F ."	#For symlink farmers
-if [ $(which xorriso)""x = "/usr/bin/xorriso"x ]; then
 export MKISOFS="xorriso"
-else
-    export MKISOFS="/home/93sam/xorriso"
-fi
-export MKISOFS_OPTS="-as mkisofs -r -checksum_algorithm_iso md5,sha1,sha256,sha512"
+export MKISOFS_OPTS="-as mkisofs -r -checksum_algorithm_iso sha256,sha512"
 
-# Override for i386,amd64,multi to use xorriso.
-# BE AWARE: for multi-arch the order of the arches here will have to
-# match the order they're declared in the build
-#export i386_MKISOFS="/home/93sam/xorriso"
-#export i386_MKISOFS_OPTS="-as mkisofs -r -checksum_algorithm_iso md5,sha1,sha256,sha512"
-#export amd64_MKISOFS="/home/93sam/xorriso"
-#export amd64_MKISOFS_OPTS="-as mkisofs -r -checksum_algorithm_iso md5,sha1,sha256,sha512"
-#export amd64_i386_MKISOFS="/home/93sam/xorriso"
-#export amd64_i386_MKISOFS_OPTS="-as mkisofs -r -checksum_algorithm_iso md5,sha1,sha256,sha512"
-#export i386_amd64_source_MKISOFS="/home/93sam/xorriso"
-#export i386_amd64_source_MKISOFS_OPTS="-as mkisofs -joliet-long -r -checksum_algorithm_iso md5,sha1,sha256,sha512"
+# Override specifically for powerpc builds
 export powerpc_MKISOFS="$BASEDIR/../genisoimage"
-export powerpc_MKISOFS_OPTS="-joliet-long -jigdo-template-compress bzip2 -r -checksum_algorithm_iso md5,sha1,sha256,sha512" #-checksum_algorithm_iso md5,sha1"
+export powerpc_MKISOFS_OPTS="-joliet-long -jigdo-template-compress bzip2 -r -checksum_algorithm_iso sha256,sha512" #-checksum_algorithm_iso md5,sha1"
 
 # ISOLinux support for multiboot on CD1 for i386
 export ISOLINUX=1
@@ -213,7 +199,7 @@ export NORECOMMENDS=0
 # package on the CD.  The default is 'true'.
 #export NOSUGGESTS=1
 
-# Set to 1 to generate MD5 and SHA1 sums for generated images
+# Set to 1 to generate checksum files for generated images
 export IMAGESUMS=1
 
 # We may have to extract files from packages to put them onto the CD

contrib/HEADER.html.in

@@ -245,10 +245,10 @@ cpp.
    <h2>How can I verify my download is correct and exactly what has
    been created by Debian?</h2>
 
-   <p>There are files here (SHA1SUMS, SHA256SUMS, etc.) which contain
-   checksums of the images. These checksum files are also signed - see
-   SHA1SUMS.sign, SHA256SUMS.sign, etc. Once you've downloaded an image,
-   you can check:</p>
+   <p>There are files here (SHA512SUMS, etc.) which contain checksums
+   of the images. These checksum files are also signed - see the
+   matching .sign files. Once you've downloaded an image, you can
+   check:</p>
 
    <ul>
       <li>that its checksum matches that expected from the checksum file; and

contrib/common.sh

@@ -88,9 +88,11 @@ build_finished () {
     fi
     case $BUILDNAME in
 	*FIRMWARE*)
+	    mkdir -p $PUBDIRJIG-firmware/$ARCH
 	    cp log/$logfile $PUBDIRJIG-firmware/$ARCH/$BUILDNAME.log
 	    ;;
 	*)
+	    mkdir -p $PUBDIRJIG/$ARCH
 	    cp log/$logfile $PUBDIRJIG/$ARCH/$BUILDNAME.log
 	    ;;
     esac

contrib/cronjob.weekly-live

@@ -109,7 +109,7 @@ if [ "$NOOPENSTACK"x = ""x ] ; then
 	rm -rf ${LIVE_OUT}/new/openstack-${CODENAME}
 	mkdir -p ${LIVE_OUT}/new/openstack-${CODENAME}
 	mv -v ${LIVE_OUT}/new/openstack-${CODENAME}-*/*.* ${LIVE_OUT}/new/openstack-${CODENAME}
-	for SUM in MD5 SHA1 SHA256 SHA512; do
+	for SUM in SHA256 SHA512; do
 	    cat ${LIVE_OUT}/new/openstack-${CODENAME}-*/${SUM}SUMS > ${LIVE_OUT}/new/openstack-${CODENAME}/${SUM}SUMS
 	done
 	if [ "$RELEASE_BUILD"x = ""x ] ; then

contrib/images4testing_d-i

@@ -1,2 +1,2 @@
-DI_DIST=buster
+DI_DIST=bullseye
 DI_CODENAME=$DI_DIST

contrib/merge-sums

@@ -20,11 +20,9 @@ for DIR in $1/*/*-*; do
     cd $DIR
     CHECK=`ls -al *SUMS.* 2>/dev/null`
     if [ "$CHECK"x != ""x ] ; then
-        cat MD5SUMS.* | sort -k2 | uniq > MD5SUMS
-        cat SHA1SUMS.* | sort -k2 | uniq > SHA1SUMS
         cat SHA256SUMS.* | sort -k2 | uniq > SHA256SUMS
         cat SHA512SUMS.* | sort -k2 | uniq > SHA512SUMS
-        for ISOFILE in `cat MD5SUMS SHA1SUMS | awk '{print $2}'`; do
+        for ISOFILE in `cat SHA256SUMS | awk '{print $2}'`; do
             JIGDOFILE=${ISOFILE%iso}jigdo
             TEMPLATEFILE=${ISOFILE%iso}template
             if [ ! -e $ISOFILE ] && [ ! -e $JIGDOFILE ] && [ ! -e $TEMPLATEFILE ] ; then

contrib/settings.sh

@@ -1,6 +1,6 @@
 export HOSTNAME=`hostname -f`
 
-export CODENAME=buster
+export CODENAME=bullseye
 export OUT_BASE=~/publish
 export CD_I_F=${OUT_BASE}/unofficial/non-free/images-including-firmware
 export TRACE=/srv/cdbuilder.debian.org/src/ftp/debian/project/trace/$(hostname).debian.org
@@ -17,7 +17,7 @@ if [ "$DATE"x = ""x ] ; then
 fi
 
 if [ "$ARCHES"x = ""x ] ; then
-    ARCHES="amd64 i386 multi-arch arm64 armhf armel source ppc64el mips mipsel mips64el s390x"
+    ARCHES="amd64 i386 multi-arch arm64 armhf armel source ppc64el mipsel mips64el s390x"
 fi
 
 if [ "$ARCHES_FIRMWARE"x = ""x ] ; then

debian/changelog

@@ -9,6 +9,7 @@ debian-cd (3.1.27) UNRELEASED; urgency=medium
 
   [ Holger Levsen ]
   * d/control: Bump standards version to 4.4.1, no changes needed.
+  * contrib: Updated from setup.git/bullseye/.
 
  -- Samuel Thibault <sthibault@debian.org>  Fri, 23 Aug 2019 21:51:50 +0200