Merge lp:~ubuntu-cdimage/debian-cd/rebased-cleanup into lp:~ubuntu-cdimage/debian-cd/ubuntu

[Łukasz Zemczak]

Rebase xnox's lp:~xnox/debian-cd/cleanup branch on hirsute, as we already released groovy as-is.

Rebase xnox's lp:~xnox/debian-cd/cleanup branch on hirsute, as we already released groovy as-is.

As mentioned, this is a hirsute rebase of https://code.launchpad.net/~xnox/debian-cd/cleanup/+merge/386101.

Full list of changes per original commits:

    groovy: drop ltsp.seed, removed from archive.

    make: also drop bin-doc, also copies unused pics, and nothing else

    make: stop generating unused README.diskdefines
    I'm not even sure what it is, but I think it's a debian only thing.

    make: stop installing pics, for README.html that was not installed since 2015
    So in 2015, installation of debian documentation was removed from
    Makefile. But the pictures, used by not-installed README.html.in, were
    still copied to the ISOs.
    So stop copying unused pics/ into all of our ISOs.

    make: do not create empty /install dir
    boot-* scripts in all releases `mkdir -p install` anyway, and on
    groovy this directly is now empty, and thus should not be created.

    groovy: drop trying to install obsolete installation-guide.

    groovy: remove app-install.sh, last used in 8.04 by edubuntu for addon disks.

    groovy: drop cdromupgrade upgrade.sh script, alternative ISOs are not built anymore.

    groovy: drop add_layerfs_path_opt, unused.

    groovy: drop list_kernel_abis & check_kernel_sync, unused.

[Łukasz Zemczak (sil2100)]

I checked the changes more or less and they seem to be all good. If no one objects, I'll merge and deploy this next week.

[Łukasz Zemczak (sil2100)]

Ok, no comments from anyone - I'll merge it as is.

