debian-cd

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

  1. Git
  2. lp:~mwhudson/debian-cd/+git/ubuntu
  3. no-germinate-no-binlist
  4. Merge into main
Proposed by Michael Hudson-Doyle
Status: Merged
Merged at revision: 6c59ae677606f3aac1e9b2312e778c70cff87a0f
Proposed branch: ~mwhudson/debian-cd/+git/ubuntu:no-germinate-no-binlist
Merge into: ~ubuntu-cdimage/debian-cd/+git/ubuntu:main
Diff against target: 25 lines (+5/-1)
1 file modified
Makefile (+5/-1)
Reviewer Review Type Date Requested Status
Steve Langasek Needs Information
Review via email: mp+465999@code.launchpad.net

Commit message

do not assume germination has run if GENERATE_POOL=0

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

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

review: Needs Information
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

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.
>
>

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index dc7c183..3aad28e 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -342,7 +342,7 @@ $(BDIR)/rawlist-exclude:
6 # Create all the needed directories for installing packages (plus the
7 # .disk directory)
8 tree: bin-tree
9-bin-tree: ok bin-list $(BDIR)/CD1/ubuntu
10+bin-tree: ok $(BDIR)/CD1/ubuntu
11 $(BDIR)/CD1/ubuntu:
12 @echo "Adding the required directories to the binary CDs ..."
13 $(Q)set -e; \
14@@ -362,7 +362,11 @@ $(BDIR)/CD1/.disk/info:
15 $(set_mkisofs_opts) bin 1 > $(BDIR)/$${num}.mkisofs_opts; \
16
17 # Adding the deb files to the images
18+ifeq ($(GENERATE_POOL),1)
19 packages: bin-infos bin-list $(BDIR)/packages-stamp
20+else
21+packages: bin-infos $(BDIR)/packages-stamp
22+endif
23 $(BDIR)/packages-stamp:
24 ifeq ($(GENERATE_POOL),1)
25 @echo "Current disk usage on the binary CDs (before the debs are added) :"

Subscribers

People subscribed via source and target branches