debian/changelog

@@ -1,9 +1,3 @@
-ostree (2022.7-j7s1) j7s-os; urgency=medium
-
-  * boot config should be looking in /boot for kernel and initrd.
-
- -- James Pace <jpace121@gmail.com>  Tue, 27 Dec 2022 13:51:36 +0000
-
 ostree (2022.7-2) unstable; urgency=medium
 
   * Skip test-sysroot.js on s390x (Mitigates: #1025532)

debian/patches/debian/boot-config-should-be-looking-in-boot.patch

@@ -1,33 +0,0 @@
-From: James Pace <jpace121@gmail.com>
-Date: Mon, 26 Dec 2022 13:20:09 -0500
-Subject: Boot config should be looking in /boot.
-
----
- src/libostree/ostree-sysroot-deploy.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
-index 26b07080..8e86d296 100644
---- a/src/libostree/ostree-sysroot-deploy.c
-+++ b/src/libostree/ostree-sysroot-deploy.c
-@@ -2032,7 +2032,7 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
- 
-   g_autofree char *version_key = g_strdup_printf ("%d", n_deployments - ostree_deployment_get_index (deployment));
-   ostree_bootconfig_parser_set (bootconfig, OSTREE_COMMIT_META_KEY_VERSION, version_key);
--  g_autofree char * boot_relpath = g_strconcat ("/", bootcsumdir, "/", kernel_layout->kernel_namever, NULL);
-+  g_autofree char * boot_relpath = g_strconcat ("/boot/", bootcsumdir, "/", kernel_layout->kernel_namever, NULL);
-   ostree_bootconfig_parser_set (bootconfig, "linux", boot_relpath);
- 
-   val = ostree_bootconfig_parser_get (bootconfig, "options");
-@@ -2041,7 +2041,7 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
-   if (kernel_layout->initramfs_namever)
-     {
-       g_autofree char * initrd_boot_relpath =
--        g_strconcat ("/", bootcsumdir, "/", kernel_layout->initramfs_namever, NULL);
-+        g_strconcat ("/boot/", bootcsumdir, "/", kernel_layout->initramfs_namever, NULL);
-       ostree_bootconfig_parser_set (bootconfig, "initrd", initrd_boot_relpath);
- 
-       if (overlay_initrds)
--- 
-2.39.0
-

debian/patches/series

@@ -1,4 +1,3 @@
 configure-use-pkg-config-with-newer-gpgme-and-gpg-error.patch
 debian/Skip-test-pull-repeated-during-CI.patch
 debian/test-sysroot-Skip-on-s390x-by-default.patch
-debian/boot-config-should-be-looking-in-boot.patch

j7s-build-files/build.yaml

@@ -1,92 +0,0 @@
----
-- name: Setup container for building.
-  hosts: localhost
-  tags: setup
-  tasks:
-    - name: Create a container
-      containers.podman.podman_container:
-        name: ostree-debian-builder
-        image: docker.io/library/debian:bullseye
-        volume: "{{ playbook_dir | dirname }}:/project:Z"
-        command: 'sleep infinity'
-        state: started
-    - name: Add the container to inventory.
-      ansible.builtin.add_host:
-        name: ostree-debian-builder
-        ansible_connection: containers.podman.podman
-        ansible_user: root
-        ansible_python_interpreter: /usr/bin/python3
-        changed_when: false
-    - name: Get the basic depedencies.
-      delegate_to: ostree-debian-builder
-      raw: bash -c "apt update && apt install -y python3 build-essential devscripts"
-
-- name: Build package.
-  hosts: ostree-debian-builder
-  tags: build
-  tasks:
-  - name: Make out of tree build directory.
-    ansible.builtin.tempfile:
-      state: directory
-      suffix: build
-      prefix: project
-    register: temp_file_loc
-  - name: Copy build files to location.
-    ansible.builtin.shell:
-      cmd: "cp -r /project {{ temp_file_loc.path }}/. "
-  - name: Install build dependencies.
-    ansible.builtin.shell:
-       chdir: "{{temp_file_loc.path }}/project"
-       cmd: |
-          apt update
-          mk-build-deps
-          apt install -y ./*.deb
-  - name: Call debuild.
-    ansible.builtin.shell:
-       chdir: "{{temp_file_loc.path }}/project"
-       cmd: |
-          export DEB_BUILD_OPTIONS=nocheck
-          debuild -us -uc -b
-  - name: Copy deb file back to the main directory.
-    ansible.builtin.shell:
-      cmd: "cp -r  {{ temp_file_loc.path }}/*.deb /project/."
-  - name: Copy changes file back to the main directory.
-    ansible.builtin.shell:
-      cmd: "cp -r  {{ temp_file_loc.path }}/*.changes /project/."
-  - name: Copy buildinfo file back to the main directory.
-    ansible.builtin.shell:
-      cmd: "cp -r  {{ temp_file_loc.path }}/*.buildinfo /project/."
-
-- name: Upload to packaging server.
-  hosts: packaging
-  tags: deploy
-  tasks:
-    - name: Copy packages to packaging server.
-      ansible.builtin.copy:
-        src: "{{ item }}"
-        dest: ~/public/apt/mini-dinstall/incoming/
-      with_fileglob: ../*.deb
-    - name: Ditto the changes files.
-      ansible.builtin.copy:
-        src: "{{ item }}"
-        dest: ~/public/apt/mini-dinstall/incoming/
-      with_fileglob: ../*.changes
-      register: copied_changes
-    - name: Ditto the buildinfo files.
-      ansible.builtin.copy:
-        src: "{{ item }}"
-        dest: ~/public/apt/mini-dinstall/incoming/
-      with_fileglob: ../*.buildinfo
-      register: copied_buildinfo
-    - name: Run mini-dinstall.
-      ansible.builtin.shell:
-       cmd: "mini-dinstall --batch"
-
-- name: Cleanup
-  hosts: localhost
-  tags: cleanup
-  tasks:
-    - name: Stop the container.
-      containers.podman.podman_container:
-        name: ostree-debian-builder
-        state: absent

j7s-build-files/inventory.yaml

@@ -1,5 +0,0 @@
-all:
-  hosts:
-    packaging:
-      ansible_host: packages.jpace121.net
-      ansible_user: packaging