From 9819eae23cbfb710e724e0119a2187c19f8f8b30 Mon Sep 17 00:00:00 2001 From: Olivier Gayot Date: Tue, 24 Feb 2026 16:03:17 +0100 Subject: [PATCH] ubuntu: pull model from Launchpad canonical-model git repo Signed-off-by: Olivier Gayot --- debian/changelog | 9 ++ .../hooks/030-ubuntu-live-system-seed.binary | 21 +++- .../ubuntu-classic-amd64-dangerous.model | 109 ------------------ live-build/ubuntu/ubuntu-classic-amd64.model | 104 ----------------- 4 files changed, 28 insertions(+), 215 deletions(-) delete mode 100644 live-build/ubuntu/ubuntu-classic-amd64-dangerous.model delete mode 100644 live-build/ubuntu/ubuntu-classic-amd64.model diff --git a/debian/changelog b/debian/changelog index c177b098..d966bbcd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (26.04.22) UNRELEASED; urgency=medium + + * Pull the model from Launchpad's lp:canonical-models + repo, instead of having it uploaded as part of livecd-rootfs. This + indirection makes it possible to update the models without requiring a new + upload of livecd-rootfs every time. + + -- Olivier Gayot Tue, 24 Feb 2026 16:22:51 +0100 + livecd-rootfs (26.04.21) resolute; urgency=medium [ Dan Bungert ] diff --git a/live-build/ubuntu/hooks/030-ubuntu-live-system-seed.binary b/live-build/ubuntu/hooks/030-ubuntu-live-system-seed.binary index 90f4dc09..00ac57b5 100644 --- a/live-build/ubuntu/hooks/030-ubuntu-live-system-seed.binary +++ b/live-build/ubuntu/hooks/030-ubuntu-live-system-seed.binary @@ -133,8 +133,25 @@ get_components() # env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 brand-id=canonical model=ubuntu-classic-2410-amd64 > config/classic-model.model # -dangerous_model=/usr/share/livecd-rootfs/live-build/${PROJECT}/ubuntu-classic-amd64-dangerous.model -stable_model=/usr/share/livecd-rootfs/live-build/${PROJECT}/ubuntu-classic-amd64.model + +# We used to have the models included in livecd-rootfs itself, but now we pull +# them from the Launchpad git mirror. +canonical_models_tree=$(mktemp -d) +git clone --depth 1 https://git.launchpad.net/canonical-models -- "${canonical_models_tree}" + +cleanup_repo() +{ + rm -rf -- "${canonical_models_tree}" +} + +trap cleanup_repo EXIT + +echo 'Checked out canonical-models revision' "$(git -C "${canonical_models_tree}" rev-parse HEAD)" + +model_version=$(release_ver | sed 's/\.//') + +dangerous_model="${canonical_models_tree}"/ubuntu-classic-"${model_version}"-amd64-dangerous.model +stable_model="${canonical_models_tree}"/ubuntu-classic-"${model_version}"-amd64.model prepare_args=() diff --git a/live-build/ubuntu/ubuntu-classic-amd64-dangerous.model b/live-build/ubuntu/ubuntu-classic-amd64-dangerous.model deleted file mode 100644 index d4d73722..00000000 --- a/live-build/ubuntu/ubuntu-classic-amd64-dangerous.model +++ /dev/null @@ -1,109 +0,0 @@ -type: model -authority-id: canonical -series: 16 -brand-id: canonical -model: ubuntu-classic-2604-amd64-dangerous -architecture: amd64 -base: core24 -classic: true -distribution: ubuntu -grade: dangerous -snaps: - - - default-channel: classic-26.04/edge - id: UqFziVZDHLSyO3TqSWgNBoAdHbLI4dAH - name: pc - type: gadget - - - components: - nvidia-590-uda-ko: - presence: optional - nvidia-590-uda-user: - presence: optional - default-channel: 26.04/beta - id: pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza - name: pc-kernel - type: kernel - - - default-channel: latest/edge - id: amcUKQILKXHHTlmSa7NMdnXSx02dNeeT - name: core22 - type: base - - - default-channel: latest/edge - id: dwTAh7MZZ01zyriOZErqd1JynQLiOGvM - name: core24 - type: base - - - default-channel: latest/edge - id: cUqM61hRuZAJYmIS898Ux66VY61gBbZf - name: core26 - type: base - - - default-channel: latest/edge - id: PMrrV4ml8uWuEUDBT8dSGnKUYbevVhc4 - name: snapd - type: snapd - - - default-channel: latest/edge - id: EISPgh06mRh1vordZY9OZ34QHdd7OrdR - name: bare - type: base - - - default-channel: latest/edge - id: HyhSEBPv3vHsW6uOHkQR384NgI7S6zpj - name: mesa-2404 - type: app - - - default-channel: 1/edge - id: EI0D1KHjP8XiwMZKqSjuh6W8zvcowUVP - name: firmware-updater - type: app - - - default-channel: 1/edge - id: FppXWunWzuRT2NUT9CwoBPNJNZBYOCk0 - name: desktop-security-center - type: app - - - default-channel: 1/edge - id: aoc5lfC8aUd2VL8VpvynUJJhGXp5K6Dj - name: prompting-client - type: app - - - default-channel: 2/edge - id: gjf3IPXoRiipCu9K0kVu52f0H56fIksg - name: snap-store - type: app - - - default-channel: latest/edge - id: jZLfBRzf1cYlYysIjD2bwSzNtngY0qit - name: gtk-common-themes - type: app - - - default-channel: latest/edge - id: 3wdHCAVyZEmYsCMFDE9qt92UV8rC8Wdk - name: firefox - type: app - - - default-channel: latest/edge - id: ew7OxpbRTxfK7ImpIygRR85lkxvU7Pzt - name: gnome-46-2404 - type: app - - - default-channel: latest/edge - id: IrwRHakqtzhFRHJOOPxKVPU0Kk7Erhcu - name: snapd-desktop-integration - type: app -timestamp: 2026-02-24T15:37:46.0Z -sign-key-sha3-384: 9tydnLa6MTJ-jaQTFUXEwHl1yRx7ZS4K5cyFDhYDcPzhS7uyEkDxdUjg9g08BtNn - -AcLBXAQAAQoABgUCaZ3mZQAKCRDgT5vottzAEkt+EACVvAOwS1sFAgor0XxstXKa2O8gez16ECTp -XK46Wc3hhU6/5A3U8Uo4i823j9sqVMQkwAT85XCIs4pXvdZYz0wlCKWNO/ZSQubiJay57iTg4P6N -eoO2yC1yP0iMIuXSyBufVklPHad71ArcLcztyK/ozBBEkKBEd30B9tk+UHGC/nFJ+ZU2uOWk5Hml -chPTDuTdu1JqJvZ9nbSnPJ6p7p8B39/2OjVyxkl7UdBMYMZMaam5bW+VPnzd9tJBzpJsuV0PVDVG -/xrF7uu47QT2g6QjEb/sbSKmlCcdRk9dEpjbciZHrKsy8MvTdW9XioAG9hRzhsToTuJC2lHIL+Lu -jY/CJklPOhhjmWFclF1rPieHNBE/PEQAbZexmz5KqONih4LbVAO4tNxNxkjmb3m1p8An8iVDV32w -20QmkPRwhgvOG2SfUKrJvRQvSo0vm+sbHRgT/nlxAoHbEaYrdI8l7Q0dxB9eLWD+sUUn/ZyzegTU -SGyrgAv7nhzxB7HfrZr3B6l9zsGGVqU0zqON+t7c0dnj1x0XTtq4NQQT+Hg++A5/XaWvStoofmWl -POjNaFhY001UQIwfQKxIRSw5VkTIp54aFVOWoJPFsEFKqZZ2v37jDhOLpx4/sUnMc7qDIbRBMNqM -Xg/iQkZeZGuvLpyXSwz0a98vsIRPWAcYFTfeF/lPAQ== diff --git a/live-build/ubuntu/ubuntu-classic-amd64.model b/live-build/ubuntu/ubuntu-classic-amd64.model deleted file mode 100644 index a9fe2076..00000000 --- a/live-build/ubuntu/ubuntu-classic-amd64.model +++ /dev/null @@ -1,104 +0,0 @@ -type: model -authority-id: canonical -series: 16 -brand-id: canonical -model: ubuntu-classic-2604-amd64 -architecture: amd64 -base: core24 -classic: true -distribution: ubuntu -grade: signed -snaps: - - - default-channel: classic-26.04/stable - id: UqFziVZDHLSyO3TqSWgNBoAdHbLI4dAH - name: pc - type: gadget - - - components: - nvidia-590-uda-ko: - presence: optional - nvidia-590-uda-user: - presence: optional - default-channel: 26.04/stable - id: pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza - name: pc-kernel - type: kernel - - - default-channel: latest/stable - id: amcUKQILKXHHTlmSa7NMdnXSx02dNeeT - name: core22 - type: base - - - default-channel: latest/stable - id: dwTAh7MZZ01zyriOZErqd1JynQLiOGvM - name: core24 - type: base - - - default-channel: latest/stable - id: PMrrV4ml8uWuEUDBT8dSGnKUYbevVhc4 - name: snapd - type: snapd - - - default-channel: latest/stable - id: EISPgh06mRh1vordZY9OZ34QHdd7OrdR - name: bare - type: base - - - default-channel: latest/stable/ubuntu-26.04 - id: HyhSEBPv3vHsW6uOHkQR384NgI7S6zpj - name: mesa-2404 - type: app - - - default-channel: 1/stable/ubuntu-26.04 - id: EI0D1KHjP8XiwMZKqSjuh6W8zvcowUVP - name: firmware-updater - type: app - - - default-channel: 1/stable/ubuntu-26.04 - id: FppXWunWzuRT2NUT9CwoBPNJNZBYOCk0 - name: desktop-security-center - type: app - - - default-channel: 1/stable/ubuntu-26.04 - id: aoc5lfC8aUd2VL8VpvynUJJhGXp5K6Dj - name: prompting-client - type: app - - - default-channel: 2/stable/ubuntu-26.04 - id: gjf3IPXoRiipCu9K0kVu52f0H56fIksg - name: snap-store - type: app - - - default-channel: latest/stable/ubuntu-26.04 - id: jZLfBRzf1cYlYysIjD2bwSzNtngY0qit - name: gtk-common-themes - type: app - - - default-channel: latest/stable/ubuntu-26.04 - id: 3wdHCAVyZEmYsCMFDE9qt92UV8rC8Wdk - name: firefox - type: app - - - default-channel: latest/stable/ubuntu-26.04 - id: ew7OxpbRTxfK7ImpIygRR85lkxvU7Pzt - name: gnome-46-2404 - type: app - - - default-channel: latest/stable/ubuntu-26.04 - id: IrwRHakqtzhFRHJOOPxKVPU0Kk7Erhcu - name: snapd-desktop-integration - type: app -timestamp: 2026-02-24T15:34:40.0Z -sign-key-sha3-384: 9tydnLa6MTJ-jaQTFUXEwHl1yRx7ZS4K5cyFDhYDcPzhS7uyEkDxdUjg9g08BtNn - -AcLBXAQAAQoABgUCaZ3mZQAKCRDgT5vottzAEgO2EACdr7cHXU65ypjYo7e8XYHwXUiUZIAFIUD2 -QzX258T572B3dg3OKM7HAM0hFuyw1myw1Q9BEGqN5gpb3c+87kNYsTo6oU6kArZvzSYN3iS0VcXf -2PQKBdR1wvGjHNcxdn5DjULzLVW2rihgmXHMJPvb9GfWrawlowTZ4/t4vfftI4GR5yxrm4425GsS -oQzUDhEfH9c0DMrizmKsFlSN5U2uh6J+MzBwod+G+heMDe3djeJnzfapBSu10tkItfufwgWZyHh+ -uS0m2iRxtXNRNv0dohaAKmkoWqyBROS2mOHRCWItNEd59ielt8JCvIcuwABVm+VIdmnbAeNp4hQN -8MdQDig1Qz8U432ZxAb3miVvo2ByDrWZn2wCscOctJEp3kebq6TZXsAoVwaPdzGVduJExL4SWFd0 -P4+RN1SB45yCZ0rfXwc0lWr0CqNwELdozc7/qUHUYNIioCyy6H8LKYxRlZA9ETLOI7/qiGX3mcgB -4Wcy4a0uFtzoTxnOFxiU6VbgTjE5456OsfP5NtnMlOmi3Ca4bzctO6WGMsJkDJBF8rasPfYcdy0X -wAYXhONNUrII4Qhy7NK9E2ELmVXqeu2kN7JUrih7bZRFnXJXz+qK9cL2L/W0lzDHR2dG2ylB487u -LRTMFy67WR4VrIEd0FbJgtPFhPHHr92UvuqvMkQPWw==