[Merge] ~juliank/livecd-rootfs:deb822-sources into livecd-rootfs:ubuntu/master

[Julian Andres Klode]

Diff comments:

> diff --git a/live-build/functions b/live-build/functions
> index fe93c71..c162b6f 100644
> --- a/live-build/functions
> +++ b/live-build/functions
> @@ -860,49 +860,52 @@ configure_universe() {
>          # preinstalled being slightly different in what it doesn't ask) from
>          # debian-installer's apt-setup:
>  
> -        cat > chroot/etc/apt/sources.list << EOF
> +        cat > chroot/etc/apt/sources.list.d/ubuntu.sources << EOF
>  # See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
>  # newer versions of the distribution.
> -deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION main restricted
> -# deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION main restricted
> -
> -## Major bug fix updates produced after the final release of the
> -## distribution.
> -deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates main restricted
> -# deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates main restricted
> -
> -## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
> -## team. Also, please note that software in universe WILL NOT receive any
> -## review or updates from the Ubuntu security team.
> -deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION universe
> -# deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION universe
> -deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates universe
> -# deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates universe
> -
> -## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
> -## team, and may not be under a free licence. Please satisfy yourself as to
> -## your rights to use the software. Also, please note that software in
> -## multiverse WILL NOT receive any review or updates from the Ubuntu
> -## security team.
> -deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION multiverse
> -# deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION multiverse
> -deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates multiverse
> -# deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates multiverse
> -
> -## N.B. software from this repository may not have been tested as
> -## extensively as that contained in the main release, although it includes
> -## newer versions of some applications which may provide useful features.
> -## Also, please note that software in backports WILL NOT receive any review
> -## or updates from the Ubuntu security team.
> -deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-backports main restricted universe multiverse
> -# deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-backports main restricted universe multiverse
> -
> -deb $LB_PARENT_MIRROR_BINARY_SECURITY $LB_DISTRIBUTION-security main restricted
> -# deb-src $LB_PARENT_MIRROR_BINARY_SECURITY $LB_DISTRIBUTION-security main restricted
> -deb $LB_PARENT_MIRROR_BINARY_SECURITY $LB_DISTRIBUTION-security universe
> -# deb-src $LB_PARENT_MIRROR_BINARY_SECURITY $LB_DISTRIBUTION-security universe
> -deb $LB_PARENT_MIRROR_BINARY_SECURITY $LB_DISTRIBUTION-security multiverse
> -# deb-src $LB_PARENT_MIRROR_BINARY_SECURITY $LB_DISTRIBUTION-security multiverse
> +
> +## Ubuntu distribution repository
> +##
> +## The following settings can be adjusted to configure which packages to use from Ubuntu.
> +## Mirror your choices (except for URIs and Suites) in the security section below to
> +## ensure timely security updates.
> +##
> +## Types: Append deb-src to enable the fetching of source package.
> +## URIs: A URL to the repository (you may add multiple URLs)
> +## Suites: The following additional suites can be configured

No, that doesn't make sense, -security is in the next paragraph.

> +##   <name>-updates   - Major bug fix updates produced after the final release of the
> +##                      distribution.
> +##   <name>-backports - software from this repository may not have been tested as
> +##                      extensively as that contained in the main release, although it includes
> +##                      newer versions of some applications which may provide useful features.
> +##                      Also, please note that software in backports WILL NOT receive any review
> +##                      or updates from the Ubuntu security team.
> +## Components: Aside from main, the following components can be added to the list
> +##   restricted  - Software that may not be under a free license, or protected by patents.
> +##   universe    - Community maintained packages.
> +##                 Software from this repository is only maintained and supported by Canonical
> +##                 for machines with Ubuntu Pro subscriptions. Without Ubuntu Pro, the Ubuntu
> +##                 community provides best-effort security maintenance.
> +##   multiverse  - Community maintained of restricted. Software from this repository is
> +##                 ENTIRELY UNSUPPORTED by the Ubuntu team, and may not be under a free
> +##                 licence. Please satisfy yourself as to your rights to use the software.
> +##                 Also, please note that software in multiverse WILL NOT receive any
> +##                 review or updates from the Ubuntu security team.
> +##
> +## See the sources.list(5) manual page for further settings.
> +Types: deb
> +URIs: $LB_PARENT_MIRROR_BINARY
> +Suites: $LB_DISTRIBUTION $LB_DISTRIBUTION-updates $LB_DISTRIBUTION-backports
> +Components: main universe restricted multiverse
> +Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
> +
> +## Ubuntu security updates. Aside from URIs and Suites,
> +## this should mirror your choices in the previous section.
> +Types: deb
> +URIs: $LB_PARENT_MIRROR_BINARY_SECURITY
> +Suites: $LB_DISTRIBUTION-security
> +Components: main universe restricted multiverse
> +Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
>  EOF
>  
>  fi
> diff --git a/magic-proxy b/magic-proxy
> index af765c3..598ad69 100755
> --- a/magic-proxy
> +++ b/magic-proxy
> @@ -643,6 +643,11 @@ class LPInReleaseIndexCli:
>          """Inject by-hash and inrelease-path settings into a sources.list."""
>          sources_list = self._infile
>  
> +        if sources_list.endswith(".sources"):
> +            sys.stderr.write("{}: Injection not supported for deb822: {}.\n"
> +                    .format(self._name, sources_list))
> +            sys.exit(EXIT_ERR)

These comments doesn't make sense sense at this point, how is this relevant to the magic-proxy?

> +
>          if not os.path.exists(sources_list):
>              sys.stderr.write("{}: No such file: {}.\n"
>                      .format(self._name, sources_list))


-- 
https://code.launchpad.net/~juliank/livecd-rootfs/+git/livecd-rootfs/+merge/458366
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.