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

[Michael Hudson-Doyle]

remove most code to do with making source ISOs

[Steve Langasek (vorlon)]

looks like there are still some references to 'src' and 'source' here that ought to be cleaned up as part of this merge.

$ grep -li src * 2>/dev/null
Makefile
README
$

review: Needs Fixing

[Michael Hudson-Doyle (mwhudson)]

Yes fair. I took a rather extreme approach for the README, hope that's ok.

[Michael Hudson-Doyle (mwhudson)]

So my initial commit got merged despite the needs fixing review? In any case I've just updated this to remove some more references.

[Steve Langasek (vorlon)]

On Sun, Feb 11, 2024 at 08:35:58PM -0000, Michael Hudson-Doyle wrote:

> So my initial commit got merged despite the needs fixing review? In any
> case I've just updated this to remove some more references.

Oops! Terrible local review workflow, sorry.

I'll follow through on this now

[Steve Langasek (vorlon)]

Yes fair. I took a rather extreme approach for the README, hope that's ok.

> --- a/README
> +++ /dev/null

lol ok fair

[Steve Langasek (vorlon)]

review: Approve

diff --git a/Makefile b/Makefile
index e8bc4b3..021bb6c 100644
--- a/Makefile
+++ b/Makefile
@@ -48,16 +48,10 @@ endif
 ifndef BINDISKINFO
 export BINDISKINFO="$(CAPPROJECT)$(CAPSUBPROJECT) $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) $(FULLARCH) ($$DATE)"
 endif
-ifndef SRCDISKINFO
-export SRCDISKINFO="$(CAPPROJECT)$(CAPSUBPROJECT) $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) Source-$$num ($$DATE)"
-endif
 # ND=No-Date versions for README
 ifndef BINDISKINFOND
 export BINDISKINFOND="$(CAPPROJECT)$(CAPSUBPROJECT) $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) $(FULLARCH)"
 endif
-ifndef SRCDISKINFOND
-export SRCDISKINFOND="$(CAPPROJECT) $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) Source-$$num"
-endif
 ifndef BINVOLID
 ifeq ($(ARCH),powerpc)
 BINVOLID="$(CAPPROJECT) $(DEBVERSION) ppc"
@@ -72,9 +66,6 @@ else
 BINVOLID="$(CAPPROJECT) $(DEBVERSION) $(ARCH)"
 endif
 endif
-ifndef SRCVOLID
-SRCVOLID="$(CAPPROJECT) $(DEBVERSION) Source $$num"
-endif
 ifndef MKISOFS
 export MKISOFS=/usr/bin/mkisofs
 endif
@@ -103,12 +94,10 @@ endif
 ## Internal variables  
 apt=$(BASEDIR)/tools/apt-selection
 list2cds=$(BASEDIR)/tools/list2cds
-list2src=$(BASEDIR)/tools/list2src
 add_packages=$(BASEDIR)/tools/add_packages
 add_dirs=$(BASEDIR)/tools/add_dirs
 add_bin_doc=$(BASEDIR)/tools/add-bin-doc
 scanpackages=$(BASEDIR)/tools/scanpackages
-scansources=$(BASEDIR)/tools/scansources
 add_files=$(BASEDIR)/tools/add_files
 set_mkisofs_opts=$(BASEDIR)/tools/set_mkisofs_opts
 add_secured=$(BASEDIR)/tools/add_secured
@@ -202,16 +191,10 @@ PrintVars:
 	DATE=$${CDIMAGE_DATE:-`date +%Y%m%d`} ; \
 	echo BINDISKINFO: ; \
         echo $(BINDISKINFO) ; \
-	echo SRCDISKINFO: ; \
-        echo $(SRCDISKINFO) ; \
 	echo BINDISKINFOND: ; \
         echo $(BINDISKINFOND) ; \
-	echo SRCDISKINFOND: ; \
-        echo $(SRCDISKINFOND) ; \
 	echo BINVOLID: ; \
         echo $(BINVOLID) ; \
-	echo SRCVOLID: ; \
-        echo $(SRCVOLID) ; \
 
 default:
 	@echo "Please refer to the README file for more information"
diff --git a/README b/README
 deleted file mode 100644
