Skip to content

Commit

Permalink
build using GitHub actions
Browse files Browse the repository at this point in the history
  • Loading branch information
nkraetzschmar committed Jan 30, 2024
1 parent 90befbe commit e39f3d7
Show file tree
Hide file tree
Showing 9 changed files with 64 additions and 230 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
on:
push:
workflow_dispatch:
schedule:
- cron: '0 0 * * *'
jobs:
build:
uses: gardenlinux/package-build/.github/workflows/build.yml@main
with:
release: ${{ github.ref == 'refs/heads/main' }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.build
23 changes: 0 additions & 23 deletions .gitlab-ci.yml

This file was deleted.

179 changes: 0 additions & 179 deletions .gitlab/ci/build.yml

This file was deleted.

50 changes: 50 additions & 0 deletions patches/add_patches.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
diff --git a/debian/patches/debugPrintUpgrade.diff b/debian/patches/debugPrintUpgrade.diff
new file mode 100644
index 00000000..c36f77d8
--- /dev/null
+++ b/debian/patches/debugPrintUpgrade.diff
@@ -0,0 +1,13 @@
+diff --color -Naur deb-pkg-ostree-orig/src/libostree/ostree-sysroot-upgrader.c deb-pkg-ostree-working-copy/src/libostree/ostree-sysroot-upgrader.c
+--- deb-pkg-ostree-orig/src/libostree/ostree-sysroot-upgrader.c 2023-09-06 16:08:48.148445008 +0200
++++ deb-pkg-ostree-working-copy/src/libostree/ostree-sysroot-upgrader.c 2023-09-20 11:30:26.197032024 +0200
+@@ -562,6 +562,8 @@
+ return FALSE;
+ }
+
++ g_print ("\n>>>DBG: from_revision: %s\n", from_revision);
++ g_print (">>>DBG: new_revision: %s)\n\n", self->new_revision);
+ if (g_strcmp0 (from_revision, self->new_revision) == 0)
+ {
+ *out_changed = FALSE;
+
diff --git a/debian/patches/mkdirSysroot.diff b/debian/patches/mkdirSysroot.diff
new file mode 100644
index 00000000..786d4e54
--- /dev/null
+++ b/debian/patches/mkdirSysroot.diff
@@ -0,0 +1,15 @@
+diff --color -Naur deb-pkg-ostree-orig/src/switchroot/ostree-prepare-root.c deb-pkg-ostree-working-copy/src/switchroot/ostree-prepare-root.c
+--- deb-pkg-ostree-orig/src/switchroot/ostree-prepare-root.c 2023-09-06 16:08:48.152444851 +0200
++++ deb-pkg-ostree-working-copy/src/switchroot/ostree-prepare-root.c 2023-09-25 15:38:05.147081727 +0200
+@@ -672,6 +672,10 @@
+ * root under /sysroot/sysroot as systemd will be responsible for
+ * moving /sysroot to /.
+ */
++
++ if (mkdirat (AT_FDCWD, "sysroot", 0755) < 0)
++ g_print (">>>DBG>>: Failed to create %s", "sysroot");
++
+ if (mount (root_mountpoint, "sysroot", NULL, MS_MOVE | MS_SILENT, NULL) < 0)
+ err (EXIT_FAILURE, "failed to MS_MOVE '%s' to 'sysroot'", root_mountpoint);
+
+
diff --git a/debian/patches/series b/debian/patches/series
index 78a4e054..7c22215a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
debian/Skip-test-pull-repeated-during-CI.patch
debian/test-sysroot-Skip-on-s390x-by-default.patch
debian/Skip-test-admin-deploy-uboot.sh-on-s390x.patch
+debugPrintUpgrade.diff
+mkdirSysroot.diff
12 changes: 0 additions & 12 deletions patches/debugPrintUpgrade.diff

This file was deleted.

14 changes: 0 additions & 14 deletions patches/mkdirSysroot.diff

This file was deleted.

3 changes: 1 addition & 2 deletions patches/series
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
debugPrintUpgrade.diff
mkdirSysroot.diff
add_patches.patch
2 changes: 2 additions & 0 deletions prepare_source
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
apt_src ostree
apply_patches

0 comments on commit e39f3d7

Please sign in to comment.