Merge ~mwhudson/debian-cd/+git/ubuntu:ubuntu-core-installer into ~ubuntu-cdimage/debian-cd/+git/ubuntu:main

Proposed by Michael Hudson-Doyle
Status: Merged
Merged at revision: 2e4ce81f1c977ba135dcc8b9de2b3c8d797030ad
Proposed branch: ~mwhudson/debian-cd/+git/ubuntu:ubuntu-core-installer
Merge into: ~ubuntu-cdimage/debian-cd/+git/ubuntu:main
Diff against target: 16 lines (+4/-0)
1 file modified
Makefile (+4/-0)
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+466551@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index 3aad28e..85e9980 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -169,7 +169,11 @@ else
6 ifeq ($(PROJECT),ubuntu-core-desktop)
7 CDBASE = $(CODENAME)-live-core-desktop-$(FULLARCH)
8 else
9+ ifeq ($(PROJECT),ubuntu-core-installer)
10+ CDBASE = $(CODENAME)-live-core-installer-$(FULLARCH)
11+ else
12 CDBASE = $(CODENAME)-desktop-$(FULLARCH)
13+ endif
14 endif
15 endif
16 endif

Subscribers

People subscribed via source and target branches