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

merged lp:~sil2100/livecd-rootfs/pocket-desktop

Browse Source
This commit is contained in:
Michael Vogt 2015-09-21 16:20:57 +02:00
commit fe696a8bb9
4 changed files with 30 additions and 13 deletions
debian
changelog
live-build
auto
buildconfig
ubuntu-pd

8
debian/changelog vendored

@ -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 <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/
;;

1
live-build/ubuntu-pd Symbolic link

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