Merge ~xubuntu-dev/debian-cd:xubuntu-core into ~ubuntu-cdimage/debian-cd/+git/ubuntu:main

Proposed by Sean Davis
Status: Merged
Merged at revision: 38e7935c070df6400792552ed563e6cae1f54a92
Proposed branch: ~xubuntu-dev/debian-cd:xubuntu-core
Merge into: ~ubuntu-cdimage/debian-cd/+git/ubuntu:main
Diff against target: 58 lines (+8/-2)
6 files modified
Makefile (+4/-0)
data/lunar/preseed/xubuntu/xubuntu.seed (+0/-2)
data/lunar/xubuntu-minimal-access.pcx (+1/-0)
data/lunar/xubuntu-minimal-blank.pcx (+1/-0)
data/lunar/xubuntu-minimal.pcx (+1/-0)
data/lunar/xubuntu-minimal.png (+1/-0)
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+435314@code.launchpad.net

Commit message

Add Xubuntu Minimal

Description of the change

Some history:
- https://xubuntu.org/news/introducing-xubuntu-core/
- https://github.com/Xubuntu/xubuntu-development/issues/1

Announced in 2015 and supported by our community members since, Xubuntu Minimal is a trimmed down version of Xubuntu that fits on smaller installation media.

The Xubuntu Team would very much like to have official images published for Xubuntu Minimal starting with the 23.04 cycle.

Related Merge Requests:
- livecd-rootfs: https://code.launchpad.net/~xubuntu-dev/livecd-rootfs/+git/livecd-rootfs/+merge/435315
- ubuntu-cdimage: https://code.launchpad.net/~xubuntu-dev/ubuntu-cdimage/+git/ubuntu-cdimage/+merge/435316

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

Thanks for reviving this request, Sean.

An initial concern I have is with the naming. I see you addressed it in your very announcement that this is unrelated to Ubuntu Core. However, both from the perspective of trademarks and that of general user confusion, I think it's unhelpful to use a name "*buntu Core" for an image with an unrelated purpose.

Can I suggest that this should be named "Xubuntu Minimal" instead? That would be consistent with the usage of the "Minimal" nomenclature both for the Ubuntu minimal cloud images, and the Ubuntu Desktop and Ubuntu Server minimal install targets. Though the latter two exist as minimized targets from the same install media rather than separate images, I think they're relevant, and that this would be valuable consistency across the Ubuntu ecosystem.

I realize this implies more work on the part of the Xubuntu team, both in terms of adapting this code and updating associated assets (websites etc) to accomodate a name change. If you are not willing to rename, I would find it necessary to get corporate signoff from Canonical from a trademark standpoint before I would be willing to merge an image under this name.

Also, this falls into a little bit of a gray area wrt governance. We're not defining a new flavor here, this clearly falls under the existing Xubuntu seeds / metapackage / dev team. But as there has been recent activity on attempting to clarify our policies and procedures for new flavors, I think I will also want to run this past the (rest of the) Technical Board before proceeding, just to make sure there's clear agreement that this is in the remit of the Release Team to proceed with.

review: Needs Fixing
Revision history for this message
Sean Davis (bluesabre) wrote :

Thank you, Steve. In anticipation of next steps, I've gone ahead and renamed Xubuntu Core to Xubuntu Minimal.

Should I kick off a discussion on the mailing list with the rest of the TB with regard to Xubuntu Minimal, or ... what do you recommend next?

Revision history for this message
Steve Langasek (vorlon) :
review: Needs Fixing
Revision history for this message
Sean Davis (bluesabre) wrote :

Applied some updates and responded to feedback.

Revision history for this message
Sean Davis (bluesabre) :
Revision history for this message
Steve Langasek (vorlon) :
Revision history for this message
Steve Langasek (vorlon) :
Revision history for this message
Steve Langasek (vorlon) wrote :

this looks good to me now, except for the fix-up of the target metapackage name, which I think should be addressed before merging.

Revision history for this message
Sean Davis (bluesabre) wrote :

> this looks good to me now, except for the fix-up of the target metapackage
> name, which I think should be addressed before merging.

I renamed the seed to xubuntu-minimal:

https://people.canonical.com/~ubuntu-archive/seeds/xubuntu.lunar/

When I attempt to update the metapackage, germinate is throwing an error I haven't seen before:

germinate.tsort.GraphCycleError: Cycle in graph ['supported', 'supported-desktop-extra', 'supported-common', 'supported-desktop', 'supported-kernel-desktop', 'standard', 'minimal', 'desktop-common']

https://pastebin.com/7RkHWZun

Updated update.cfg:

[DEFAULT]
dist: lunar

[lunar]
seeds: desktop minimal
architectures: amd64 ppc64el armhf arm64 s390x
seed_base: http://people.ubuntu.com/~ubuntu-archive/seeds/
seed_dist: xubuntu.%(dist)s
archive_base/default: http://ports.ubuntu.com/ubuntu-ports/
archive_base/major: http://archive.ubuntu.com/ubuntu/
archive_base/amd64: %(archive_base/major)s
archive_base/i386: %(archive_base/major)s
components: main restricted universe

