[lxc-devel] [distrobuilder/master] Remove references to "apt_sources"

[eddyg on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 561 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20191107/da2e7432/attachment.bin>
-------------- next part --------------
From be503283a3eb826a7b79d016eb0d03d1a157bae2 Mon Sep 17 00:00:00 2001
From: Eddy Gurney <egurney at arbor.net>
Date: Thu, 7 Nov 2019 08:10:07 -0500
Subject: [PATCH] Remove references to "apt_sources"

`apt_sources` was removed in https://github.com/lxc/distrobuilder/pull/246

Remove `apt_sources` from the docs and the Ubuntu example to avoid
confusion. Also include example use of the `sources.list` special-case
repository in the Ubuntu example.
---
 doc/examples/ubuntu.yaml | 31 ++++++++++++++++++++++---------
 doc/source.md            |  1 -
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/doc/examples/ubuntu.yaml b/doc/examples/ubuntu.yaml
index 396f078..f9e9827 100644
--- a/doc/examples/ubuntu.yaml
+++ b/doc/examples/ubuntu.yaml
@@ -14,15 +14,6 @@ source:
   keys:
     - 0x790BC7277767219C42C86F933B4FE6ACC0B21F32
 
-  apt_sources: |-
-    {% if image.architecture_mapped == "amd64" or image.architecture_mapped == "i386" %}deb http://archive.ubuntu.com/ubuntu {{ image.release }} main restricted universe multiverse
-    deb http://archive.ubuntu.com/ubuntu {{ image.release }}-updates main restricted universe multiverse
-    deb http://security.ubuntu.com/ubuntu {{ image.release }}-security main restricted universe multiverse
-    {% else %}deb http://ports.ubuntu.com/ubuntu-ports {{ image.release }} main restricted universe multiverse
-    deb http://ports.ubuntu.com/ubuntu-ports {{ image.release }}-updates main restricted universe multiverse
-    deb http://ports.ubuntu.com/ubuntu-ports {{ image.release }}-security main restricted universe multiverse
-    {% endif %}
-
 targets:
   lxc:
     create-message: |-
@@ -141,6 +132,28 @@ packages:
   update: true
   cleanup: true
 
+  repositories:
+    - name: sources.list
+      url: |-
+        deb http://archive.ubuntu.com/ubuntu {{ image.release }} main restricted universe multiverse
+        deb http://archive.ubuntu.com/ubuntu {{ image.release }}-updates main restricted universe multiverse
+        deb http://security.ubuntu.com/ubuntu {{ image.release }}-security main restricted universe multiverse
+      architectures:
+        - amd64
+        - i386
+
+    - name: sources.list
+      url: |-
+        deb http://ports.ubuntu.com/ubuntu-ports {{ image.release }} main restricted universe multiverse
+        deb http://ports.ubuntu.com/ubuntu-ports {{ image.release }}-updates main restricted universe multiverse
+        deb http://ports.ubuntu.com/ubuntu-ports {{ image.release }}-security main restricted universe multiverse
+      architectures:
+        - armhf
+        - arm64
+        - powerpc
+        - powerpc64
+        - ppc64el
+
   sets:
     - packages:
       - apt-transport-https
diff --git a/doc/source.md b/doc/source.md
index e9af1ae..0fc56c6 100644
--- a/doc/source.md
+++ b/doc/source.md
@@ -12,7 +12,6 @@ source:
     variant: <string>
     suite: <string>
     same_as: <boolean>
-    apt_sources: <string>
     skip_verification: <boolean>
     early_packages: <array>
 ```