Backport fix from master: always use -J with --joliet-long

debian/changelog

@@ -7,6 +7,7 @@ debian-cd (3.1.21-stretch) UNRELEASED; urgency=medium
     + Fix for update-cd: Add SHA256 checksums to Packages files for update images
     + Make tools/update_popcon exit with errors when it fails
     + Make tools/update_popcon deal with https on popcon.d.o
+    + Ensure that in all places where we use -J we also use --joliet-long
 
  -- Steve McIntyre <93sam@debian.org>  Mon, 19 Jun 2017 13:39:58 +0100
 

tools/boot/stretch/boot-s390x

@@ -27,7 +27,6 @@ INSTALLDIR="install"
 
 # Exit if this is not CD#1/DVD#1
 if [ $N != "1" ]; then
-    add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
     add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
     add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-l"
     exit 0
@@ -100,5 +99,4 @@ perl -e "print pack('N', -s '$imagedir/root.bin')" >"$imagedir/root.siz"
 cp $BASEDIR/data/$CODENAME/$ARCH/README.boot "boot$N/"
 
 # Include the boot$N/-tree into the iso-image
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
 add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"

tools/set_mkisofs_opts

@@ -16,18 +16,23 @@ OPTS=
 
 case "$ARCH" in
   i386) 
-    OPTS="-J"
+    OPTS="-J --joliet-long"
     ;;
   amd64) 
-    OPTS="-J"
+    OPTS="-J --joliet-long"
     ;;
   alpha)
-    OPTS="-J"
+    OPTS="-J --joliet-long"
+    ;;
+  arm*)
+    OPTS="-J --joliet-long"
+    ;;
+  s390*)
+    OPTS="-J --joliet-long"
     ;;
   *)
-    #No options by default
+    #No options by default - don't know about other arches
     ;;
 esac
 
 echo -n "$OPTS "
-

update-cd

@@ -158,7 +158,7 @@ make_cd () {
 
     if [ $JTE = 1 ] ; then
 	set +e
-        ${MKISOFS} -J -r -V "Debian $VER update $TYPEUP" -o \
+        ${MKISOFS} -J --joliet-long -r -V "Debian $VER update $TYPEUP" -o \
             ${ISODIR}/${BASENAME}.iso \
             -jigdo-jigdo ${JIGDODIR}/${BASENAME}.jigdo \
             -jigdo-template ${JIGDODIR}/${BASENAME}.template \
@@ -200,7 +200,7 @@ make_cd () {
         mv ${JIGDODIR}/${BASENAME}.jigdo.gz ${JIGDODIR}/${BASENAME}.jigdo
     else
 	set +e
-        ${MKISOFS} -J -r -V "Debian $VER update $TYPEUP" -o \
+        ${MKISOFS} -J --joliet-long -r -V "Debian $VER update $TYPEUP" -o \
             $OUT/iso-$TYPE/${BASENAME}.iso \
             $UPD/CD$CDNUM 2>&1 | grep "extents written"
 	if [ $? -ne 0 ] ; then