components/swupd: added package layering support

itsManjeet · Dec 5, 2023 · 8af6cb6 · 8af6cb6
1 parent 5f2ce15
commit 8af6cb6
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 26 deletions.
diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
@@ -54,3 +54,13 @@ jobs:
         run: |
           ${IGNITE} checkout installer/image.yml ${SERVER_REPO_PATH}/releases/${VERSION}/
           (cd ${SERVER_REPO_PATH}/releases/${VERSION}/; zsyncmake -b 2048 -C -u ${SERVER_REPO_URL}/releases/${VERSION}/rlxos-x86_64-${VERSION}.iso rlxos-x86_64-${VERSION}.iso)
+
+      - name: Update Extensions
+        run: |
+          for ext in elements/extensions/*.yml ; do
+            ELEMENT=${ext#*/}
+            EXT_ID=${ELEMENT#*}
+            EXT_ID=${EXT_ID%.*}
+            ${IGNITE} build ${ELEMENT}
+            COMMIT_MESSAGE="UPDATED WITH BASE" OSTREE_BRANCH="x86_64/extension/${EXT_ID}/${VERSION}" ELEMENT_FILE=${ELEMENT} make update-ostree
+          done
diff --git a/elements/components/qemu.yml b/elements/components/qemu.yml
@@ -13,10 +13,11 @@ post-script: |-
   # chgrp kvm %{install-root}/%{libdir}/qemu-bridge-helper
   chmod -v 4750 %{install-root}/%{libdir}/qemu-bridge-helper
 
+  rmdir %{install-root}/var/run
+
 configure: >-
   --audio-drv-list=alsa
   --smbd=/usr/bin/smbd
-  --target-list=x86_64-softmmu
   --enable-modules
   --enable-sdl
   --enable-gtk

diff --git a/elements/components/swupd.yml b/elements/components/swupd.yml
@@ -3,7 +3,7 @@ version: 0.1.0
 about: Software Updater Daemon
 
 variables:
-  commit: 35e069d6ee4e2df2f8c31b5a30ff86e1127a6e74
+  commit: 694784818bfc7baa9b538ff796998b6e6cf291c7
 
 post-script: |-
   install -v -D -m 0755 -t %{install-root}%{bindir} target/release/%{id}

diff --git a/elements/extensions/qemu.yml b/elements/extensions/qemu.yml
@@ -0,0 +1,8 @@
+id: qemu
+about: RLXOS QEMU Virtualization Kit
+include:
+  - components/qemu.yml
+  - components/libcacard.yml
+  - components/usbredir.yml
+
+merge: [elements/include/extension.yml]
diff --git a/elements/layers/sdk.yml → elements/extensions/sdk.yml b/elements/layers/sdk.yml → elements/extensions/sdk.yml
@@ -16,4 +16,4 @@ include:
   - components/autoconf-archive.yml
   - components/pkg-config.yml
 
-merge: [elements/include/layer.yml]
+merge: [elements/include/extension.yml]
diff --git a/elements/include/extension.yml b/elements/include/extension.yml
@@ -0,0 +1,8 @@
+merge: [version.yml, elements/include/ostree.yml]
+variables:
+  force-rebuild: true
+  include-depends: false
+  include-root: /sysroot
+  strip: false
+  initial-commands: ""
+  ostree-branch: x86_64/extension/%{id}
diff --git a/elements/include/layer.yml b/elements/include/layer.yml
diff --git a/go.mod b/go.mod
@@ -6,5 +6,3 @@ require (
 	github.com/dustin/go-humanize v1.0.1
 	gopkg.in/yaml.v2 v2.4.0
 )
-
-require github.com/itsmanjeet/framework v0.0.0-20231010170234-a2978b10eaf1
diff --git a/go.sum b/go.sum
@@ -1,7 +1,5 @@
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/itsmanjeet/framework v0.0.0-20231010170234-a2978b10eaf1 h1:lvkd7p4mPPXC1suOm7BaYlMl9mC25h7U6b8RDPe445g=
-github.com/itsmanjeet/framework v0.0.0-20231010170234-a2978b10eaf1/go.mod h1:EwFUbJJY2SbZJFs1j/prHjCNkSEDf7ZQwePk4U7EcTo=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=