[gnome-build-meta/jjardon/pinephone-pro-master: 3/6] Adapt to pinephone-pro

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

commit ce8100120e9faf8d38dbdbd85d9e7fb204727e98
Author: Javier Jardón <jjardon gnome org>
Date:   Sun Jan 30 13:48:40 2022 +0000

    Adapt to pinephone-pro

 elements/boards/pinephone-pro/arm-trusted-firmware.bst   |  2 +-
 elements/boards/pinephone-pro/deps.bst                   |  2 +-
 elements/boards/pinephone-pro/filesystem.bst             |  4 ++--
 elements/boards/pinephone-pro/image-deps.bst             |  2 +-
 elements/boards/pinephone-pro/image.bst                  | 16 ++++++++--------
 elements/boards/pinephone-pro/initial-scripts.bst        |  2 +-
 elements/boards/pinephone-pro/initramfs.bst              |  8 ++++----
 elements/boards/pinephone-pro/initramfs/deps.bst         |  2 +-
 .../boards/pinephone-pro/initramfs/initial-scripts.bst   |  2 +-
 elements/boards/pinephone-pro/repo.bst                   |  8 ++++----
 elements/boards/pinephone-pro/u-boot.bst                 |  4 ++--
 11 files changed, 26 insertions(+), 26 deletions(-)
---
diff --git a/elements/boards/pinephone-pro/arm-trusted-firmware.bst 
b/elements/boards/pinephone-pro/arm-trusted-firmware.bst
index 4175be28f..c8f0a4db3 100644
--- a/elements/boards/pinephone-pro/arm-trusted-firmware.bst
+++ b/elements/boards/pinephone-pro/arm-trusted-firmware.bst
@@ -14,7 +14,7 @@ build-depends:
 - boards/common/arm-none-eabi-gcc.bst
 
 variables:
-  board: pinebook_pro-rk3399
+  board: pinephone_pro-rk3399
 
 environment:
   CFLAGS: '-fno-stack-protector'
diff --git a/elements/boards/pinephone-pro/deps.bst b/elements/boards/pinephone-pro/deps.bst
index 9aad31edb..54aef9381 100644
--- a/elements/boards/pinephone-pro/deps.bst
+++ b/elements/boards/pinephone-pro/deps.bst
@@ -4,4 +4,4 @@ depends:
 - vm/common-deps.bst
 - vm/os-release-user.bst
 
-- boards/pinebook-pro/initramfs.bst
+- boards/pinephone-pro/initramfs.bst
diff --git a/elements/boards/pinephone-pro/filesystem.bst b/elements/boards/pinephone-pro/filesystem.bst
index 76cf9f5cf..a9e559f0a 100644
--- a/elements/boards/pinephone-pro/filesystem.bst
+++ b/elements/boards/pinephone-pro/filesystem.bst
@@ -1,8 +1,8 @@
 kind: compose
 
 build-depends:
-- boards/pinebook-pro/deps.bst
-- boards/pinebook-pro/initramfs.bst
+- boards/pinephone-pro/deps.bst
+- boards/pinephone-pro/initramfs.bst
 
 config:
   exclude:
diff --git a/elements/boards/pinephone-pro/image-deps.bst b/elements/boards/pinephone-pro/image-deps.bst
index c4d3f6473..243171ba1 100644
--- a/elements/boards/pinephone-pro/image-deps.bst
+++ b/elements/boards/pinephone-pro/image-deps.bst
@@ -1,7 +1,7 @@
 kind: stack
 
 depends:
-- boards/pinebook-pro/u-boot.bst
+- boards/pinephone-pro/u-boot.bst
 - core-deps/libostree.bst
 - core-deps/qemu.bst
 - freedesktop-sdk.bst:components/genimage.bst
diff --git a/elements/boards/pinephone-pro/image.bst b/elements/boards/pinephone-pro/image.bst
index e6dcdf6bf..acd0183db 100644
--- a/elements/boards/pinephone-pro/image.bst
+++ b/elements/boards/pinephone-pro/image.bst
@@ -1,14 +1,14 @@
 kind: script
 
 build-depends:
-- boards/pinebook-pro/image-deps.bst
-- boards/pinebook-pro/repo.bst
-- boards/pinebook-pro/linux.bst
+- boards/pinephone-pro/image-deps.bst
+- boards/pinephone-pro/repo.bst
+- boards/pinephone-pro/linux.bst
 
 variables:
   linux-root: B921B045-1DF0-41C3-AF44-4C6F280D3FAE
-  ostree-branch: gnome-os/aarch64/pinebook-pro
-  board: pinebook_pro-rk3399
+  ostree-branch: gnome-os/aarch64/pinephone-pro
+  board: pinephone_pro-rk3399
 
   sysroot: "/sysroot"
 
@@ -21,11 +21,11 @@ config:
     destination: '/sysroot'
   - element: ''
     destination: '/genimage'
-  - element: boards/pinebook-pro/repo.bst
+  - element: boards/pinephone-pro/repo.bst
     destination: '/source-repo'
-  - element: boards/pinebook-pro/image-deps.bst
+  - element: boards/pinephone-pro/image-deps.bst
     destination: '/'
-  - element: boards/pinebook-pro/linux.bst
+  - element: boards/pinephone-pro/linux.bst
     destination: '/kernel'
 
   commands:
