From b1a118f4d72f4b5ce1415109965c6b671455a5d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Tue, 22 Aug 2023 17:15:36 +0200 Subject: [PATCH] Update canary model assertions.: --- debian/changelog | 7 ++ .../hooks/020-canary-enhanced-sb.binary | 74 ++++++++++++------- .../ubuntu/hooks/020-canary-live.binary | 74 ++++++++++++------- 3 files changed, 101 insertions(+), 54 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9d870283..815d7695 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (23.10.20) UNRELEASED; urgency=medium + + * Update canary model assertions to include all the regular seeded snaps, + using the right channels for all of them. + + -- Łukasz 'sil2100' Zemczak Tue, 22 Aug 2023 17:14:38 +0200 + livecd-rootfs (23.10.19) mantic; urgency=medium * Add python3-systemd to CPC's minimized builds. diff --git a/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary b/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary index b14055d3..e1b41ad8 100644 --- a/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary +++ b/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary @@ -25,7 +25,7 @@ esac cat < config/classic-model.model type: model authority-id: canonical -revision: 2 +revision: 3 series: 16 brand-id: canonical model: ubuntu-classic-2310-amd64 @@ -55,59 +55,79 @@ snaps: id: PMrrV4ml8uWuEUDBT8dSGnKUYbevVhc4 name: snapd type: snapd - - - default-channel: latest/stable - id: DLqre5XGLbDqg9jPtiAhRRjDuPVa5X1q - name: core20 - type: base - default-channel: latest/stable id: EISPgh06mRh1vordZY9OZ34QHdd7OrdR name: bare type: base - - default-channel: latest/stable + default-channel: latest/stable/ubuntu-23.10 id: 3wdHCAVyZEmYsCMFDE9qt92UV8rC8Wdk name: firefox type: app - - default-channel: latest/stable - id: rw36mkAjdIKl13dzfwyxP87cejpyIcct - name: gnome-3-38-2004 - type: app - - - default-channel: latest/stable + default-channel: latest/stable/ubuntu-23.10 id: lATO8HzwVvrAPrlZRAWpfyrJKlAJrZS3 name: gnome-42-2204 type: app - - default-channel: latest/stable + default-channel: latest/stable/ubuntu-23.10 id: jZLfBRzf1cYlYysIjD2bwSzNtngY0qit name: gtk-common-themes type: app - - default-channel: latest/stable + default-channel: latest/stable/ubuntu-23.10 id: gjf3IPXoRiipCu9K0kVu52f0H56fIksg name: snap-store type: app - - default-channel: latest/stable + default-channel: latest/stable/ubuntu-23.10 id: IrwRHakqtzhFRHJOOPxKVPU0Kk7Erhcu name: snapd-desktop-integration type: app -timestamp: 2023-07-18T12:00:00.0Z + - + default-channel: latest/stable/ubuntu-23.10 + id: m1eQacDdXCthEwWQrESei3Zao3d5gfJF + name: cups + type: app + - + default-channel: latest/stable/ubuntu-23.10 + id: d1yehor45vFG9GdKjmgdqbnBuKtR0Qa4 + name: ghostscript-printer-app + type: app + - + default-channel: latest/stable/ubuntu-23.10 + id: 3wnSvqxn6OqPBuioytBcdnR2UBaUzvPC + name: gutenprint-printer-app + type: app + - + default-channel: latest/stable/ubuntu-23.10 + id: PPjo7KVjJvmdYUeUt9LqmKRrgmGdWPyM + name: hplip-printer-app + type: app + - + default-channel: latest/stable/ubuntu-23.10 + id: WJKWBUuCDufOFw2p24tvkbbw02plGkbd + name: ipp-usb + type: app + - + default-channel: latest/stable/ubuntu-23.10 + id: 5xUmM1J4qSfki63gfpEDcrr1wU1FdP2k + name: ps-printer-app + type: app +timestamp: 2023-08-22T12:00:00.0Z sign-key-sha3-384: 9tydnLa6MTJ-jaQTFUXEwHl1yRx7ZS4K5cyFDhYDcPzhS7uyEkDxdUjg9g08BtNn -AcLBXAQAAQoABgUCZN94uAAKCRDgT5vottzAEsahEAC4oL47eK46gqSIE/enKgWrg1LCg+hP6ebL -fz/JoNduCsLR9JkJtFL4QoqLPqD/KQ+CxpSRUkewvY+QyoeHbJHBa3B9dWM6LGMtvZFIgKNWmqHB -J/lMMlmzlerGOj6Yi2qipW6pS9xU2BEErZGqCUsiR1qaQnqkJjLJm6ygPOEuuOVgdq5H+pv10Wvl -gRTSlUYW9wzs6vt1r9/r2a06m7pYp5zWXRS5+HTAxfnL3iZwvtOlMH+Hwr2ZCZjSMpuz05uuweak -sVtbLqXB5W5zT1s7RH7xZ9Ba4RwyFZZB4omv9aDwc+EtNMKjhGRzIBkAUjU4KQwyiDVXD5dVtWUP -PxTOowURNgnbICtf+p5sVWSYjwl9Z05Q6D/e3humQ/sXkTU5kIGdnI/W9O7A+n/ttBHIQ71EscnH -s5teT1wjbxk4OeHwINuma/ktQt6bMoWrOiRZAm//qW7599lOJKr7TEL3aA3oT/RES0SswQ0XAGEs -j7qO6rAERTYB2zO8OAUnL2vAUoTKa5G+WP3B9brrI1UaLHaDZUWg1kjubZzkeBLNdyoNFna8OInO -YGanAa0HbNj/oM94GMwFKPFTeyNfGgdEprJgqwetDRc5FndSefquUdLRhrQG+ophqKz2ehSRMsZL -OSI99bh1PCSxmNargEoWv/sXFGgLcbLOjd3gv1fTvg== +AcLBXAQAAQoABgUCZOTCgQAKCRDgT5vottzAEkN9D/9CM4jsP7D6j5CIMM2t4P7A5Hcq+LB/+wEi +h9uqr6CbsJazgPS6Y4nZnu5NRz/irwxFyzWLiqbwqdyNgu7Y+2G0PPzo3MgCzjV93hRkPlOmLXHd +dtDw6XOXThMLBVSriAft8lKLhzYoX2qw2fP7Wys1NUlRIMYHvJMdHdrVQgoAz+W8qAlbSQ9VSTSc +xaMConnt5rtOJ9Aw8Er3NZEx5wfpzriGJ1L7T9qUsijVq6On4W4aCUJtKHplsV2LRsn+HSLLae7h +ULCCpUy88D3uNOoAPBRjY9Vm64/gtvMpYOztqhukT7OMDigH6RD6g0qfgS8aC4x/Ok6OIZpNnP0f +Iy4cx5DepdIR4sMlBtfQhenkG49gkNyUxtbN1XeS1N21cBsNysBL8CSBucR3plPOWYSthrwWgRpD +qv0DA/SIzntFxRUFh34f0ESLSJja/WrmEbSzk7EfloauY/2gWQ7B+NHnddTI/uBKpssi+rhJlUq8 +Hec1La/U+fv0WOWg3tD71lbNqFCQv02vi5az15NfRxI9K2K72rWvmhaUuQQUZPBitBTmTX8rG3pb +Aw00idWo5/hAgSpcOIoEhntkxfgLpoK2s8EX1USPk5XW+9XITEsKFyC3UVBgsRDqRMLWn1Eketyv +ejP1SS6R9LyritULe9w7lcxRlg8f4G+scUYSyBjLDA== EOF channel="" diff --git a/live-build/ubuntu/hooks/020-canary-live.binary b/live-build/ubuntu/hooks/020-canary-live.binary index e8980ea0..a382587f 100755 --- a/live-build/ubuntu/hooks/020-canary-live.binary +++ b/live-build/ubuntu/hooks/020-canary-live.binary @@ -25,7 +25,7 @@ esac cat < config/classic-model-installer.model type: model authority-id: canonical -revision: 2 +revision: 3 series: 16 brand-id: canonical model: ubuntu-installer-classic-2310-amd64 @@ -51,59 +51,79 @@ snaps: id: rQm0TtMOYOtEslvEXgxQDhgy1JNn38Wz name: ubuntu-desktop-installer type: app - - - default-channel: latest/stable - id: DLqre5XGLbDqg9jPtiAhRRjDuPVa5X1q - name: core20 - type: base - default-channel: latest/stable id: EISPgh06mRh1vordZY9OZ34QHdd7OrdR name: bare type: base - - default-channel: latest/stable + default-channel: latest/stable/ubuntu-23.10 id: 3wdHCAVyZEmYsCMFDE9qt92UV8rC8Wdk name: firefox type: app - - default-channel: latest/stable - id: rw36mkAjdIKl13dzfwyxP87cejpyIcct - name: gnome-3-38-2004 - type: app - - - default-channel: latest/stable + default-channel: latest/stable/ubuntu-23.10 id: lATO8HzwVvrAPrlZRAWpfyrJKlAJrZS3 name: gnome-42-2204 type: app - - default-channel: latest/stable + default-channel: latest/stable/ubuntu-23.10 id: jZLfBRzf1cYlYysIjD2bwSzNtngY0qit name: gtk-common-themes type: app - - default-channel: latest/stable + default-channel: latest/stable/ubuntu-23.10 id: gjf3IPXoRiipCu9K0kVu52f0H56fIksg name: snap-store type: app - - default-channel: latest/stable + default-channel: latest/stable/ubuntu-23.10 id: IrwRHakqtzhFRHJOOPxKVPU0Kk7Erhcu name: snapd-desktop-integration type: app -timestamp: 2023-08-09T12:00:00.0Z + - + default-channel: latest/stable/ubuntu-23.10 + id: m1eQacDdXCthEwWQrESei3Zao3d5gfJF + name: cups + type: app + - + default-channel: latest/stable/ubuntu-23.10 + id: d1yehor45vFG9GdKjmgdqbnBuKtR0Qa4 + name: ghostscript-printer-app + type: app + - + default-channel: latest/stable/ubuntu-23.10 + id: 3wnSvqxn6OqPBuioytBcdnR2UBaUzvPC + name: gutenprint-printer-app + type: app + - + default-channel: latest/stable/ubuntu-23.10 + id: PPjo7KVjJvmdYUeUt9LqmKRrgmGdWPyM + name: hplip-printer-app + type: app + - + default-channel: latest/stable/ubuntu-23.10 + id: WJKWBUuCDufOFw2p24tvkbbw02plGkbd + name: ipp-usb + type: app + - + default-channel: latest/stable/ubuntu-23.10 + id: 5xUmM1J4qSfki63gfpEDcrr1wU1FdP2k + name: ps-printer-app + type: app +timestamp: 2023-08-22T12:00:00.0Z sign-key-sha3-384: 9tydnLa6MTJ-jaQTFUXEwHl1yRx7ZS4K5cyFDhYDcPzhS7uyEkDxdUjg9g08BtNn -AcLBXAQAAQoABgUCZN94uAAKCRDgT5vottzAEvtpEACfnxMEKTBZPbwZxNEXA+W4zUIKLyZKNQ8J -dnS4WoarMLqbAOHLPyWyHK/R5+Q9cxX1M+9SlR7oKwL/yP6eUMl/olsDMfv6+rGqg5VBLijkUSfu -ZoF8Cjev3lQfuuYqSXsZHQnz3SfMdL2RpXWSd0BuHeW96MG7uGLA9NM4sz5vbY+eVZpVC0LxFfeK -njAvCslALtcWChVig1IUTAPz22pEBpkQO6wEkjkccpsZLGwQSvYIpPX1HMLKvMo/LzX9Dxp/Xnlt -gcvwHTRHD1NO0qgrx5eKthXbbFTigxOA8l1hkhMM7p9trTXzHUchsKCjzlx+sdT9GfEzSqJsekH5 -m878xIMaP2UXhBNMZkXr8/vFxHsBdW2FMhJULNT8eyO+5C/I22/DwCFLJESqA5wA/hm8q5PH6tP2 -HOzbN9mxK7Y+J37JUFrLjz76ECxf/IVktTbDrBOvk40lsomlSE9VngFKbzxVHz7wn6m+lnqy4UDt -+1QJr0GlzZYhJPccqqj9skdtkBdgTe2hogty8KsERneUpJ9wtV5UuOr2DU83Plh9yFjYhl4s7XGP -FjN6SMO3hL8nnoF7rANFTNMkyMl2IbyX4wfmi3pjAGubpQPDc00rc5KcwKdNwgAMB9XrvB/dEzKg -v0vszO82HG1XGXT8Em6DGLDTpyn7ABl0MAnjDFmLEw== +AcLBXAQAAQoABgUCZOTCgQAKCRDgT5vottzAEvDYD/97aa0ub3eq1zzUpMRDXY+NoHMLOON5zBgA +qLmpZq9ECZtuT0Tsyn/znlx2g15r8erzlgQtg/lS8iLIk0PqmwE/BB4ntdLQ3P56Rxz/YvkoK31B +519vOcpLlXxyVHsG4u3IjsEtPBlm4dmnzuuJodiRF4g4iXlxIQpcCkUm1gTHKof6NUlne7VwNty7 +8GvinPZtoTDVc6i+VftzUAbnqtifSlvxUseDvRkZrYX44FWKfEz7qqGQVdtwmZrP/ab+nc0CA+Nz +p6pn1wBrXk4y3EGw5RWQJvY5PzE5E7fCCirUW6SWpZ15jGK7pKGtXK2TJQlgsILeVp40FhnX5+As +9EnJpCCPYn8ZkKKjL9dCvmBSaKsqC0SVPYeB+T6PG2ANEHooaALvoiSTUVCM4HnBvjMtSXJpOPE7 +FzfyL9z4mKtNF82NmHc9Oms7QfuX70jQ0mgS/NDy6Te+4dhZ5QpLZzkwed/SWGmHGADPPV6Dxhcd +N5sjPPhhAJ6A2EyJQrKY3dOUt/vlu04C1TZCQwz9aQJO5hEaC3E/+ci8IVBRhDAvKJJ4iuTdO/k2 +SRiShTD1s/mua3D01bN2gGoyh2DY4lFKro28by4Ci0QXSBOIVTk+GnWAOwJCnbB636PZD9Ipf29L +ri86PlIOcM1OvSROryexBE+aNuWZYBwvJIo2kMYfVw== EOF channel=""