=== modified file 'Makefile'
--- Makefile	2020-06-25 13:28:04 +0000
+++ Makefile	2020-12-11 12:21:14 +0000
@@ -664,24 +664,6 @@
 		num=$${i%%.packages}; num=$${num##$(BDIR)/}; \
 		dir=$(BDIR)/CD$$num; \
 		echo -n $(BINDISKINFO) | sed 's/_NONUS//g' > $$dir/.disk/info; \
-		echo '#define DISKNAME ' $(BINDISKINFOND) | sed 's/_NONUS//g' \
-					> $$dir/README.diskdefines; \
-		echo '#define TYPE  binary' \
-					>> $$dir/README.diskdefines; \
-		echo '#define TYPEbinary  1' \
-					>> $$dir/README.diskdefines; \
-		echo '#define ARCH ' $(ARCH) \
-					>> $$dir/README.diskdefines; \
-		echo '#define ARCH'$(ARCH) ' 1' \
-					>> $$dir/README.diskdefines; \
-		echo '#define DISKNUM ' $$num | sed 's/_NONUS//g' \
-					>> $$dir/README.diskdefines; \
-		echo '#define DISKNUM'$$num ' 1' | sed 's/_NONUS//g' \
-					>> $$dir/README.diskdefines; \
-		echo '#define TOTALNUM ' $$nb \
-					>> $$dir/README.diskdefines; \
-		echo '#define TOTALNUM'$$nb ' 1' \
-					>> $$dir/README.diskdefines; \
 		echo -n $(BINVOLID) > $(BDIR)/$${num}.volid; \
 		$(set_mkisofs_opts) bin $$num > $(BDIR)/$${num}.mkisofs_opts; \
 	done
@@ -695,24 +677,6 @@
 		num=$${i%%.sources}; num=$${num##$(SDIR)/}; \
 		dir=$(SDIR)/CD$$num; \
 		echo -n $(SRCDISKINFO) | sed 's/_NONUS//g' > $$dir/.disk/info; \
-		echo '#define DISKNAME ' $(SRCDISKINFOND) | sed 's/_NONUS//g' \
-					> $$dir/README.diskdefines; \
-		echo '#define TYPE  source' \
-					>> $$dir/README.diskdefines; \
-		echo '#define TYPEsource  1' \
-					>> $$dir/README.diskdefines; \
-		echo '#define ARCH ' $(ARCH) \
-					>> $$dir/README.diskdefines; \
-		echo '#define ARCH'$(ARCH) ' 1' \
-					>> $$dir/README.diskdefines; \
-		echo '#define DISKNUM ' $$num | sed 's/_NONUS//g' \
-					>> $$dir/README.diskdefines; \
-		echo '#define DISKNUM'$$num ' 1' | sed 's/_NONUS//g' \
-					>> $$dir/README.diskdefines; \
-		echo '#define TOTALNUM ' $$nb \
-					>> $$dir/README.diskdefines; \
-		echo '#define TOTALNUM'$$nb ' 1' \
-					>> $$dir/README.diskdefines; \
 		echo -n $(SRCVOLID) > $(SDIR)/$${num}.volid; \
 		$(set_mkisofs_opts) src $$num > $(SDIR)/$${num}.mkisofs_opts; \
 	done
@@ -922,33 +886,12 @@
 	done
 	$(Q)touch $(BDIR)/bootable-stamp
 
-# Add the doc files to the CDs and the Release-Notes and the
-# Contents-$(ARCH).gz files
-bin-doc: ok bin-infos $(MIRROR)/doc $(BDIR)/CD1/doc
-$(BDIR)/CD1/doc:
-	@echo "Adding the documentation (bin) ..."
-	mkdir -p $(BDIR)/$$DISK/doc
-	$(Q)$(add_bin_doc) # Common stuff for all disks
-
-src-doc: ok src-infos $(SDIR)/CD1/README.html
-$(SDIR)/CD1/README.html:
-	@echo "Adding the documentation (src) ..."
-	$(Q)set -e; \
-	 for i in $(SDIR)/*.sources; do \
-		dir=$${i%%.sources}; \
-		dir=$${dir##$(SDIR)/}; \
-		dir=$(SDIR)/CD$$dir; \
-		mkdir -p $$dir/pics ; \
-		cp $(BASEDIR)/data/pics/*.* $$dir/pics/ ; \
-	done
-
 # Add the install stuff on the first CD
-installtools: ok bin-doc disks $(BDIR)/CD1/install
+installtools: ok bin-infos disks $(BDIR)/CD1/install
 $(BDIR)/CD1/install:
 	@echo "Adding install tools and documentation ..."
 	$(Q)set -e; \
 	 for DISK in $(FIRSTDISKS) ; do \
-		mkdir $(BDIR)/$$DISK/install ; \
 		if [ -x "$(BASEDIR)/tools/$(CODENAME)/installtools.sh" ]; then \
 			$(BASEDIR)/tools/$(CODENAME)/installtools.sh $(BDIR)/$$DISK ; \
 		fi ; \
@@ -1437,7 +1380,7 @@
 # Little trick to simplify things
 official_images: bin-official_images src-official_images
 bin-official_images: ok bootable upgrade app-install bin-images
-src-official_images: ok src-doc src-images
+src-official_images: ok src-infos src-images
 
 $(CODENAME)_status: ok init
 	@echo "Using the provided status file for $(CODENAME)-$(ARCH) ..."

=== removed file 'data/hirsute/README.html.in'
=== removed file 'data/hirsute/preseed/ubuntu-mate/ltsp.seed'
=== removed file 'data/hirsute/preseed/ubuntu/ltsp.seed'
=== removed file 'data/hirsute/preseed/xubuntu/ltsp.seed'
=== removed file 'tools/add-bin-doc'
=== removed file 'tools/boot/hirsute/boot-amd64.calc'
=== removed file 'tools/boot/hirsute/boot-ppc64el.calc'
=== modified file 'tools/boot/hirsute/boot-s390x'
--- tools/boot/hirsute/boot-s390x	2020-10-23 15:26:45 +0000
+++ tools/boot/hirsute/boot-s390x	2020-12-11 12:21:14 +0000
@@ -16,7 +16,6 @@
 # $1 is the CD number
 # $2 is the temporary CD build dir
 
-# only add_mkisofs_opt used
 . $BASEDIR/tools/boot/$DI_CODENAME/common.sh
 
 set -e
@@ -42,12 +41,8 @@
 perl -e "print pack('N', 0x1000000)" > $CDDIR/boot/initrd.off
 perl -e "print pack('N', -s '$CDDIR/boot/initrd.ubuntu')" > $CDDIR/boot/initrd.siz
 
-# hm, but we don't use layerfs, do we?
-LAYERFS_PATH_OPT=$(add_layerfs_path_opt)
-CMDLINE="$LAYERFS_PATH_OPT --- quiet"
-
 # compute cmdline, store it in the name used in .ins & exec scripts
-echo "$CMDLINE" > $CDDIR/boot/parmfile.ubuntu
+echo "quiet --- " > $CDDIR/boot/parmfile.ubuntu
 
 # secondary top-level ubuntu.ins file was requested in
 # https://bugs.launchpad.net/ubuntu-cdimage/+bug/1536981/comments/6
@@ -56,8 +51,5 @@
 # generate QEMU-KVM boot image
 $BASEDIR/tools/gen-s390-cd-kernel.pl --initrd=$CDDIR/boot/initrd.ubuntu --kernel=$CDDIR/boot/kernel.ubuntu --cmdline="$CMDLINE" --outfile=$CDDIR/boot/ubuntu.ikr
 
-# add QEMU-KVM boot image
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-no-emul-boot -b boot/ubuntu.ikr"
-
-# enable Joliet
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
+# enable Joliet and add QEMU-KVM boot image
+echo -n " -J -no-emul-boot -b boot/ubuntu.ikr" >> $N.mkisofs_opts

=== modified file 'tools/boot/hirsute/common.sh'
--- tools/boot/hirsute/common.sh	2020-12-01 11:17:30 +0000
+++ tools/boot/hirsute/common.sh	2020-12-11 12:21:14 +0000
@@ -37,150 +37,4 @@
     esac
 }
 
-# This file provides some common code that is intented to be called
-# by the various boot-<arch> scripts.
-
-
-default_preseed() {
-    case $PROJECT in
-	ubuntu|ubuntukylin)
-	    DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu.seed'
-	    ;;
-	kubuntu)
-	    DEFAULT_PRESEED='file=/cdrom/preseed/kubuntu.seed'
-	    ;;
-	kubuntu-plasma5)
-	    DEFAULT_PRESEED='file=/cdrom/preseed/kubuntu-plasma5.seed'
-	    ;;
-	edubuntu)
-	    DEFAULT_PRESEED='file=/cdrom/preseed/edubuntu.seed'
-	    ;;
-	xubuntu)
-	    DEFAULT_PRESEED='file=/cdrom/preseed/xubuntu.seed'
-	    ;;
-	ubuntu-server)
-	    if [ "$CDIMAGE_LIVE" != 1 ]; then
-		DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-server.seed'
-	    fi
-	    ;;
-	ubuntu-mid)
-	    DEFAULT_PRESEED='file=/cdrom/preseed/mid.seed'
-	    ;;
-	ubuntu-netbook)
-	    DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-netbook.seed'
-	    ;;
-	jeos)
-	    DEFAULT_PRESEED='file=/cdrom/preseed/jeos.seed'
-	    ;;
-	ubuntustudio)
-	    DEFAULT_PRESEED='file=/cdrom/preseed/ubuntustudio.seed'
-	    ;;
-	mythbuntu)
-	    DEFAULT_PRESEED='file=/cdrom/preseed/mythbuntu.seed'
-	    ;;
-	lubuntu)
-	    DEFAULT_PRESEED='file=/cdrom/preseed/lubuntu.seed'
-	    ;;
-	ubuntu-gnome)
-	    DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-gnome.seed'
-	    ;;
-	ubuntu-mate)
-	    DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-mate.seed'
-	    ;;
-	ubuntu-budgie)
-	    DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-budgie.seed'
-	    ;;
-	*)
-	    DEFAULT_PRESEED=
-	    ;;
-    esac
-    if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
-	case $PROJECT in
-	    ubuntu|ubuntu-*)
-		;;
-	    *)
-		FRONTEND_BACKGROUND="FRONTEND_BACKGROUND=original"
-		DEFAULT_PRESEED="${DEFAULT_PRESEED:+$DEFAULT_PRESEED }$FRONTEND_BACKGROUND"
-		;;
-	esac
-    fi
-}
-
-default_language() {
-    case $PROJECT in
-	ubuntukylin)
-	    KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }locale=zh_CN keyboard-configuration/layoutcode?=cn"
-	    ;;
-    esac
-}
-
-list_kernel_abis() {
-    perl -le '
-	BEGIN { %images = map { $_ => 1 } @ARGV; $found = 0; %abis = (); }
-	while (<STDIN>) {
-	    chomp;
-	    if (/^[^[:space:]]/) {
-		$found = exists $images{$_};
-	    } elsif ($found and /^[[:space:]]+kernel-image-([^[:space:]]*)-di /) {
-		$abis{$1} = 1;
-	    }
-	}
-	END { print for sort keys %abis; }' "$@" <MANIFEST.udebs
-}
-
-check_kernel_sync() {
-    [ "$CDIMAGE_INSTALL_BASE" = 1 ] || return 0
-    for abi in $(sed -n 's/^kernel-image-\([^ ]*\)-di .*/\1/p'); do
-	# If any parameters were passed, then they represent a list of ABI
-	# suffixes we're interested in.
-	if [ "$#" -gt 0 ]; then
-	    local allowed=
-	    for allow_abi; do
-		case $abi in
-		    *-$allow_abi)
-			allowed=1
-			break
-			;;
-		esac
-	    done
-	    if [ -z "$allowed" ]; then
-		continue
-	    fi
-	fi
-	if ! grep -q -- "-$abi-di\$" list; then
-	    echo "debian-installer has kernel ABI $abi, but no corresponding udebs are on the CD!" >&2
-	    exit 1
-	fi
-    done
-}
-
-initrd_suffix() {
-    if zcat -t "$1" >/dev/null 2>&1; then
-	echo .gz
-    elif bzcat -t "$1" >/dev/null 2>&1; then
-	echo .bz2
-    # TODO: This only works if there is at least one dot in $1; fortunately
-    # this is currently always true.
-    elif lzcat -S ".${1##*.}" -t "$1" >/dev/null 2>&1; then
-	# .lzma would be more conventional, but we use .lz to avoid creating
-	# trouble for boot loaders that might need to read from 8.3
-	# filesystems without implementing support for long file names (e.g.
-	# syslinux on FAT USB sticks).
-	echo .lz
-    fi
-}
-
 HUMANPROJECT="$(echo "$CAPPROJECT" | sed 's/-/ /g')"
