From c1d898ed2c3231b725f9999be6aefea372a6e8ae Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Thu, 13 Mar 2025 07:49:03 -0600 Subject: [PATCH] desktop: update tpmfde model for pc-kernel channel * Updated model to move pc-kernel to channel 25.04/stable * Move model from heredoc to a file --- .../hooks/020-ubuntu-enhanced-sb.binary | 104 +----------------- live-build/ubuntu/ubuntu-classic-amd64.model | 94 ++++++++++++++++ 2 files changed, 96 insertions(+), 102 deletions(-) create mode 100644 live-build/ubuntu/ubuntu-classic-amd64.model diff --git a/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary b/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary index 0f4d2f46..b135c4f1 100755 --- a/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary +++ b/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary @@ -21,107 +21,7 @@ fi . config/functions # env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 brand-id=canonical model=ubuntu-classic-2410-amd64 > config/classic-model.model -cat < config/classic-model.model -type: model -authority-id: canonical -series: 16 -brand-id: canonical -model: ubuntu-classic-2504-amd64 -architecture: amd64 -base: core24 -classic: true -distribution: ubuntu -grade: signed -snaps: - - - default-channel: classic-25.04/stable - id: UqFziVZDHLSyO3TqSWgNBoAdHbLI4dAH - name: pc - type: gadget - - - components: - nvidia-550-ko: - presence: optional - nvidia-550-user: - presence: optional - default-channel: 24/edge/nvidia-components-dev - 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-25.04 - id: 3wdHCAVyZEmYsCMFDE9qt92UV8rC8Wdk - name: firefox - type: app - - - default-channel: latest/stable/ubuntu-25.04 - id: lATO8HzwVvrAPrlZRAWpfyrJKlAJrZS3 - name: gnome-42-2204 - type: app - - - default-channel: latest/stable/ubuntu-25.04 - id: jZLfBRzf1cYlYysIjD2bwSzNtngY0qit - name: gtk-common-themes - type: app - - - default-channel: latest/stable/ubuntu-25.04 - id: IrwRHakqtzhFRHJOOPxKVPU0Kk7Erhcu - name: snapd-desktop-integration - type: app - - - default-channel: 1/stable/ubuntu-25.04 - id: EI0D1KHjP8XiwMZKqSjuh6W8zvcowUVP - name: firmware-updater - type: app - - - default-channel: 1/stable/ubuntu-25.04 - id: FppXWunWzuRT2NUT9CwoBPNJNZBYOCk0 - name: desktop-security-center - type: app - - - default-channel: 1/stable/ubuntu-25.04 - id: aoc5lfC8aUd2VL8VpvynUJJhGXp5K6Dj - name: prompting-client - type: app - - - default-channel: 2/stable/ubuntu-25.04 - id: gjf3IPXoRiipCu9K0kVu52f0H56fIksg - name: snap-store - type: app -timestamp: 2024-10-30T12:00:00.0Z -sign-key-sha3-384: 9tydnLa6MTJ-jaQTFUXEwHl1yRx7ZS4K5cyFDhYDcPzhS7uyEkDxdUjg9g08BtNn - -AcLBXAQAAQoABgUCZ8+91wAKCRDgT5vottzAElaFD/9cwt6iJhWyTO6IxEEt35djQoQEXOLxEmje -krqx3TVSM8BVCdRXBrUlU4Uj2xHTQnbAKtLlZYh8eYlDtPw1MRxVAijykUAhumXvohbySCpCkEcZ -lFujIjLgQFvvUpTR9j1DNL7h7p4ZZDevSUGPVxf436V+4HpUF+UhPnZAHEpy4Vwi6B5CZZDn9JLu -VL20QIiUa8rBpLUAU3TGNJsTygeLfZBrGU8jRiFEV6YHH9XS0TWYZrolvS3V0Cr7OXubxWeeBJgW -y8Lxp88Dp7cg8B74weFG9GjqgZDP4X8BRhVLQprhs1MGFTtfV1/0viWDpNLW1FYHH3iae4nLx55j -7AfydLAYs1DBSZliN3mLxR0vt40Bl4vhgiz3uKbwlnPPNo3ZlPY6zJIE2BkjjL46AcFgSbd5Z0HW -iH2KoDzXzGWQUIYGenNQuWj14pHv8j6LPSiPxq+FAhHJv5O1KcMM9X9bR6hBgTArudVKnEeleSlm -zYY0J3mdANwQviQwdCLQjwmuV7ZPH7Jg+uV/PoRITZjtz/TTEzkKgVSJl6ATEKImoRRgfa88eMDS -C5jUR3XWNvZcj3GPbXIlJEi/HrTdjLIfMDBqbTSwHXmYm9oBZN37OwUPvR4l0blqoVxDa9L5+XVo -UnbiP807fY7LyfYdp12BnktXWUkOYew9knyr/fdQgA== -EOF +model=/usr/share/livecd-rootfs/live-build/${PROJECT}/ubuntu-classic-amd64.model channel="" if [ -n "${CHANNEL:-}" ]; then @@ -133,7 +33,7 @@ reset_snapd_state chroot # Set UBUNTU_STORE_COHORT_KEY="+" to force prepare-image to fetch the latest # snap versions regardless of phasing status env SNAPPY_STORE_NO_CDN=1 UBUNTU_STORE_COHORT_KEY="+" snap prepare-image \ - --classic config/classic-model.model $channel chroot + --classic $model $channel chroot mv chroot/system-seed/systems/* chroot/system-seed/systems/enhanced-secureboot-desktop rm -rf chroot/var/lib/snapd/seed mv chroot/system-seed chroot/var/lib/snapd/seed diff --git a/live-build/ubuntu/ubuntu-classic-amd64.model b/live-build/ubuntu/ubuntu-classic-amd64.model new file mode 100644 index 00000000..247151df --- /dev/null +++ b/live-build/ubuntu/ubuntu-classic-amd64.model @@ -0,0 +1,94 @@ +type: model +authority-id: canonical +series: 16 +brand-id: canonical +model: ubuntu-classic-2504-amd64 +architecture: amd64 +base: core24 +classic: true +distribution: ubuntu +grade: signed +snaps: + - + default-channel: classic-25.04/stable + id: UqFziVZDHLSyO3TqSWgNBoAdHbLI4dAH + name: pc + type: gadget + - + default-channel: 25.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-25.04 + id: 3wdHCAVyZEmYsCMFDE9qt92UV8rC8Wdk + name: firefox + type: app + - + default-channel: latest/stable/ubuntu-25.04 + id: lATO8HzwVvrAPrlZRAWpfyrJKlAJrZS3 + name: gnome-42-2204 + type: app + - + default-channel: latest/stable/ubuntu-25.04 + id: jZLfBRzf1cYlYysIjD2bwSzNtngY0qit + name: gtk-common-themes + type: app + - + default-channel: latest/stable/ubuntu-25.04 + id: IrwRHakqtzhFRHJOOPxKVPU0Kk7Erhcu + name: snapd-desktop-integration + type: app + - + default-channel: 1/stable/ubuntu-25.04 + id: EI0D1KHjP8XiwMZKqSjuh6W8zvcowUVP + name: firmware-updater + type: app + - + default-channel: 1/stable/ubuntu-25.04 + id: FppXWunWzuRT2NUT9CwoBPNJNZBYOCk0 + name: desktop-security-center + type: app + - + default-channel: 1/stable/ubuntu-25.04 + id: aoc5lfC8aUd2VL8VpvynUJJhGXp5K6Dj + name: prompting-client + type: app + - + default-channel: 2/stable/ubuntu-25.04 + id: gjf3IPXoRiipCu9K0kVu52f0H56fIksg + name: snap-store + type: app +timestamp: 2024-10-30T12:00:00.0Z +sign-key-sha3-384: 9tydnLa6MTJ-jaQTFUXEwHl1yRx7ZS4K5cyFDhYDcPzhS7uyEkDxdUjg9g08BtNn + +AcLBXAQAAQoABgUCZ9KrAgAKCRDgT5vottzAEqaOEACecH0VUlotBTzcr+GV1CprnX9x/CB0AtqB +tS6BmFvf385A+Ce2QWkyM5LSy5+AyN5Ujmn3K9niWqWvN3gqr1cXlviiFQuLh8Btb0dHT+Zj48Jv +lKI5WMJHDwp9rUQ5pQHpKz4hdhrrrz5m+T17WAp9PkPFlCDS6VQ54a3vhCR6U4fKzx3b9BEX4few +h4efotBDGzoGl1ed82oSB4sUV0K8yugxaMVexTn82xJ0pUkCqIuWnW84/usH7e+vStpqGft8sR2Q +qli3HjLX1ctm8MzTyBn1nGrEQmqqkgPo8OCIsIt/Lqi9rTUdoAl4sre9ErTdXPz0aim4I+uB4gfl +PA8vCdJrMAF3MWUxNZZfYWV9Y8OzTJpjfp4X0zC0fUw99vHS1Soxua9PWF8h3OPLBvemTiZhfJyu +SaYa8pUNtPXXwpFQvRaxMFj59g83DbZ14xny36+fYiAFk6zp5x61Fa3QQDueHpliyKCJOShjyisz +i1g8Rza0iXEp6T6aBc3p+fLmxhOP+FeA8MO+d5WlGksObSwK3Us4HonVKgfVuZRObvRuPFGJDY0w +yo/mV+YbBrSfVPSF8OC5Dh1i+ApzQ5vGlnEB5ZBDdMZhznuD2oSBN6WEtCn8tuZ4zJHoN0k9O3QI +mvqL6aI4gL4A2uLneC96fu4YMVEdLisiXalUb9s/FA==