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

* added additional CPC build targets:

Browse Source 
- added manifest generation for squashfs and root.tar.gz
  - added VMDK generation
  - added OVA generation from VMDK's
  - added generic Vagrant image generation
This commit is contained in:
Ben Howard 2015-11-13 08:13:51 -07:00
commit dd371c4a69
4 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
debian/changelog vendored
View File

@ -1,3 +1,26 @@
livecd-rootfs (2.356) xenial; urgency=medium
* added additional CPC build targets:
- added manifest generation for squashfs and root.tar.gz
- added VMDK generation
- added OVA generation from VMDK's
- added generic Vagrant image generation
-- Ben Howard <ben.howard@ubuntu.com> Fri, 13 Nov 2015 08:09:47 -0700
livecd-rootfs (2.355) xenial; urgency=medium
* fix input group in snappy
-- Oliver Grawert <ogra@ubuntu.com> Fri, 13 Nov 2015 12:52:34 +0100
livecd-rootfs (2.354) xenial; urgency=medium
* do not ship assets/dtbs/overlays in raspi2 tarball, it breaks
ubuntu-device-flash
-- Oliver Grawert <ogra@ubuntu.com> Fri, 13 Nov 2015 10:53:13 +0100
livecd-rootfs (2.353) xenial; urgency=medium livecd-rootfs (2.353) xenial; urgency=medium
* drop input group from snappy images, adjust md5 sums in * drop input group from snappy images, adjust md5 sums in

9
live-build/auto/build
View File

@ -425,6 +425,15 @@ case $PROJECT:$SUBPROJECT in
dtbs=$(find lib/firmware -type d -name 'device-tree' -print0) dtbs=$(find lib/firmware -type d -name 'device-tree' -print0)
if [ -n "$dtbs" ]; then if [ -n "$dtbs" ]; then
mv "$dtbs" $TMPDIR/assets/dtbs mv "$dtbs" $TMPDIR/assets/dtbs
case $devarch in
raspi2)
# ubuntu-device-flash does not like subdirs here, we need to tar it up
if [ -e $TMPDIR/assets/dtbs/overlays ]; then
tar -C $TMPDIR/assets/dtbs -f $TMPDIR/assets/dtbs/overlays.tgz -czv overlays
rm -rf $TMPDIR/assets/dtbs/overlays
fi
;;
esac
fi fi
# create hardware.yaml # create hardware.yaml

2
live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early
View File

@ -152,6 +152,7 @@ docker:x:113:ubuntu
syslog:x:114: syslog:x:114:
pkcs11:x:115:root pkcs11:x:115:root
tss:x:116: tss:x:116:
input:x:107:
EOF EOF
else else
echo "/etc/group post-debootstrap hash doesn't match record" >&2 echo "/etc/group post-debootstrap hash doesn't match record" >&2
@ -217,6 +218,7 @@ docker:!::ubuntu
syslog:!:: syslog:!::
pkcs11:!::root pkcs11:!::root
tss:!:: tss:!::
input:!::
EOF EOF
else else
echo "/etc/gshadow post-debootstrap hash doesn't match record" >&2 echo "/etc/gshadow post-debootstrap hash doesn't match record" >&2

2
live-build/ubuntu-cpc/hooks/042-vagrant.binary
View File

@ -18,7 +18,7 @@ my_d=$(dirname $(readlink -f ${0}))
architecture=$(chroot chroot dpkg --print-architecture) architecture=$(chroot chroot dpkg --print-architecture)
base_vmdk="livecd.ubuntu-cpc.disk1.vmdk" base_vmdk="livecd.ubuntu-cpc.disk1.vmdk"
if [[ "${architecture}" =~ (amd64|i386) ]]; then if [[ ! "${architecture}" =~ (amd64|i386) ]]; then
echo "Vagrant images are not supported for ${architecutre}" echo "Vagrant images are not supported for ${architecutre}"
exit 0 exit 0
elif [ ! -e ${base_vmdk} ]; then elif [ ! -e ${base_vmdk} ]; then