Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-05 16:01:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge lp:~daniel-thewatkins/livecd-rootfs/enable-backports

Browse Source
This commit is contained in:
Steve Langasek 2016-06-08 12:54:08 -07:00
commit 6c5dc72d80
2 changed files with 37 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,7 +1,14 @@
livecd-rootfs (2.415) UNRELEASED; urgency=medium livecd-rootfs (2.415) UNRELEASED; urgency=medium
[ Michael Vogt ]
* add var/lib/snapd/classic in ubuntu-core * add var/lib/snapd/classic in ubuntu-core
[ Daniel Watkins ]
* Don't overwrite the default sources.list in cloud images.
* Replace sources.list generated using COMPONENTS with the sources.list from
an Ubuntu Server installation (i.e. with all components enabled, and all
deb-src lines commented).
-- Michael Vogt <michael.vogt@ubuntu.com> Wed, 08 Jun 2016 19:10:13 +0200 -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 08 Jun 2016 19:10:13 +0200
livecd-rootfs (2.414) yakkety; urgency=medium livecd-rootfs (2.414) yakkety; urgency=medium

124
live-build/auto/build
View File

@ -58,116 +58,56 @@ EOF
# preinstalled being slightly different in what it doesn't ask) from # preinstalled being slightly different in what it doesn't ask) from
# debian-installer's apt-setup: # debian-installer's apt-setup:
codename=$LB_DISTRIBUTION cat > chroot/etc/apt/sources.list << EOF
file="chroot/etc/apt/sources.list"
dists="main"
alldists="main"
if echo "$LB_PARENT_ARCHIVE_AREAS" | grep -q restricted; then
dists="$dists restricted"
alldists="$alldists restricted"
fi
if echo "$LB_PARENT_ARCHIVE_AREAS" | grep -q universe; then
UNIVERSE=true
else
UNIVERSE=false
fi
if echo "$LB_PARENT_ARCHIVE_AREAS" | grep -q multiverse; then
MULTIVERSE=true
else
MULTIVERSE=false
fi
cat > $file <<EOF
# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to # See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
# newer versions of the distribution. # newer versions of the distribution.
deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION main restricted
deb $LB_PARENT_MIRROR_BINARY $codename $dists # deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION main restricted
deb-src $LB_PARENT_MIRROR_BINARY $codename $dists
## Major bug fix updates produced after the final release of the ## Major bug fix updates produced after the final release of the
## distribution. ## distribution.
deb $LB_PARENT_MIRROR_BINARY $codename-updates $dists deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates main restricted
deb-src $LB_PARENT_MIRROR_BINARY $codename-updates $dists # deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates main restricted
EOF
# Even if universe isn't enabled, we write example lines for it.
echo >> $file
if [ "$UNIVERSE" = true ]; then
alldists="$alldists universe"
COMMENT=
else
cat >> $file <<EOF
## Uncomment the following two lines to add software from the 'universe'
## repository.
EOF
COMMENT='# '
fi
cat >> $file <<EOF
## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
## team. Also, please note that software in universe WILL NOT receive any ## team. Also, please note that software in universe WILL NOT receive any
## review or updates from the Ubuntu security team. ## review or updates from the Ubuntu security team.
${COMMENT}deb $LB_PARENT_MIRROR_BINARY $codename universe deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION universe
${COMMENT}deb-src $LB_PARENT_MIRROR_BINARY $codename universe # deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION universe
${COMMENT}deb $LB_PARENT_MIRROR_BINARY $codename-updates universe deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates universe
${COMMENT}deb-src $LB_PARENT_MIRROR_BINARY $codename-updates universe # deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates universe
EOF
# Multiverse is different, don't write anything unless enabled.
if [ "$MULTIVERSE" = true ]; then
alldists="$alldists multiverse"
cat >> $file <<EOF
## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu ## 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 ## 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 ## your rights to use the software. Also, please note that software in
## multiverse WILL NOT receive any review or updates from the Ubuntu ## multiverse WILL NOT receive any review or updates from the Ubuntu
## security team. ## security team.
deb $LB_PARENT_MIRROR_BINARY $codename multiverse deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION multiverse
deb-src $LB_PARENT_MIRROR_BINARY $codename multiverse # deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION multiverse
deb $LB_PARENT_MIRROR_BINARY $codename-updates multiverse deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates multiverse
deb-src $LB_PARENT_MIRROR_BINARY $codename-updates multiverse # deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-updates multiverse
EOF
fi
cat >> $file <<EOF
## N.B. software from this repository may not have been tested as ## N.B. software from this repository may not have been tested as
## extensively as that contained in the main release, although it includes ## extensively as that contained in the main release, although it includes
## newer versions of some applications which may provide useful features. ## newer versions of some applications which may provide useful features.
## Also, please note that software in backports WILL NOT receive any review ## Also, please note that software in backports WILL NOT receive any review
## or updates from the Ubuntu security team. ## or updates from the Ubuntu security team.
# deb $LB_PARENT_MIRROR_BINARY $codename-backports $alldists deb $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-backports main restricted universe multiverse
# deb-src $LB_PARENT_MIRROR_BINARY $codename-backports $alldists # deb-src $LB_PARENT_MIRROR_BINARY $LB_DISTRIBUTION-backports main restricted universe multiverse
EOF
cat >> $file <<EOF ## 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 $LB_DISTRIBUTION partner
# deb-src http://archive.canonical.com/ubuntu $LB_DISTRIBUTION partner
deb $LB_PARENT_MIRROR_BINARY $codename-security $dists deb http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security main restricted
deb-src $LB_PARENT_MIRROR_BINARY $codename-security $dists # deb-src http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security main restricted
EOF deb http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security universe
# deb-src http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security universe
# Security sources for Ubuntu universe; not used much, but e.g. unsupported deb http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security multiverse
# binary packages from a supported source package will end up here. # deb-src http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security multiverse
if [ "$UNIVERSE" = true ]; then
COMMENT=
else
COMMENT='# '
fi
cat >> $file <<EOF
${COMMENT}deb $LB_PARENT_MIRROR_BINARY $codename-security universe
${COMMENT}deb-src $LB_PARENT_MIRROR_BINARY $codename-security universe
EOF
# Security sources for Ubuntu multiverse, with the same caveats as for
# universe.
if [ "$MULTIVERSE" = true ]; then
COMMENT=
else
COMMENT='# '
fi
cat >> $file <<EOF
${COMMENT}deb $LB_PARENT_MIRROR_BINARY $codename-security multiverse
${COMMENT}deb-src $LB_PARENT_MIRROR_BINARY $codename-security multiverse
EOF EOF
fi fi
@ -251,16 +191,6 @@ deb file:/var/lib/preinstalled-pool/ $LB_DISTRIBUTION $LB_PARENT_ARCHIVE_AREAS
build_name: server build_name: server
serial: $BUILDSTAMP serial: $BUILDSTAMP
EOF EOF
cat > chroot/etc/apt/sources.list << EOF
deb ${LB_PARENT_MIRROR_BINARY} ${LB_DISTRIBUTION} main restricted universe multiverse
deb ${LB_PARENT_MIRROR_BINARY} ${LB_DISTRIBUTION}-updates main restricted universe multiverse
deb ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}-security main restricted universe multiverse
EOF
lb chroot_hosts install
lb chroot_resolv install
Chroot chroot "apt-get update"
lb chroot_resolv remove
lb chroot_hosts remove
fi fi
echo "===== Checking size of /usr/share/doc =====" echo "===== Checking size of /usr/share/doc ====="