diff --git a/.github/workflows/build-arm64.yaml b/.github/workflows/build-arm64.yaml index 4de356d..15b7cb7 100644 --- a/.github/workflows/build-arm64.yaml +++ b/.github/workflows/build-arm64.yaml @@ -17,10 +17,6 @@ jobs: - run: | git fetch --prune --unshallow mkdir build - - name: Release space from worker - run: | - sudo rm -rf /usr/local/lib/android # will release about 10 GB if you don't need Android - sudo rm -rf /usr/share/dotnet # will release about 20GB if you don't need .NET - name: Set up QEMU uses: docker/setup-qemu-action@master with: @@ -33,7 +29,7 @@ jobs: with: FINAL_REPO: quay.io/kairos/packages-arm64 REPOSITORY_TYPE: docker - downloadAllMeta: true + downloadAllMeta: false downloadFromList: true downloadMeta: true - name: Build packages 🔧 diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1799c06..5aaa992 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -17,16 +17,12 @@ jobs: - run: | git fetch --prune --unshallow mkdir build - - name: Release space from worker - run: | - sudo rm -rf /usr/local/lib/android # will release about 10 GB if you don't need Android - sudo rm -rf /usr/share/dotnet # will release about 20GB if you don't need .NET - name: Download meta 🔧 uses: luet-lab/luet-github-action@master with: FINAL_REPO: quay.io/kairos/packages REPOSITORY_TYPE: docker - downloadAllMeta: true + downloadAllMeta: false downloadFromList: true downloadMeta: true - name: Build packages 🔧 @@ -43,6 +39,7 @@ jobs: REPOSITORY_TYPE: docker pushFinalImages: true pushCache: true + values: values/amd64.yaml - name: Create repo 🔧 uses: luet-lab/luet-github-action@master if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 1a07ca6..74b8c11 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -15,10 +15,6 @@ jobs: - run: | git fetch --prune --unshallow mkdir build - - name: Release space from worker - run: | - sudo rm -rf /usr/local/lib/android # will release about 10 GB if you don't need Android - sudo rm -rf /usr/share/dotnet # will release about 20GB if you don't need .NET - name: Set up QEMU uses: docker/setup-qemu-action@master with: @@ -31,7 +27,7 @@ jobs: with: FINAL_REPO: quay.io/kairos/packages REPOSITORY_TYPE: docker - downloadAllMeta: true + downloadAllMeta: false downloadFromList: true downloadMeta: true - name: Build packages 🔧 @@ -58,16 +54,12 @@ jobs: - run: | git fetch --prune --unshallow mkdir build - - name: Release space from worker - run: | - sudo rm -rf /usr/local/lib/android # will release about 10 GB if you don't need Android - sudo rm -rf /usr/share/dotnet # will release about 20GB if you don't need .NET - name: Download meta 🔧 uses: luet-lab/luet-github-action@master with: FINAL_REPO: quay.io/kairos/packages REPOSITORY_TYPE: docker - downloadAllMeta: true + downloadAllMeta: false downloadFromList: true downloadMeta: true - name: Build packages 🔧 @@ -81,3 +73,4 @@ jobs: REPOSITORY_TYPE: docker pushFinalImages: false pushCache: false + values: values/amd64.yaml diff --git a/packages/base-images/collection.yaml b/packages/base-images/collection.yaml index 9a8c43b..50775d9 100644 --- a/packages/base-images/collection.yaml +++ b/packages/base-images/collection.yaml @@ -5,7 +5,7 @@ packages: name: "ubuntu" category: "base-image" pm: "apt-get" - version: "22.10" + version: "22.10-1" packages: >- systemd sudo @@ -35,7 +35,7 @@ packages: - <<: *ubuntu name: "ubuntu-20-lts" category: "base-image" - version: "20.04" + version: "20.04-1" image: "ubuntu:20.04" packages: >- systemd @@ -64,12 +64,12 @@ packages: - <<: *ubuntu name: "ubuntu-22-lts" category: "base-image" - version: "22.04" + version: "22.04-1" image: "ubuntu:22.04" - name: "opensuse-leap" category: "base-image" pm: "zypper" - version: "15.4+1" + version: "15.4+2" image: "opensuse/leap:15.4" packages: >- bash-completion diff --git a/packages/distro-kernels/collection.yaml b/packages/distro-kernels/collection.yaml index c146809..cae374e 100644 --- a/packages/distro-kernels/collection.yaml +++ b/packages/distro-kernels/collection.yaml @@ -1,7 +1,7 @@ packages: - category: "distro-kernels" name: "opensuse-leap" - version: "15.4+8" + version: "15.4+9" distribution: "opensuse" packages_arm: "raspberrypi-firmware-config raspberrypi-firmware-dt" packages: "kernel-default kernel-firmware-all" @@ -14,13 +14,13 @@ packages: # packages: "kernel grub2 kernel-core dracut dracut-live" - category: "distro-kernels" name: "ubuntu-20-lts" - version: "20.04+8" + version: "20.04+9" distribution: "ubuntu" packages: "linux-image-generic-hwe-20.04" packages_arm: "linux-image-raspi" - category: "distro-kernels" name: "ubuntu" - version: "22.10+8" + version: "22.10+9" distribution: "ubuntu" packages: "linux-image-generic-hwe-20.04" - packages_arm: "linux-image-raspi" \ No newline at end of file + packages_arm: "linux-image-raspi" diff --git a/packages/initrd/build.yaml b/packages/initrd/build.yaml index bb495dd..cad621b 100644 --- a/packages/initrd/build.yaml +++ b/packages/initrd/build.yaml @@ -5,15 +5,21 @@ requires: copy: # The toolkit is required in module-setup and embedded in the initramfs. -- package: +- package: category: "system" name: "kairos-agent" version: ">=0" source: "/usr/bin/kairos-agent" destination: "/usr/bin/kairos-agent" +- package: + category: "system" + name: "immucore" + version: ">=0" + source: "/usr/bin/immucore" + destination: "/usr/bin/immucore" - package: category: "dracut" - name: "immutable-rootfs" + name: "immucore" version: ">=0" source: "/package/." destination: "/" @@ -50,13 +56,7 @@ copy: source: "/package/." destination: "/" {{ end }} -- package: - category: "dracut" - name: "kcrypt" - version: ">=0" - source: "/package/." - destination: "/" -- package: +- package: category: "system" name: "kcrypt" version: ">=0" diff --git a/packages/initrd/collection.yaml b/packages/initrd/collection.yaml index 79774e7..7809951 100644 --- a/packages/initrd/collection.yaml +++ b/packages/initrd/collection.yaml @@ -1,13 +1,13 @@ packages: - name: "opensuse-leap" category: "distro-initrd" - version: "0.24" + version: "0.25" # - name: "fedora" # category: "distro-initrd" # version: "0.11" - name: "ubuntu-20-lts" category: "distro-initrd" - version: "0.24" + version: "0.25" - name: "ubuntu" category: "distro-initrd" - version: "0.24" + version: "0.25" diff --git a/values/amd64.yaml b/values/amd64.yaml new file mode 100644 index 0000000..b4f7068 --- /dev/null +++ b/values/amd64.yaml @@ -0,0 +1 @@ +arch: "amd64" \ No newline at end of file