Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-09 09:51:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to the project approach, add a symlink for the hooks

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2015-09-18 17:38:46 +02:00
parent 5907a20a56
commit e0fcd94074
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
live-build/auto/build
View File

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

20
live-build/auto/config
View File

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

1
live-build/ubuntu-pd Symbolic link
View File

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