From dd53f8297fccb2a15f3f1a5b675c968e410676c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Tue, 27 Sep 2016 13:27:28 +0200 Subject: [PATCH] Import patches-unapplied version 2.408.5 to ubuntu/xenial-proposed Imported using git-ubuntu import. Changelog parent: c4386e711c93bc32c872f3d8b63665209f0b7124 New changelog entries: * Temporarily change the 60-install-click.chroot script to pull in clicks for arm64 builds from a different location for ubuntu-touch. * Add the new dhcpd user to touch hooks introduced by latest archive changes. * Remove the ubuntu-pd project logic. * Synced ubuntu-touch-custom changes from the vivid branch to xenial. This also adds a new symlink called ubuntu-touch-custom to the ubuntu-touch hooks dir. * Stop using the overlay PPA for touch livecd-rootfs changes (LP: #1628085). --- debian/changelog | 13 +++++++++++++ live-build/auto/build | 6 +++--- live-build/auto/config | 17 ++++++----------- live-build/{ubuntu-pd => ubuntu-touch-custom} | 0 .../hooks/00-uid-gid-fix.chroot_early | 4 ++++ .../ubuntu-touch/hooks/60-install-click.chroot | 17 +++++++++++++---- 6 files changed, 39 insertions(+), 18 deletions(-) rename live-build/{ubuntu-pd => ubuntu-touch-custom} (100%) diff --git a/debian/changelog b/debian/changelog index 65af962c..a4a89ee6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +livecd-rootfs (2.408.5) xenial; urgency=medium + + * Temporarily change the 60-install-click.chroot script to pull in clicks for + arm64 builds from a different location for ubuntu-touch. + * Add the new dhcpd user to touch hooks introduced by latest archive changes. + * Remove the ubuntu-pd project logic. + * Synced ubuntu-touch-custom changes from the vivid branch to xenial. This + also adds a new symlink called ubuntu-touch-custom to the ubuntu-touch hooks + dir. + * Stop using the overlay PPA for touch livecd-rootfs changes (LP: #1628085). + + -- Łukasz 'sil2100' Zemczak Tue, 27 Sep 2016 13:27:28 +0200 + livecd-rootfs (2.408.4) xenial; urgency=medium * live-build/ubuntu-cpc/hooks/042-vagrant.binary: fix unmount handling diff --git a/live-build/auto/build b/live-build/auto/build index bcc23008..aade2508 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -238,7 +238,7 @@ deb file:/var/lib/preinstalled-pool/ $LB_DISTRIBUTION $LB_PARENT_ARCHIVE_AREAS > chroot/etc/apt/sources.list rm chroot/etc/apt/sources.list.preinstall chroot/etc/apt/sources.list.orig fi - if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-pd" ]; then + if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then if [ "$ARCH" = "armhf" ]; then INFO_DESC="$(lsb_release -d -s)" echo "$INFO_DESC - $ARCH ($BUILDSTAMP)" >chroot/etc/media-info @@ -345,7 +345,7 @@ EOF fi fi -if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-pd" ]; then +if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then (cd "binary/$INITFS/custom.dir/" && tar -c *) | \ gzip -9 --rsyncable > "$PREFIX.custom.tar.gz" chmod 644 "$PREFIX.custom.tar.gz" @@ -689,7 +689,7 @@ if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then fi -if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-pd" ]; then +if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then sourceslist="chroot/etc/apt/sources.list" lb chroot_proc install "$@" diff --git a/live-build/auto/config b/live-build/auto/config index 4d2b728f..2e7aa223 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -135,7 +135,7 @@ case $IMAGEFORMAT in *) case $PROJECT in - ubuntu-server|ubuntu-touch|ubuntu-pd) + ubuntu-server|ubuntu-touch|ubuntu-touch-custom) ;; *) add_package live lupin-casper @@ -168,7 +168,7 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then ubuntu-server) add_package live oem-config-debconf ubiquity-frontend-debconf ;; - ubuntu-core|ubuntu-base|base|ubuntu-touch|ubuntu-pd|ubuntu-cpc|ubuntu-desktop-next) + ubuntu-core|ubuntu-base|base|ubuntu-touch|ubuntu-touch-custom|ubuntu-cpc|ubuntu-desktop-next) ;; *) add_package live oem-config-gtk ubiquity-frontend-gtk @@ -419,13 +419,8 @@ case $PROJECT in OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal" ;; - ubuntu-touch|ubuntu-pd) - if [ "$PROJECT" = "ubuntu-touch" ]; then - meta_package=ubuntu-touch - else - meta_package=ubuntu-pocket-desktop - fi - add_package install ubuntu-minimal $meta_package systemd-sysv- packagekit ubuntu-system-settings-online-accounts + ubuntu-touch|ubuntu-touch-custom) + add_package install ubuntu-minimal ubuntu-touch systemd-sysv- packagekit ubuntu-system-settings-online-accounts COMPONENTS='main restricted universe' BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu' @@ -563,7 +558,7 @@ case $ARCH in esac case $PROJECT in - ubuntu-server|ubuntu-core|ubuntu-base|ubuntu-touch|ubuntu-pd) + ubuntu-server|ubuntu-core|ubuntu-base|ubuntu-touch|ubuntu-touch-custom) case $SUBPROJECT in system-image) # keep the kernel for the system-image build @@ -749,7 +744,7 @@ EOF fi ;; - ubuntu-touch:*|ubuntu-pd:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*) + ubuntu-touch:*|ubuntu-touch-custom:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*) cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \ config/ ;; diff --git a/live-build/ubuntu-pd b/live-build/ubuntu-touch-custom similarity index 100% rename from live-build/ubuntu-pd rename to live-build/ubuntu-touch-custom diff --git a/live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early b/live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early index a0fdadb3..9d492e74 100755 --- a/live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early +++ b/live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early @@ -53,6 +53,7 @@ systemd-network:x:112:117:systemd Network Management,,,:/run/systemd/netif:/bin/ systemd-resolve:x:113:118:systemd Resolver,,,:/run/systemd/resolve:/bin/false systemd-bus-proxy:x:114:119:systemd Bus Proxy,,,:/run/systemd:/bin/false nm-openvpn:x:115:120:NetworkManager OpenVPN,,,:/var/lib/openvpn/chroot:/bin/false +dhcpd:x:116:122::/var/run:/bin/false EOF else echo "/etc/passwd post-debootstrap hash doesn't match record" >&2 @@ -101,6 +102,7 @@ systemd-network:*:16372:0:99999:7::: systemd-resolve:*:16372:0:99999:7::: systemd-bus-proxy:*:16372:0:99999:7::: nm-openvpn:*:16909:0:99999:7::: +dhcpd:*:16925:0:99999:7::: EOF else echo "/etc/shadow post-debootstrap hash doesn't match record" >&2 @@ -186,6 +188,7 @@ systemd-resolve:x:118: systemd-bus-proxy:x:119: input:x:121: nm-openvpn:x:120: +dhcpd:x:122: EOF else echo "/etc/group post-debootstrap hash doesn't match record" >&2 @@ -271,6 +274,7 @@ systemd-resolve:!:: systemd-bus-proxy:!:: input:!:: nm-openvpn:!:: +dhcpd:!:: EOF else echo "/etc/gshadow post-debootstrap hash doesn't match record" >&2 diff --git a/live-build/ubuntu-touch/hooks/60-install-click.chroot b/live-build/ubuntu-touch/hooks/60-install-click.chroot index 2fec8a0f..cbebda2b 100755 --- a/live-build/ubuntu-touch/hooks/60-install-click.chroot +++ b/live-build/ubuntu-touch/hooks/60-install-click.chroot @@ -4,8 +4,19 @@ set -e echo "Setting up click packages" +CLICKARCH=$(dpkg --print-architecture) + click_uri=http://archive-team.internal/click_packages -click_list=$click_uri/click_list +if [ "$CLICKARCH" = "arm64" ]; then + # FIXME: this is temporary. Since right now we can't have arm64 clicks in the store + # (before implementing fat-packages), we need to fetch the arm64 click list from a + # different place + click_list=$click_uri/click_list.arm64 + click_install_flags="--allow-unauthenticated" +else + click_list=$click_uri/click_list + click_install_flags="" +fi click_db=/usr/share/click/preinstalled click_db_custom=/custom/click @@ -20,8 +31,6 @@ tmpdir="$(mktemp -d)" cleanup () { rm -rf "$tmpdir"; } trap cleanup EXIT -CLICKARCH=$(dpkg --print-architecture) - wget --no-verbose -O "$tmpdir/click_list" "$click_list" for package in $(cat "$tmpdir/click_list") do @@ -61,7 +70,7 @@ do mv /etc/click/databases/10_core.conf \ /etc/click/databases/10_core.conf.tmp fi - click install --force-missing-framework --root="$root" --all-users \ + click install --force-missing-framework --root="$root" --all-users $click_install_flags \ "$tmpdir/$package" if [ "$root" = "$click_db_custom" ]; then mv /etc/click/databases/10_core.conf.tmp \