[gnome-build-meta/jjardon/pinebookpro_ostree_repo: 6/6] elements/boards/pinebook-pro/repo.bst: Use ostree plugin




commit 794ae9490c3d561200b31d1313ec3c201238f1bc
Author: Javier Jardón <jjardon gnome org>
Date:   Sun Jan 31 22:47:51 2021 +0000

    elements/boards/pinebook-pro/repo.bst: Use ostree plugin
    
    Same as elements/vm/repo.bst
    See 3c1f24c4f27b8c0d9c3ae777013cc29f57d86c82

 elements/boards/pinebook-pro/repo.bst | 36 +++++++++++------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)
---
diff --git a/elements/boards/pinebook-pro/repo.bst b/elements/boards/pinebook-pro/repo.bst
index 5922d525..e3cac671 100644
--- a/elements/boards/pinebook-pro/repo.bst
+++ b/elements/boards/pinebook-pro/repo.bst
@@ -1,42 +1,28 @@
-kind: script
+kind: ostree
 
 build-depends:
 - freedesktop-sdk.bst:vm/prepare-image.bst
 - core-deps/libostree.bst
-- boards/pinebook-pro/initial-scripts.bst
 - boards/pinebook-pro/filesystem.bst
+- boards/pinebook-pro/initial-scripts.bst
 
 variables:
   uuidnamespace: aea54278-2587-4075-ae67-8688ace4ce3d
   ostree-branch: gnome-os/aarch64/pinebook-pro
 
-environment:
-  OSTREE_REPO: "%{install-root}"
-
 config:
-  layout:
-  - element: ''
-    destination: /tmp
-  - element: core-deps/libostree.bst
-    destination: /
-  - element: boards/pinebook-pro/filesystem.bst
-    destination: /sysroot
-  - element: boards/pinebook-pro/initial-scripts.bst
-    destination: /
-  - element: vm/prepare-image.bst
-    destination: /
-
-  commands:
+  environment:
+  - core-deps/libostree.bst
+  - vm/prepare-image.bst
+  - boards/pinebook-pro/initial-scripts.bst
+  ostree-branch: '%{ostree-branch}'
+  initial-commands:
   - |
     prepare-image.sh \
-       --sysroot /sysroot \
+       --sysroot %{sysroot} \
        --seed "%{uuidnamespace}" \
        --rootsource LABEL=root \
-        --efisource LABEL=EFI \
+       --efisource LABEL=EFI \
        --efipath /boot >/dev/null
 
-  - mkdir -p "${OSTREE_REPO}"
-  - ostree init --repo="${OSTREE_REPO}" --mode=archive
-  - mv /sysroot/etc /sysroot/usr/etc
-  - ostree commit --branch=%{ostree-branch} --timestamp="$(date --date="@${SOURCE_DATE_EPOCH}" 
--rfc-3339=seconds)" /sysroot
-
+  - mv %{sysroot}/etc %{sysroot}/usr/etc


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]