diff options
| author | Chad Smith <chad.smith@canonical.com> | 2022-02-22 21:22:50 -0700 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2022-02-22 21:22:50 -0700 |
| commit | 1bd68cb3c6358ef875ff3c408c61d0b7f028af7b (patch) | |
| tree | 63911ef384b065e45a1b77cd365ca51489f69765 | |
| parent | 030491ec5bf97130730fd8ca653cf58407f1f4d8 (diff) | |
| download | cloud-init-git-ubuntu/22.1-1-gb3d9acdd-0ubuntu1_20.04.1.tar.gz | |
retain commented APT partner pocket in sources listubuntu/22.1-1-gb3d9acdd-0ubuntu1_20.04.1
revert of upstream 0362abcd
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/patches/retain-apt-partner-pocket.patch | 25 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 29 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index aa00b3ae..db9b9e86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ cloud-init (22.1-1-gb3d9acdd-0ubuntu1~20.04.1) focal; urgency=medium + * d/patches/retain-apt-partner-pocket.patch: + - Jammy dropped commented APT partner pocket. Retain this comment on + stable releases. * d/apport-launcher.py fix format for unittests * d/cloud-init.templates: Move LXD to back of datasource_list * New upstream snapshot. (LP: #1961446) @@ -54,8 +57,6 @@ cloud-init (22.1-1-gb3d9acdd-0ubuntu1~20.04.1) focal; urgency=medium - fix parallel tox execution (#1214) - sources/azure: refactor _report_ready_if_needed and _poll_imds (#1222) [Chris Patterson] - - Do not support setting up archive.canonical.com as a source (#1219) - [Steve Langasek] - Vultr: Fix lo being used for DHCP, try next on cmd fail (#1208) [eb3095] - sources/azure: refactor _should_reprovision[_after_nic_attach]() logic (#1206) [Chris Patterson] diff --git a/debian/patches/retain-apt-partner-pocket.patch b/debian/patches/retain-apt-partner-pocket.patch new file mode 100644 index 00000000..1544af59 --- /dev/null +++ b/debian/patches/retain-apt-partner-pocket.patch @@ -0,0 +1,25 @@ +Description: Retain commented APT partner pocket in sources.list template +Author: chad.smith@canonical.com +Origin: backport +Forwarded: not-needed +Last-Update: 2022-02-22 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: cloud-init/templates/sources.list.ubuntu.tmpl +=================================================================== +--- cloud-init.orig/templates/sources.list.ubuntu.tmpl ++++ cloud-init/templates/sources.list.ubuntu.tmpl +@@ -43,6 +43,13 @@ deb {{mirror}} {{codename}}-updates mult + deb {{mirror}} {{codename}}-backports main restricted universe multiverse + # deb-src {{mirror}} {{codename}}-backports main restricted universe multiverse + ++## Uncomment the following two lines to add software from Canonical's ++## 'partner' repository. ++## This software is not part of Ubuntu, but is offered by Canonical and the ++## respective vendors as a service to Ubuntu users. ++# deb http://archive.canonical.com/ubuntu {{codename}} partner ++# deb-src http://archive.canonical.com/ubuntu {{codename}} partner ++ + deb {{security}} {{codename}}-security main restricted + # deb-src {{security}} {{codename}}-security main restricted + deb {{security}} {{codename}}-security universe diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..335769f2 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +retain-apt-partner-pocket.patch |