index 3be8e05..0000000
--- a/README
+++ /dev/null
@@ -1,247 +0,0 @@
-YACS - Yet Another CD Script :-)
-================================
-(better known as debian-cd)
-
-Copyright 1999-2001 Rapha�l Hertzog <[e-mail]>
-This set of tools is licensed under the General Public License
-version 2 or any later version. You can find it in 
-/usr/share/common-licenses/GPL on a Debian GNU system.
-
-Thanks to Steve McIntyre <[e-mail]> for his
-work on slink_cd/debian_cd. Some ideas come from his script.
-
-Thanks to all the contributors on the debian-cd mailing list.
-
-What is needed?
-===============
-Software:
-- the apt-get (>= 0.3.11.1) tool
-- apt-utils (for apt-ftparchive)
-- perl (>= 5.004)
-- bash (or another POSIX shell)
-- make
-- mkisofs/mkhybrid (mkisofs also provides the isoinfo binary used by the
-  Pseudo Image Kit)
-- the perl Digest::MD5 module
-- lynx (for text version of README.html) and todos from sysutils
-  to convert docs to DOS format (although you can rip that out, too)
-Other:
-- lots of free space on your disks
-- a Debian mirror, on a partition where you can write.
-  If you can't write on it then you may try to use a symlink farm,
-  but it's not the recommended way to build Debian CDs.
-
-
-		-------------------------------
-		- GENERATING DEBIAN CD IMAGES -
-		-------------------------------
-
-
-For the people that don't have time, here's the quick explanation:
-==================================================================
-
-Edit the CONF.sh and change the PATHs for the mirror and so on.
-$ sensible-editor CONF.sh
-$ . CONF.sh
-$ make distclean
-$ make apt-setup
-$ make list COMPLETE=1 SIZELIMIT1=625000000 SRCSIZELIMIT=665000000
-$ make official_images
-[ alternatively, if you only want binary images:
-  $ make bin-official_images ]
-
-However, you really should consider reading further for more information.
-You can also take a look at build_all.sh for an automatized way of building
-CD images.
-
-How to build a CD set - step by step
-====================================
-
-If you haven't already, change to the /usr/share/debian-cd/ directory.
-
-The process of building a CD is composed of the following steps:
-
-- first configure what is needed in CONF.sh and source it in your shell:
-
-    $ . CONF.sh
-
-  The exported environment variables will be used by all the
-  tools involved here (Makefiles, perl scripts, shell scripts).
-
-  If you want to build CD images for more than one arch, you will
-  have to build them one after the other (you may use a shell
-  script for this).
-
-  Note that the temporary dir must be on the same device than the
-  mirror because debian-cd uses hardlinks for generating an image 
-  tree. If you can't do this, you'll have to use the symlink farm.
-  The symlink farm is explained at the end of this README.
-
-  Keep in mind that the environment variables will stay in the
-  environment after your debian-cd run, and may interfere with
-  other program using the same variables (e.g. kernel-package).
-  So if you want to be 100% safe, run debian-cd in a
-  separate shell that you can leave after you're done.
-  
-- then we clean everything that may still be there from previous runs:
-
-    $ make distclean
-
-- now we'll check if your mirror is ok (with good Packages files):
-
-    $ make mirrorcheck
-
-- then we initialize the temporary directory used for the build:
-
-    $ make apt-setup
-
-- now you can decide what you want on your CDs
-
-    $ make list TASK=tasks/debian-2.2 COMPLETE=1
-
-  or
-
-    $ make list TASK=tasks/gnome COMPLETE=0 SIZELIMIT=576716800
-
-  or
-
-    $ export NONFREE=1; make list TASK=tasks/your-task-here COMPLETE=1
-
-  or for something like an official image (without non-free) :
-
-    $ make list COMPLETE=1 SIZELIMIT1=576716800
-
-  .... take a look at the file tasks/* to see the options you can have :)
-  
-  You can change the behaviour of this command with the following
-  variables:
-  - if NONFREE is set, then packages from non-free will be allowed
-    (NONFREE must be exported to all sub-shells)
-  - if EXTRANONFREE is set, then non-free packages will be included
-    on an extra CD (the last CD in fact). Don't use NONFREE and
-    EXTRANONFREE at the same time !
-    (EXTRANONFREE must be exported to all sub-shells)
-  - if COMPLETE is set, all packages that are not listed in the
-    selected task file will be included at the end
-  - if SIZELIMIT is set, it will be used as the maximum size that
-    we can put into each CD
-  - if SIZELIMIT<X> (with <X> beeing a integer) is set, it will be used 
-    as the maximum size of the X'th binary CD. SIZELIMIT<X> overrides
-    SIZELIMIT ...
-
-  This target calls the target "bin-list" can be used to build only binary
-  CDs.
-
-- it may be time to add the disks-arch stuff and to make the CDs bootable:
-
-    $ make bootable
-
-  This affects only the binary CDs.
-
-  Size calculation is imprecise for bootable CDs (usually the first CDs
-  in the set), so you may need to manually adjust SIZELIMIT* variables
-  to account for the size of the booting stuff used.
-
-- now, we'll add the binary packages to the temporary tree:
-
-    $ make packages
-
-- if you want to install additional files:
-
-    $ make bin-extras CD=1 ROOTSRC=/home/ftp/ DIR=goodies/wordperfect
-    $ make src-extras CD=3 ROOTSRC=/home/ftp/ DIR=goodies/kernel-2.3
-
-  The first will copy /home/ftp/goodies/wordperfect/ to the first binary
-  CD. It will be in <root of the cd>/goodies/wordperfect/. You can call
-  make extras multiple times if you need more.
-
-  Please note that the files to be copied should be on the same partition
-  than your mirror (unless you use a symlink farm).
-
-  If you want to do customize your CD even more, you can use the hook
-  system. Read more about that below.
-
-- We can add an md5sum.txt file on each CD to enable users to check their
-  files:
-
-    $ make md5list
-
-  This calls the targets 'bin-md5list' and 'src-md5list'. You can
-  choose to call only bin-md5list if you're building only binary images.
-
-- now we can create the images:
-
-    $ make images
-
-  If you don't have enough space for all images, you can generate 
-  only one image (of the second binary CD for example) with:
-
-    $ make bin-image CD=2
-
-  Of course if you want to build all binary images you'll use:
-
-    $ make bin-images
-
-  Note: here we use "make images", but you could as well use
-  "make official_images" since the latter is the same as the former
-  with some dependencies on targets that you already launched
-  (make bootable packages sources).
-
-- if you want to generate a MD5SUMS file with the md5sums of the
-  images you can do it with:
-
-    $ make imagesums
-
-
-Official images
-===============
-
-If you use make official_images you're building CD images that have
-the same properties than official CD images but they still doesn't
-have the name of "Official Images". The name of the images is given
-by setting the OFFICIAL and DEBVERSION environment variable (check
-CONF.sh). 
-
-Please never ever use the "Official" name for a CD image that you
-built yourself. The only images that can be called "Official" are the
-ones built by Debian itself and which are provided on Debian's
-servers.
-
-The default configuration shipped with this package will automatically
-name the images "Unofficial". CD will work exactly in the same way
-with all Debian tools, only the label is different. That means you
-can use build_all.sh to build your "Unofficial" images without modifying
-anything.
-
-
-Additional targets
-==================
-
-Image format
-------------
-
-You may want to generate images in ISO 9660 or raw formats.
-
-Set the IMAGE_FORMAT variable in CONF.sh.  You can choose "iso" for generation
-of .iso (default), or "img" for generation of raw images.
-
-
-About the symlink farm
-======================
-
-If you don't have write access on the disk where you have the mirror
-or if for another reason hardlink cannot be used, you can try to
-use a symlink farm. Instead of having real files, your temporary tree
-will be filled with symlinks that mkhybrid will change into files when
-it will build the image. You'll need to use a special options. You
-have 2 lines of options in CONF.sh as examples.
-
-I've never tested the symlink farm ... it may well generate unusable
-images. Don't use it for ISO images that will used by many users.
-
-Note that you will also need a patched mkhybrid that does support the
--F option. Have a look here about it :
-http://www.chiark.greenend.org.uk/~stevem/DebianCD/
-
-The mkhybrid package in Debian does support this -F option since 
-potato (Debian 2.2).
diff --git a/build_all.sh b/build_all.sh
index b3cedc3..8a7686d 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Script to build everything possible : sources and binaries for all archs
+# Script to build images for all archs
 
 . ./CONF.sh
 
@@ -48,11 +48,10 @@ do
         fi
         SIZE_ARGS="$SIZE_ARGS SIZELIMIT${CD}=$FULL_SIZE"
 	done
-    FULL_SIZE=`echo "($DEFSRCSIZE - $size) * 1024 * 1024" | bc`
 	echo " ... building the images"
-	make bin-list $SIZE_ARGS SRCSIZELIMIT=$FULL_SIZE
+	make bin-list $SIZE_ARGS
 	export OUT=$TMP_OUT/$FULLARCH; mkdir -p $OUT
-	make bin-official_images $SIZE_ARGS SRCSIZELIMIT=$FULL_SIZE
+	make bin-official_images $SIZE_ARGS
 	if [ $? -gt 0 ]; then
 		echo "ERROR WHILE BUILDING OFFICIAL IMAGES !!" >&2
 		if [ "$ATTEMPT_FALLBACK" = "yes" ]; then