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

Import patches-unapplied version 2.386 to ubuntu/xenial-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 6052273963885922b338a4ceafc2c68f6c7457be

New changelog entries:
  [ Michael Vogt ]
  * add dpkg.list to assets of the kernel snap
  * add grub-efi-arm64 to the arm64 OS snap
  [ Adam Conrad ]
  * Build raspi2 images with multiverse for firmware.
This commit is contained in:
Adam Conrad 2016-03-14 10:31:55 -06:00 committed by usd-importer
parent 6052273963
commit a668d140cc
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
debian/changelog vendored
View File

@ -1,3 +1,14 @@
livecd-rootfs (2.386) xenial; urgency=medium
[ Michael Vogt ]
* add dpkg.list to assets of the kernel snap
* add grub-efi-arm64 to the arm64 OS snap
[ Adam Conrad ]
* Build raspi2 images with multiverse for firmware.
-- Adam Conrad <adconrad@ubuntu.com> Mon, 14 Mar 2016 10:31:55 -0600
livecd-rootfs (2.385) xenial; urgency=medium livecd-rootfs (2.385) xenial; urgency=medium
* add snap building for kernel snaps * add snap building for kernel snaps

6
live-build/auto/build
View File

@ -491,11 +491,17 @@ EOF
# compress everything # compress everything
cd $TMPDIR cd $TMPDIR
tarname="device.tar.gz" tarname="device.tar.gz"
manifestname="device.manifest"
if [ "$devarch" = "raspi2" ];then if [ "$devarch" = "raspi2" ];then
tarname="raspi2.$tarname" tarname="raspi2.$tarname"
manifestname="$devarch.$manifestname"
fi fi
# create tarfile
tar -c -z -f $HERE/$PREFIX.$tarname system assets hardware.yaml tar -c -z -f $HERE/$PREFIX.$tarname system assets hardware.yaml
# create device specific manifest to track kernel dpkg version
cp assets/dpkg.list $HERE/$PREFIX.$manifestname
# show size of initrd and kernel in the log # show size of initrd and kernel in the log
ls -lh assets/ ls -lh assets/

4
live-build/auto/config
View File

@ -424,7 +424,7 @@ case $PROJECT in
add_package install flash-kernel u-boot-tools add_package install flash-kernel u-boot-tools
;; ;;
arm64) arm64)
add_package install u-boot-tools add_package install u-boot-tools grub-efi-arm64
;; ;;
esac esac
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
@ -569,7 +569,7 @@ case $ARCH in
echo "d-i passwd/auto-login boolean true" >config/preseed/autologin.preseed.chroot echo "d-i passwd/auto-login boolean true" >config/preseed/autologin.preseed.chroot
;; ;;
raspi2) raspi2)
COMPONENTS='main restricted universe' COMPONENTS='main restricted universe multiverse'
add_package install raspberrypi2-firmware u-boot-rpi flash-kernel u-boot-tools add_package install raspberrypi2-firmware u-boot-rpi flash-kernel u-boot-tools
BINARY_REMOVE_LINUX=false BINARY_REMOVE_LINUX=false
;; ;;