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

add u-boot-tools to all snappy arches, drop flash-kernel from snappy, create /boot/uboot dir on all snappy arches and configure /etc/fw_env.config

Browse Source
This commit is contained in:
Oliver Grawert 2016-05-13 21:06:41 +02:00
parent d436f951c3
commit 56e798bcbd
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -1,9 +1,16 @@
livecd-rootfs (2.411) UNRELEASED; urgency=medium livecd-rootfs (2.411) UNRELEASED; urgency=medium
[ Michael Vogt ]
* update kernel snap building to match the new kernel policy * update kernel snap building to match the new kernel policy
* system-image: add /usr/local/bin/xdg-open dbus helper * system-image: add /usr/local/bin/xdg-open dbus helper
-- Michael Vogt <michael.vogt@ubuntu.com> Tue, 10 May 2016 18:16:56 -0700 [ Oliver Grawert ]
* add u-boot-tools to all snappy arches
* drop flash-kernel from snappy, it is useless there
* create /boot/uboot dir on all arches and configure /etc/fw_env.config
everywhere
-- Oliver Grawert <ogra@ubuntu.com> Fri, 13 May 2016 21:01:34 +0200
livecd-rootfs (2.410) yakkety; urgency=medium livecd-rootfs (2.410) yakkety; urgency=medium

8
live-build/auto/config
View File

@ -362,6 +362,8 @@ case $PROJECT in
# no Task: header yet # no Task: header yet
add_package install snapd add_package install snapd
add_package install ubuntu-core-snapd-units add_package install ubuntu-core-snapd-units
# we want all arches to have u-boot-tools
add_package install u-boot-tools
# no minimal as we want to be really minimal # no minimal as we want to be really minimal
#add_task install minimal #add_task install minimal
@ -390,12 +392,6 @@ case $PROJECT in
add_package install grub-efi-amd64-signed add_package install grub-efi-amd64-signed
add_package install shim-signed add_package install shim-signed
;; ;;
armhf)
add_package install flash-kernel u-boot-tools
;;
arm64)
add_package install u-boot-tools
;;
esac esac
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none --initramfs-compression=none" OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none --initramfs-compression=none"

8
live-build/ubuntu-core/hooks/16-ensure-uboot.chroot
View File

@ -2,10 +2,8 @@
set -e set -e
case "$(dpkg --print-architecture)" in mkdir -p /boot/uboot
arm*) cat > /etc/fw_env.config <<EOF
mkdir -p /boot/uboot
cat > /etc/fw_env.config <<EOF
# snappy u-boot env config # snappy u-boot env config
# its crucial that we have the two entries here # its crucial that we have the two entries here
# u-boot/tools/env/fw_env.c # u-boot/tools/env/fw_env.c
@ -16,5 +14,3 @@ case "$(dpkg --print-architecture)" in
/boot/uboot/uboot.env 0x0000 0x20000 /boot/uboot/uboot.env 0x0000 0x20000
/boot/uboot/uboot.env 0x0000 0x20000 /boot/uboot/uboot.env 0x0000 0x20000
EOF EOF
;;
esac