xubuntu-dev team mailing list archive

[Sean Davis <mp+435316@xxxxxxxxxxxxxxxxxx>]

Applied some updates, responded to the releases page question.

Diff comments:

> diff --git a/etc/config b/etc/config
> index 524e7d8..12c2dbf 100644
> --- a/etc/config
> +++ b/etc/config
> @@ -51,7 +51,7 @@ case $DIST in
>          ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu xubuntu ubuntustudio lubuntu ubuntukylin ubuntu-mate ubuntu-budgie}"
>          ;;
>      *)
> -        ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu xubuntu ubuntustudio lubuntu ubuntukylin ubuntu-mate ubuntu-budgie ubuntu-unity}"
> +        ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu xubuntu xubuntu-minimal ubuntustudio lubuntu ubuntukylin ubuntu-mate ubuntu-budgie ubuntu-unity}"

I've just added a new case for jammy, so this should only affect later releases.

>          ;;
>  esac
>  
> diff --git a/etc/default-arches b/etc/default-arches
> index 5572c9f..c4b1af7 100644
> --- a/etc/default-arches
> +++ b/etc/default-arches
> @@ -67,6 +67,7 @@ ubuntustudio		*			focal-			amd64
>  
>  xubuntu			*			trusty-bionic		amd64 i386
>  xubuntu			*			focal-			amd64
> +xubuntu-minimal			*			*			amd64

It'd be ideal to have the minimal image published on the existing release pages, xubuntu/daily-live, xubuntu/releases. Any objection to this? If not, I can update livefs-launchpad (and another needed places) accordingly.

>  
>  *			dvd			trusty-bionic		amd64 i386
>  *			dvd			*			amd64
> diff --git a/lib/cdimage/project.py b/lib/cdimage/project.py
> index 8995d68..a9ff3ce 100644
> --- a/lib/cdimage/project.py
> +++ b/lib/cdimage/project.py
> @@ -32,6 +32,7 @@ project_map = {
>      "ubuntu-zh_CN": "Ubuntu Chinese Edition",
>      "kubuntu": "Kubuntu",
>      "xubuntu": "Xubuntu",
> +    "xubuntu-minimal": "Xubuntu-Minimal",

I prefer "Xubuntu Minimal". I pushed an update to make this consistent.

>      "gobuntu": "Gobuntu",
>      "ubuntu-server": "Ubuntu-Server",
>      "ubuntustudio": "Ubuntu-Studio",
> diff --git a/lib/cdimage/tree.py b/lib/cdimage/tree.py
> index 3be7f9a..e319481 100644
> --- a/lib/cdimage/tree.py
> +++ b/lib/cdimage/tree.py
> @@ -1012,7 +1013,8 @@ class Publisher:
>                                 "kubuntu",
>                                 "ubuntu-mate",
>                                 "ubuntu-budgie",
> -                               "xubuntu") and series >= "xenial"):
> +                               "xubuntu",
> +                               "xubuntu-minimal") and series >= "xenial"):

Image sizes have gotten away from us in recent releases, but you are right. xubuntu-minimal should be targeting CD sizes. Updated.

>              sentences.append(
>                  "Warning: This image is oversized (which is a bug) and will "
>                  "not fit onto a 2GB USB stick.")
> @@ -1963,13 +1965,13 @@ class DailyTreePublisher(Publisher):
>                self.config["DIST"] >= "focal"):
>              # Per IRC discussions on #ubuntu-flavors on the 2020-10-05
>              return 4 * 1024 * 1024 * 1024
> -        elif self.project == "xubuntu" and self.config["DIST"] >= "kinetic":
> +        elif self.project in ("xubuntu", "xubuntu-minimal") and self.config["DIST"] >= "kinetic":

You're absolutely right. Updated.

>              # Per IRC discussions on #ubuntu-release 2022-09-16
>              return 3.0 * 1000 * 1000 * 1000
> -        elif self.project == "xubuntu" and self.config["DIST"] >= "jammy":
> +        elif self.project in ("xubuntu", "xubuntu-minimal") and self.config["DIST"] >= "jammy":
>              # Per IRC discussions on #ubuntu-release 2022-04-17
>              return 2.8 * 1000 * 1000 * 1000
> -        elif self.project in ("ubuntu-budgie", "mythbuntu", "xubuntu",
> +        elif self.project in ("ubuntu-budgie", "mythbuntu", "xubuntu", "xubuntu-minimal",
>                                "ubuntu-gnome", "ubuntu-mate"):
>              # https://lists.ubuntu.com/archives/ubuntu-release/2016-May/003744.html
>              # https://irclogs.ubuntu.com/2019/02/17/%23ubuntu-release.html#t03:04


-- 
https://code.launchpad.net/~xubuntu-dev/ubuntu-cdimage/+git/ubuntu-cdimage/+merge/435316
Your team Xubuntu Developers is subscribed to branch ~xubuntu-dev/ubuntu-cdimage:xubuntu-core.