[lunar/vcs]
seed_base: git+ssh://git.launchpad.net/~xubuntu-dev/ubuntu-seeds/+git/ git+ssh://git.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/+git/
seed_dist: xubuntu.%(dist)s

Revision history for this message
Sean Davis (bluesabre) :
Revision history for this message
Steve Langasek (vorlon) :
Revision history for this message
Sean Davis (bluesabre) :
Revision history for this message
Sean Davis (bluesabre) wrote :

What are the next steps for this review? Are there any other places that need updating?

Revision history for this message
Steve Langasek (vorlon) wrote :

On Wed, Jan 18, 2023 at 11:02:17AM -0000, Sean Davis wrote:

> What are the next steps for this review? Are there any other places that
> need updating?

Given the target of releasing this as
https://cdimage.ubuntu.com/xubuntu/releases/23.04/release/xubuntu-23.04-minimal-amd64.iso,
yes, there are a lot of other places that need updating!

- daily images should be published to
  https://cdimage.ubuntu.com/xubuntu/daily-live/current/lunar-minimal-amd64.iso,
  which means both the project (xubuntu) and subproject (minimal) should be
  changed
- this then needs to be mapped to the correct livefs name for the build in
  launchpad (probably
  https://launchpad.net/~ubuntu-cdimage/+livefs/ubuntu/lunar/xubuntu-minimal,
  so that's easy)
- the release publishing machinery needs to know about this image and to
  publish it to the right place

The ubuntu canary images are probably a good, recent model for the code
changes that need to happen here.

Revision history for this message
Sean Davis (bluesabre) wrote :

I think I've identified and updated all the places needed to process Xubuntu Minimal as a subproject. Can you review and confirm?

Revision history for this message
Sean Davis (bluesabre) wrote :

Hi Steve,

Can you please review these merge proposals again? I switched things around to make Xubuntu Minimal a subproject and updated each MP accordingly.

Thanks!

Revision history for this message
Steve Langasek (vorlon) wrote :

Let me know if you want to rebase and merge this to deal with the unicode and whitespace breakage on my side. Want to get agreement on the dropping of the xubuntu-minimal-specific preseed stuff first tho!

review: Needs Fixing
Revision history for this message
Sean Davis (bluesabre) wrote :

Applied the requested fixes.

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 c0440fc..7dd4ea2 100755
3--- a/Makefile
4+++ b/Makefile
5@@ -278,7 +278,11 @@ else
6 ifeq ($(SUBPROJECT),legacy)
7 CDBASE = $(CODENAME)-desktop-legacy-$(FULLARCH)
8 else
9+ ifeq ($(SUBPROJECT),minimal)
10+ CDBASE = $(CODENAME)-minimal-$(FULLARCH)
11+ else
12 CDBASE = $(CODENAME)-desktop-$(FULLARCH)
13+ endif
14 endif
15 endif
16 endif
17diff --git a/data/lunar/preseed/xubuntu/xubuntu.seed b/data/lunar/preseed/xubuntu/xubuntu.seed
18index 2fd9b58..2001dd1 100644
19--- a/data/lunar/preseed/xubuntu/xubuntu.seed
20+++ b/data/lunar/preseed/xubuntu/xubuntu.seed
21@@ -1,5 +1,3 @@
22-# Enable extras.ubuntu.com.
23-d-i apt-setup/extras boolean true
24 # Install the Xubuntu desktop.
25 tasksel tasksel/first multiselect xubuntu-desktop
26 d-i preseed/early_command string . /usr/share/debconf/confmodule; db_get debconf/priority; case $RET in low|medium) db_fset tasksel/first seen false; echo 'tasksel tasksel/first seen false' >>/var/lib/preseed/log ;; esac
27diff --git a/data/lunar/xubuntu-minimal-access.pcx b/data/lunar/xubuntu-minimal-access.pcx
28new file mode 120000
29index 0000000..16cc948
30--- /dev/null
31+++ b/data/lunar/xubuntu-minimal-access.pcx
32@@ -0,0 +1 @@
33+xubuntu-access.pcx
34\ No newline at end of file
35diff --git a/data/lunar/xubuntu-minimal-blank.pcx b/data/lunar/xubuntu-minimal-blank.pcx
36new file mode 120000
37index 0000000..670b33d
38--- /dev/null
39+++ b/data/lunar/xubuntu-minimal-blank.pcx
40@@ -0,0 +1 @@
41+xubuntu-blank.pcx
42\ No newline at end of file
43diff --git a/data/lunar/xubuntu-minimal.pcx b/data/lunar/xubuntu-minimal.pcx
44new file mode 120000
45index 0000000..38edd6b
46--- /dev/null
47+++ b/data/lunar/xubuntu-minimal.pcx
48@@ -0,0 +1 @@
49+xubuntu.pcx
50\ No newline at end of file
51diff --git a/data/lunar/xubuntu-minimal.png b/data/lunar/xubuntu-minimal.png
52new file mode 120000
53index 0000000..9e9fa77
54--- /dev/null
55+++ b/data/lunar/xubuntu-minimal.png
56@@ -0,0 +1 @@
57+xubuntu.png
58\ No newline at end of file

Subscribers

People subscribed via source and target branches