diff --git a/elements/boards/pinephone-pro/initial-scripts.bst 
b/elements/boards/pinephone-pro/initial-scripts.bst
index 6b6fa4644..170e438f5 100644
--- a/elements/boards/pinephone-pro/initial-scripts.bst
+++ b/elements/boards/pinephone-pro/initial-scripts.bst
@@ -1,7 +1,7 @@
 kind: collect_initial_scripts
 
 build-depends:
-- boards/pinebook-pro/deps.bst
+- boards/pinephone-pro/deps.bst
 
 config:
   path: /etc/fdsdk/initial_scripts
diff --git a/elements/boards/pinephone-pro/initramfs.bst b/elements/boards/pinephone-pro/initramfs.bst
index 16f95bce1..d1e9d6750 100644
--- a/elements/boards/pinephone-pro/initramfs.bst
+++ b/elements/boards/pinephone-pro/initramfs.bst
@@ -2,8 +2,8 @@ kind: script
 
 build-depends:
 - freedesktop-sdk.bst:vm/prepare-image.bst
-- boards/pinebook-pro/initramfs/deps.bst
-- boards/pinebook-pro/initramfs/initial-scripts.bst
+- boards/pinephone-pro/initramfs/deps.bst
+- boards/pinephone-pro/initramfs/initial-scripts.bst
 
 variables:
   uuidnamespace: aea54278-2587-4075-ae67-8688ace4ce3d
@@ -16,9 +16,9 @@ config:
     destination: '/var/tmp'
   - element: ''
     destination: '/efi'
-  - element: boards/pinebook-pro/initramfs/deps.bst
+  - element: boards/pinephone-pro/initramfs/deps.bst
     destination: '/'
-  - element: boards/pinebook-pro/initramfs/initial-scripts.bst
+  - element: boards/pinephone-pro/initramfs/initial-scripts.bst
     destination: '/'
   - element: vm/prepare-image.bst
     destination: '/'
diff --git a/elements/boards/pinephone-pro/initramfs/deps.bst 
b/elements/boards/pinephone-pro/initramfs/deps.bst
index 12f392dee..084aa22e3 100644
--- a/elements/boards/pinephone-pro/initramfs/deps.bst
+++ b/elements/boards/pinephone-pro/initramfs/deps.bst
@@ -12,7 +12,7 @@ depends:
 - freedesktop-sdk.bst:components/pkg-config.bst
 - vm/plymouth-gnome-theme.bst
 
-- boards/pinebook-pro/linux.bst
+- boards/pinephone-pro/linux.bst
 - freedesktop-sdk.bst:components/linux-firmware.bst
 - freedesktop-sdk.bst:components/wireless-regdb-bin.bst
 
diff --git a/elements/boards/pinephone-pro/initramfs/initial-scripts.bst 
b/elements/boards/pinephone-pro/initramfs/initial-scripts.bst
index f0159e69d..ee5294ce0 100644
--- a/elements/boards/pinephone-pro/initramfs/initial-scripts.bst
+++ b/elements/boards/pinephone-pro/initramfs/initial-scripts.bst
@@ -1,7 +1,7 @@
 kind: collect_initial_scripts
 
 build-depends:
-- boards/pinebook-pro/initramfs/deps.bst
+- boards/pinephone-pro/initramfs/deps.bst
 
 config:
   path: /etc/fdsdk/initial_scripts
diff --git a/elements/boards/pinephone-pro/repo.bst b/elements/boards/pinephone-pro/repo.bst
index e3cac671e..5881d883b 100644
--- a/elements/boards/pinephone-pro/repo.bst
+++ b/elements/boards/pinephone-pro/repo.bst
@@ -3,18 +3,18 @@ kind: ostree
 build-depends:
 - freedesktop-sdk.bst:vm/prepare-image.bst
 - core-deps/libostree.bst
-- boards/pinebook-pro/filesystem.bst
-- boards/pinebook-pro/initial-scripts.bst
+- boards/pinephone-pro/filesystem.bst
+- boards/pinephone-pro/initial-scripts.bst
 
 variables:
   uuidnamespace: aea54278-2587-4075-ae67-8688ace4ce3d
-  ostree-branch: gnome-os/aarch64/pinebook-pro
+  ostree-branch: gnome-os/aarch64/pinephone-pro
 
 config:
   environment:
   - core-deps/libostree.bst
   - vm/prepare-image.bst
-  - boards/pinebook-pro/initial-scripts.bst
+  - boards/pinephone-pro/initial-scripts.bst
   ostree-branch: '%{ostree-branch}'
   initial-commands:
   - |
diff --git a/elements/boards/pinephone-pro/u-boot.bst b/elements/boards/pinephone-pro/u-boot.bst
index caff32339..3f71b8533 100644
--- a/elements/boards/pinephone-pro/u-boot.bst
+++ b/elements/boards/pinephone-pro/u-boot.bst
@@ -15,13 +15,13 @@ build-depends:
 - boards/common/python3-as-python2.bst
 - boards/common/dtc.bst
 
-- boards/pinebook-pro/arm-trusted-firmware.bst
+- boards/pinephone-pro/arm-trusted-firmware.bst
 
 environment:
   BL31: "%{indep-libdir}/u-boot/%{board}/bl31.elf"
 
 variables:
-  board: pinebook_pro-rk3399
+  board: pinephone_pro-rk3399
 
 config:
   configure-commands: