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

[Michael Hudson-Doyle]

do not assume germination has run if GENERATE_POOL=0

[Steve Langasek (vorlon)]

how does *removing* a target dependency for the GENERATE_POOL=0 case translate to *not* assuming it's run?

review: Needs Information

[Michael Hudson-Doyle (mwhudson)]

Because I want to change the behaviour of ubuntu-cdimage such that we don't
run germinate at all in these cases, and "make bin-list" will fail if
germinate hasn't run. There are a bazillion ways to handle this of course...

On Tue, 14 May 2024, 17:20 Steve Langasek, <email address hidden>
wrote:

> Review: Needs Information
>
> how does *removing* a target dependency for the GENERATE_POOL=0 case
> translate to *not* assuming it's run?
> --
> https://code.launchpad.net/~mwhudson/debian-cd/+git/ubuntu/+merge/465999
> You are the owner of
> ~mwhudson/debian-cd/+git/ubuntu:no-germinate-no-binlist.
>
>

[Michael Hudson-Doyle (mwhudson)]

which is now proposed as https://code.launchpad.net/~mwhudson/ubuntu-cdimage/+git/ubuntu-cdimage-1/+merge/466006

diff --git a/Makefile b/Makefile
index dc7c183..3aad28e 100644
--- a/Makefile
+++ b/Makefile
@@ -342,7 +342,7 @@ $(BDIR)/rawlist-exclude:
 # Create all the needed directories for installing packages (plus the
 # .disk directory)
 tree: bin-tree
-bin-tree: ok bin-list $(BDIR)/CD1/ubuntu
+bin-tree: ok $(BDIR)/CD1/ubuntu
 $(BDIR)/CD1/ubuntu:
 	@echo "Adding the required directories to the binary CDs ..."
 	$(Q)set -e; \
@@ -362,7 +362,11 @@ $(BDIR)/CD1/.disk/info:
 	$(set_mkisofs_opts) bin 1 > $(BDIR)/$${num}.mkisofs_opts; \
 
 # Adding the deb files to the images
+ifeq ($(GENERATE_POOL),1)
 packages: bin-infos bin-list $(BDIR)/packages-stamp
+else
+packages: bin-infos $(BDIR)/packages-stamp
+endif
 $(BDIR)/packages-stamp:
 ifeq ($(GENERATE_POOL),1)
 	@echo "Current disk usage on the binary CDs (before the debs are added) :"