* Merged the following changes from upstream [ Łukasz 'sil2100' Zemczak ] * Remove the ubuntu-pd project from the scripts * Add instead an ubuntu-touch-custom project for custom re-builds of ubuntu-touch [ Daniel Watkins ] * Consolidate cloud images - Remove .tar.gz and .tar.xz (removed in favour of the squashfs). - Remove the MBR-only disk image in favour of the shared GPT/MBR UEFI image. - Remove '-disk1' from bootable image names. [ Phil Roche ] * Removed HWCLOCKACCESS=no from /etc/default/rcS (LP: #1581044)ubuntu/yakkety
commit
2616af2baf
@ -1,32 +0,0 @@
|
|||||||
#!/bin/bash -ex
|
|
||||||
|
|
||||||
if [ -n "$SUBARCH" ]; then
|
|
||||||
echo "Skipping rootfs build for subarch flavor build"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
. /build/config/functions
|
|
||||||
|
|
||||||
mkdir binary/boot/filesystem.dir
|
|
||||||
cp -a chroot/* binary/boot/filesystem.dir
|
|
||||||
|
|
||||||
setup_mountpoint binary/boot/filesystem.dir
|
|
||||||
|
|
||||||
chroot binary/boot/filesystem.dir dpkg-divert --local --rename /usr/sbin/grub-probe
|
|
||||||
chroot binary/boot/filesystem.dir touch /usr/sbin/grub-probe
|
|
||||||
chroot binary/boot/filesystem.dir chmod +x /usr/sbin/grub-probe
|
|
||||||
|
|
||||||
env DEBIAN_FRONTEND=noninteractive chroot binary/boot/filesystem.dir apt-get --purge remove --assume-yes '^linux-.*' 'linux-base+'
|
|
||||||
env DEBIAN_FRONTEND=noninteractive chroot binary/boot/filesystem.dir apt-get --purge remove --assume-yes '^grub-.*'
|
|
||||||
env DEBIAN_FRONTEND=noninteractive chroot binary/boot/filesystem.dir apt-get autoremove --purge --assume-yes
|
|
||||||
chroot binary/boot/filesystem.dir mkdir /lib/modules
|
|
||||||
|
|
||||||
chroot binary/boot/filesystem.dir rm /usr/sbin/grub-probe
|
|
||||||
chroot binary/boot/filesystem.dir dpkg-divert --remove --local --rename /usr/sbin/grub-probe
|
|
||||||
|
|
||||||
mv resolv.conf.tmp "binary/boot/filesystem.dir/etc/resolv.conf"
|
|
||||||
umount "binary/boot/filesystem.dir/proc"
|
|
||||||
umount "binary/boot/filesystem.dir/sys"
|
|
||||||
umount "binary/boot/filesystem.dir/dev/pts"
|
|
||||||
umount "binary/boot/filesystem.dir/dev"
|
|
||||||
umount "binary/boot/filesystem.dir/tmp"
|
|
@ -1,13 +0,0 @@
|
|||||||
#!/bin/bash -ex
|
|
||||||
# vi: ts=4 noexpandtab
|
|
||||||
#
|
|
||||||
# Generate the rootfs.tar.gz and manifest
|
|
||||||
|
|
||||||
if [ -n "$SUBARCH" ]; then
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
dpkg-query --admindir=binary/boot/filesystem.dir/var/lib/dpkg -W > livecd.ubuntu-cpc.rootfs.manifest
|
|
||||||
|
|
||||||
(cd "binary/boot/filesystem.dir/" && tar -c *) | \
|
|
||||||
xz > "livecd.ubuntu-cpc.rootfs.tar.xz"
|
|
@ -1,3 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
printf "HWCLOCKACCESS=no" >> /etc/default/rcS
|
|
Loading…
Reference in new issue