-
-# Add an option to the mkisofs options for this CD _only_ if it's not
-# already set. $1 is the opts file location, "$2" is the new
-# option. Call this with _logical groupings_ of options
-add_mkisofs_opt() {
-   OPTS_FILE=$1
-   NEW_OPT="$2"
-
-   if ! ( grep -q -- "$NEW_OPT" $OPTS_FILE 2>/dev/null) ; then
-       echo -n "$NEW_OPT " >> $OPTS_FILE
-   fi
-}
-

=== removed file 'tools/hirsute/app-install.sh'
=== modified file 'tools/hirsute/installtools.sh'
--- tools/hirsute/installtools.sh	2020-10-23 15:26:45 +0000
+++ tools/hirsute/installtools.sh	2020-12-11 12:21:14 +0000
@@ -1,45 +1,10 @@
 #!/bin/bash
 
-# Install files in /install and some in /doc
 set -e
 
 # The location of the tree for CD#1, passed in
 DIR=$1
 
-if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
-    DOCDIR=doc
-
-    if [ -n "$BOOTDISKS" -a -e $BOOTDISKS/current/$DOCDIR ] ; then
-            DOCS=$BOOTDISKS/current/$DOCDIR
-    elif MANUALDEB="$($BASEDIR/tools/apt-selection cache show "installation-guide-$ARCH")"; then
-            MANUALDEB="$(echo "$MANUALDEB" | grep ^Filename | awk '{print $2}')"
-    else
-            echo "WARNING: Using $DI_CODENAME bootdisk documentation"
-            DOCS=$MIRROR/dists/$DI_CODENAME/main/installer-$ARCH/current/$DOCDIR
-    fi
-
-    # Put the install documentation in /doc/install
-    if [ "$DOCS" ] && [ -d "$DOCS" ]; then
-        cd $DOCS
-        mkdir -p $DIR/$DOCDIR/install
-        if ! cp -a * $DIR/$DOCDIR/install; then
-            echo "ERROR: Unable to copy installer documentation to CD."
-        fi
-    elif [ "$MANUALDEB" ]; then
-        mkdir -p "$DIR/$DOCDIR/install/tmp" "$DIR/$DOCDIR/install/manual"
-        dpkg -x "$MIRROR/$MANUALDEB" "$DIR/$DOCDIR/install/tmp"
-        mv "$DIR/$DOCDIR/install/tmp/usr/share/doc/installation-guide-$ARCH"/* "$DIR/$DOCDIR/install/manual/"
-        rm -rf "$DIR/$DOCDIR/install/tmp"
-        # just keep the HTML version
-        rm -f "$DIR/$DOCDIR/install/manual/copyright" \
-            "$DIR/$DOCDIR/install/manual/changelog.gz" \
-            "$DIR/$DOCDIR/install/manual"/*/install.*.pdf* \
-            "$DIR/$DOCDIR/install/manual"/*/install.*.txt*
-    else
-        echo "ERROR: Unable to copy installer documentation to CD."
-    fi
-fi
-
 # Preseed files for special install types
 PRESEED_ROOT=$BASEDIR/data/$CODENAME/preseed
 for preseed_dir in \

=== removed file 'tools/hirsute/upgrade.sh'