[gnome-build-meta/valentindavid/pinebook-pro: 14/14] Pinebook Pro: Remove device tree from OSTree. It is provided through EFI.
- From: Valentin David <valentindavid src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/valentindavid/pinebook-pro: 14/14] Pinebook Pro: Remove device tree from OSTree. It is provided through EFI.
- Date: Thu, 7 May 2020 22:19:09 +0000 (UTC)
commit 6049ab53d3ab8fba4fbafcb0642159cbcfbd8c8c
Author: Valentin David <valentin david codethink co uk>
Date: Fri May 8 00:16:38 2020 +0200
Pinebook Pro: Remove device tree from OSTree. It is provided through EFI.
elements/boards/pinebook-pro/image.bst | 5 ++++-
elements/boards/pinebook-pro/initramfs.bst | 13 -------------
2 files changed, 4 insertions(+), 14 deletions(-)
---
diff --git a/elements/boards/pinebook-pro/image.bst b/elements/boards/pinebook-pro/image.bst
index c8993f2f..1e015261 100644
--- a/elements/boards/pinebook-pro/image.bst
+++ b/elements/boards/pinebook-pro/image.bst
@@ -3,6 +3,7 @@ kind: script
build-depends:
- boards/pinebook-pro/image-deps.bst
- boards/pinebook-pro/repo.bst
+- boards/pinebook-pro/linux.bst
variables:
linux-root: B921B045-1DF0-41C3-AF44-4C6F280D3FAE
@@ -24,6 +25,8 @@ config:
destination: '/source-repo'
- element: boards/pinebook-pro/image-deps.bst
destination: '/'
+ - element: boards/pinebook-pro/linux.bst
+ destination: '/kernel'
commands:
- mkdir -p "${OSTREE_REPO}"
@@ -63,7 +66,7 @@ config:
cp -r "%{sysroot}"/ostree/boot.1/gnome-os/*/*/boot/EFI/ "%{sysroot}/boot/"
- |
- cp -r "%{sysroot}"/ostree/boot.1/gnome-os/*/*/boot/dtb/ "%{sysroot}/boot/"
+ cp -r "/kernel/boot/dtbs" "%{sysroot}/boot/dtb"
- |
size=$(($(du -s -B 4K "%{sysroot}" | cut -f1)*4+200*1024))
diff --git a/elements/boards/pinebook-pro/initramfs.bst b/elements/boards/pinebook-pro/initramfs.bst
index c54049c0..16f95bce 100644
--- a/elements/boards/pinebook-pro/initramfs.bst
+++ b/elements/boards/pinebook-pro/initramfs.bst
@@ -48,12 +48,6 @@ config:
--install 'fsck.ext4' \
"%{install-root}/usr/lib/modules/${version}/initramfs"
- - |
- version="$(ls -1 /lib/modules | head -n1)"
- install -Dm644 \
- /boot/dtbs/rockchip/rk3399-pinebook-pro.dtb \
- "%{install-root}/usr/lib/modules/${version}/devicetree"
-
- |
version="$(ls -1 /lib/modules | head -n1)"
cp /boot/vmlinuz "%{install-root}/usr/lib/modules/${version}/vmlinuz"
@@ -72,10 +66,3 @@ config:
console-mode keep
default *
EOF
-
- # FIXME: u-boot also needs to load the dtb. We should find a way
- # to keep it updated.
- - |
- install -Dm644 \
- /boot/dtbs/rockchip/rk3399-pinebook-pro.dtb \
- "%{install-root}/boot/dtb/rockchip/rk3399-pinebook-pro.dtb"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]