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

Import patches-unapplied version 2.345 to ubuntu/wily-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 836f3d5f7204cef41b54bd5a0e5a14a792139606

New changelog entries:
  [ Łukasz Zemczak ]
  * lp:~sil2100/livecd-rootfs/pocket-desktop:
    - add support for pocket-desktop
  [ Oliver Grawert ]
  * add user/group fixes for snappy shipping tpm-tools
This commit is contained in:
Michael Vogt 2015-09-21 16:19:43 +02:00 committed by usd-importer
parent 836f3d5f72
commit b9bcbd6aae
5 changed files with 39 additions and 13 deletions

11
debian/changelog vendored

@ -1,3 +1,14 @@
livecd-rootfs (2.345) wily; urgency=medium
[ Łukasz Zemczak ]
* lp:~sil2100/livecd-rootfs/pocket-desktop:
- add support for pocket-desktop
[ Oliver Grawert ]
* add user/group fixes for snappy shipping tpm-tools
-- Michael Vogt <michael.vogt@ubuntu.com> Mon, 21 Sep 2015 16:19:43 +0200
livecd-rootfs (2.344) wily; urgency=medium
* Drop 'landscape-client' from Cloud Images (LP: #1497030).

16
live-build/auto/build

@ -238,11 +238,13 @@ 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" ] && [ "$ARCH" = "armhf" ]; then
INFO_DESC="$(lsb_release -d -s)"
echo "$INFO_DESC - $ARCH ($BUILDSTAMP)" >chroot/etc/media-info
mkdir -p chroot/var/log/installer
Chroot chroot "ln -s /etc/media-info /var/log/installer/media-info"
if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-pd" ]; then
if [ "$ARCH" = "armhf" ]; then
INFO_DESC="$(lsb_release -d -s)"
echo "$INFO_DESC - $ARCH ($BUILDSTAMP)" >chroot/etc/media-info
mkdir -p chroot/var/log/installer
Chroot chroot "ln -s /etc/media-info /var/log/installer/media-info"
fi
fi
if [ "$PROJECT" = "ubuntu-cpc" ]; then
cat > chroot/etc/apt/sources.list << EOF
@ -313,7 +315,7 @@ elif [ -e binary-tar.tar.gz ]; then
cp -a binary-tar.tar.gz "$PREFIX.rootfs.tar.gz"
fi
if [ "$PROJECT" = "ubuntu-touch" ]; then
if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-pd" ]; then
(cd "binary/$INITFS/custom.dir/" && tar -c *) | \
gzip -9 --rsyncable > "$PREFIX.custom.tar.gz"
chmod 644 "$PREFIX.custom.tar.gz"
@ -436,7 +438,7 @@ if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then
fi
if [ "$PROJECT" = "ubuntu-touch" ]; then
if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-pd" ]; then
sourceslist="chroot/etc/apt/sources.list"
lb chroot_proc install "$@"

18
live-build/auto/config

@ -129,7 +129,7 @@ case $IMAGEFORMAT in
*)
case $PROJECT in
ubuntu-server|ubuntu-touch)
ubuntu-server|ubuntu-touch|ubuntu-pd)
;;
*)
add_package live lupin-casper
@ -162,7 +162,7 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then
ubuntu-server)
add_package live oem-config-debconf ubiquity-frontend-debconf
;;
ubuntu-core|base|ubuntu-touch|ubuntu-cpc|ubuntu-desktop-next)
ubuntu-core|base|ubuntu-touch|ubuntu-pd|ubuntu-cpc|ubuntu-desktop-next)
;;
*)
add_package live oem-config-gtk ubiquity-frontend-gtk
@ -420,8 +420,14 @@ case $PROJECT in
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
;;
ubuntu-touch)
add_package install ubuntu-minimal ubuntu-touch systemd-sysv- packagekit ubuntu-system-settings-online-accounts
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
COMPONENTS='main restricted universe'
BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu'
export LB_BOOTSTRAP_INCLUDE='apt-transport-https gnupg'
@ -524,7 +530,7 @@ case $ARCH in
esac
case $PROJECT in
ubuntu-server|ubuntu-core|ubuntu-touch)
ubuntu-server|ubuntu-core|ubuntu-touch|ubuntu-pd)
case $SUBPROJECT in
system-image)
# keep the kernel for the system-image build
@ -665,7 +671,7 @@ EOF
fi
;;
ubuntu-touch:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*)
ubuntu-touch:*|ubuntu-pd:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*)
cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \
config/
;;

6
live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early

@ -45,6 +45,7 @@ systemd-bus-proxy:x:106:111:systemd Bus Proxy,,,:/run/systemd:/bin/false
docker:x:107:113::/nonexistent:/bin/false
syslog:x:108:114::/home/syslog:/bin/false
dnsmasq:x:109:65534:dnsmasq,,,:/var/lib/misc:/bin/false
tss:x:109:116::/var/lib/tpm:/bin/false
EOF
else
echo "/etc/passwd post-debootstrap hash doesn't match record" >&2
@ -85,6 +86,7 @@ systemd-bus-proxy:*:16413:0:99999:7:::
docker:*:16413:0:99999:7:::
syslog:*:16521:0:99999:7:::
dnsmasq:*:16644:0:99999:7:::
tss:*:16701:0:99999:7:::
EOF
else
echo "/etc/shadow post-debootstrap hash doesn't match record" >&2
@ -149,6 +151,8 @@ systemd-bus-proxy:x:111:
input:x:112:
docker:x:113:ubuntu
syslog:x:114:
pkcs11:x:115:root
tss:x:116:
EOF
else
echo "/etc/group post-debootstrap hash doesn't match record" >&2
@ -213,6 +217,8 @@ systemd-bus-proxy:!::
input:!::
docker:!::ubuntu
syslog:!::
pkcs11:!::root
tss:!::
EOF
else
echo "/etc/gshadow post-debootstrap hash doesn't match record" >&2

1
live-build/ubuntu-pd Symbolic link

@ -0,0 +1 @@
ubuntu-touch/