Merge ~mwhudson/debian-cd/+git/ubuntu:no-jigdo into ~ubuntu-cdimage/debian-cd/+git/ubuntu:main

[Michael Hudson-Doyle]

Remove -checksum_algorithm_iso from xorriso command line

Slightly surprisingly from the name, these are related to xorriso's
jigdo support which is not enabled in newer releases and thus cause the
xorriso invocations to fail.

[Steve Langasek (vorlon)]

> thus cause the xorriso invocations to fail.

Please point to a log showing this, as far as I know all image builds are succeeding?

[Steve Langasek (vorlon)]

review: Needs Information

[Steve Langasek (vorlon)]

Also, further down we have:

case $DIST in
  bionic|focal)
    # temporary hack until such time as we can upgrade all builds to 1.4.2
    new_xorriso="/home/cdimage/xorriso/xorriso-1.2.4/xorriso/xorriso"
    if [ -x "$new_xorriso" ]; then
      export amd64_MKISOFS="$new_xorriso"
      export arm64_MKISOFS="$new_xorriso"
    fi
    ;;

And on the new server, it's:

cdimage@cdimage-master:~/cdimage/www/full$ ls /home/cdimage/xorriso/xorriso-1.2.4/xorriso/xorriso
ls: cannot access '/home/cdimage/xorriso/xorriso-1.2.4/xorriso/xorriso': No such file or directory

So are any of these variables doing anything at all?

[Steve Langasek (vorlon)]

oops, wait, that's only on bionic and focal and we don't do daily builds of either of those anymore (last used 20230316 for the point release)

[Michael Hudson-Doyle (mwhudson)]

This comes from trying to run ubuntu-cdimage on my (mantic) laptop. It's not affecting production afaik.

[Steve Langasek (vorlon)]

thanks for clarifying

review: Approve

diff --git a/CONF.sh b/CONF.sh
index b005f88..5cd4d6e 100644
--- a/CONF.sh
+++ b/CONF.sh
@@ -228,11 +228,11 @@ export UPDATES=1
 # that will burn correctly onto a CD and also can be written raw to a
 # USB stick. xorriso 0.6.5 and later has working support for this.
 export i386_MKISOFS="xorriso"
-export i386_MKISOFS_OPTS="-as mkisofs -r -checksum_algorithm_iso md5,sha1"
+export i386_MKISOFS_OPTS="-as mkisofs -r"
 export amd64_MKISOFS="xorriso"
-export amd64_MKISOFS_OPTS="-as mkisofs -r -checksum_algorithm_iso md5,sha1 -iso-level 3"
+export amd64_MKISOFS_OPTS="-as mkisofs -r -iso-level 3"
 export arm64_MKISOFS="xorriso"
-export arm64_MKISOFS_OPTS="-as mkisofs -r -checksum_algorithm_iso md5,sha1"
+export arm64_MKISOFS_OPTS="-as mkisofs -r"
 
 case $DIST in
   bionic|focal)