Lubuntu
/
livecd-rootfs
mirror of https://git.launchpad.net/livecd-rootfs
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.415 to ubuntu/yakkety-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: ec4b354469

New changelog entries:
  [ Michael Vogt ]
  * 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).
impish
Steve Langasek 9 years ago committed by usd-importer
parent ec4b354469
commit 2848624193
3 changed files with 61 additions and 104 deletions
Show Stats Download Patch File Download Diff File

13
debian/changelog vendored
Unescape View File

@ -1,3 +1,16 @@
livecd-rootfs (2.415) yakkety; urgency=medium
[ Michael Vogt ]
* 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).
-- Steve Langasek <steve.langasek@ubuntu.com> Wed, 08 Jun 2016 12:59:38 -0700
livecd-rootfs (2.414) yakkety; urgency=medium livecd-rootfs (2.414) yakkety; urgency=medium
* Update post-debootstrap hashes for ubuntu-touch. * Update post-debootstrap hashes for ubuntu-touch.

139
live-build/auto/build
Unescape 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. ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
if [ "$MULTIVERSE" = true ]; then ## team, and may not be under a free licence. Please satisfy yourself as to
alldists="$alldists multiverse" ## your rights to use the software. Also, please note that software in
cat >> $file <<EOF
## 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 ## 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
## Uncomment the following two lines to add software from Canonical's
cat >> $file <<EOF ## 'partner' repository.
## This software is not part of Ubuntu, but is offered by Canonical and the
deb $LB_PARENT_MIRROR_BINARY $codename-security $dists ## respective vendors as a service to Ubuntu users.
deb-src $LB_PARENT_MIRROR_BINARY $codename-security $dists # deb http://archive.canonical.com/ubuntu $LB_DISTRIBUTION partner
EOF # deb-src http://archive.canonical.com/ubuntu $LB_DISTRIBUTION partner
# Security sources for Ubuntu universe; not used much, but e.g. unsupported deb http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security main restricted
# binary packages from a supported source package will end up here. # deb-src http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security main restricted
if [ "$UNIVERSE" = true ]; then deb http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security universe
COMMENT= # deb-src http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security universe
else deb http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security multiverse
COMMENT='# ' # deb-src http://security.ubuntu.com/ubuntu $LB_DISTRIBUTION-security multiverse
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 ====="
@ -329,8 +259,9 @@ if [ "$PROJECT:$SUBPROJECT" = "ubuntu-core:system-image" ]; then
VERSION="$(lsb_release -r -s)+$(date +20%y%m%d.%H-%M)" VERSION="$(lsb_release -r -s)+$(date +20%y%m%d.%H-%M)"
CORENAME="ubuntu-core"
cat > $rootfs/meta/snap.yaml <<EOF cat > $rootfs/meta/snap.yaml <<EOF
name: ubuntu-core name: $CORENAME
version: $VERSION version: $VERSION
summary: The core runtime environment for snapd summary: The core runtime environment for snapd
architectures: [$ARCH] architectures: [$ARCH]
@ -340,7 +271,7 @@ EOF
apt-get -y install snapcraft apt-get -y install snapcraft
snapcraft snap $rootfs snapcraft snap $rootfs
snapfile="$(ls core*.snap)" snapfile="$(ls ${CORENAME}*.snap)"
cp -a $snapfile $PREFIX.os.snap cp -a $snapfile $PREFIX.os.snap
fi fi
fi fi

13
live-build/ubuntu-core/hooks/700-classic-dir
Unescape View File

@ -0,0 +1,13 @@
#!/bin/sh
#
# removing debian packaging artifacts
set -ex
echo "I: Adding var/lib/snapd/classic"
PREFIX=binary/boot/filesystem.dir
(cd $PREFIX
install -m755 -d var/lib/snapd/classic
)
Write Preview
Loading…
Cancel
Save