diff --git a/debian/changelog b/debian/changelog index 780aa33e..90c37253 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.345) UNRELEASED; urgency=medium + + [ Ɓukasz Zemczak ] + * lp:~sil2100/livecd-rootfs/pocket-desktop: + - add support for pocket-desktop + + -- Michael Vogt Mon, 21 Sep 2015 16:19:43 +0200 + livecd-rootfs (2.344) wily; urgency=medium * Drop 'landscape-client' from Cloud Images (LP: #1497030). diff --git a/live-build/auto/build b/live-build/auto/build index 40968052..a9cacabc 100755 --- a/live-build/auto/build +++ b/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 "$@" diff --git a/live-build/auto/config b/live-build/auto/config index e35c7ba6..abb3a339 100755 --- a/live-build/auto/config +++ b/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/ ;; diff --git a/live-build/ubuntu-pd b/live-build/ubuntu-pd new file mode 120000 index 00000000..ab44653c --- /dev/null +++ b/live-build/ubuntu-pd @@ -0,0 +1 @@ +ubuntu-touch/ \ No newline at end of file