[gnome-build-meta/valentindavid/device-tree-from-efi: 6/6] Pinebook Pro: Remove device tree from OSTree.

[Javier Jardón Cabezas <jjardon src gnome org>]

commit cfcc3b79e48a4faa7613f44acef038352052cd67
Author: Valentin David <valentin david codethink co uk>
Date:   Fri May 8 00:16:38 2020 +0200

    Pinebook Pro: Remove device tree from OSTree.
    
    Device tree is provided through EFI. In this case it is from U-Boot.

 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 06be6a8c..a6df239e 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}"
@@ -59,7 +62,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 f23a63b1..a8008a06 100644
--- a/elements/boards/pinebook-pro/initramfs.bst
+++ b/elements/boards/pinebook-pro/initramfs.bst
@@ -47,12 +47,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"
@@ -71,10 +65,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"