diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 35fb1aa..4ea10ff 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,7 +52,7 @@ jobs: uses: "actions/upload-artifact@v4" with: name: stage1-tarball - path: "/var/tmp/catalyst/builds/23.0-default/stage1-amd64-systemd.tar.xz" + path: "/var/tmp/catalyst/builds/23.0-default/stage1-amd64-systemd.tar" build-stage-3: name: Build Stage 3 needs: build-stage-1 @@ -93,7 +93,7 @@ jobs: uses: "actions/upload-artifact@v4" with: name: stage3-tarball - path: "/var/tmp/catalyst/builds/23.0-default/stage3-amd64-systemd.tar.xz" + path: "/var/tmp/catalyst/builds/23.0-default/stage3-amd64-systemd.tar" build-stage-4-clang: name: Build Stage 4 Clang needs: build-stage-3 @@ -136,7 +136,7 @@ jobs: uses: "actions/upload-artifact@v4" with: name: stage4-clang-tarball - path: "/var/tmp/catalyst/builds/23.0-default/stage4-amd64-clang.tar.xz" + path: "/var/tmp/catalyst/builds/23.0-default/stage4-amd64-clang.tar" build-stage-4: name: Build Stage 4 needs: build-stage-4-clang @@ -179,7 +179,7 @@ jobs: uses: "actions/upload-artifact@v4" with: name: stage4-tarball - path: "/var/tmp/catalyst/builds/23.0-default/stage4-amd64-desktop-systemd.tar.xz" + path: "/var/tmp/catalyst/builds/23.0-default/stage4-amd64-desktop-systemd.tar" assemble-squashfs: name: Assemble squashfs image needs: build-stage-4 diff --git a/assemble.sh b/assemble.sh index f7dcc26..2512667 100644 --- a/assemble.sh +++ b/assemble.sh @@ -2,7 +2,7 @@ set -euo pipefail mkdir -p rootfs chroot/{etc,dev,proc,sys} chroot/var/{cache,lib,lib/dbus}/ cd rootfs -tar xf ../stage4-amd64-desktop-systemd.tar.xz +tar xf ../stage4-amd64-desktop-systemd.tar rm -r sys dev proc mv etc/{hosts,resolv.conf,localtime,passwd,group,{,g}shadow,fstab,sub{u,g}id} ../chroot/etc mv boot home media mnt root tmp run ../chroot/ diff --git a/build.sh b/build.sh index a44c056..ca38fe4 100644 --- a/build.sh +++ b/build.sh @@ -9,11 +9,11 @@ git checkout "${GIT_SHA}" mkdir -p builds/23.0-default if [[ "x${DOWNLOAD_SEED-}" != x ]]; then name="stage3-amd64-systemd-${TIMESTAMP_L}.tar.xz" - [ -f "${name}" ] || wget "https://distfiles.gentoo.org/releases/amd64/autobuilds/${TIMESTAMP_L}/${name}" + [ -f "${name}" ] || wget -nv "https://distfiles.gentoo.org/releases/amd64/autobuilds/${TIMESTAMP_L}/${name}" cp "${name}" builds/23.0-default/ fi name="gentoo-${TIMESTAMP_S}.xz.sqfs" -[ -f "${name}" ] || wget "https://distfiles.gentoo.org/snapshots/squashfs/${name}" +[ -f "${name}" ] || wget -nv "https://distfiles.gentoo.org/snapshots/squashfs/${name}" mkdir -p snapshots cp "${name}" snapshots/ sed -i "s/@TIMESTAMP@/${TIMESTAMP_L}/g" *.spec diff --git a/build_mesa.sh b/build_mesa.sh index 4d91827..61e8a31 100644 --- a/build_mesa.sh +++ b/build_mesa.sh @@ -1,8 +1,8 @@ #!/bin/bash set -euo pipefail release=20241114 -wget "https://github.com/WhatAmISupposedToPutHere/fex-rootfs/releases/download/${release}/fex-rootfs.sqfs" -wget "https://github.com/WhatAmISupposedToPutHere/fex-rootfs/releases/download/${release}/fex-chroot.sqfs" +wget -nv "https://github.com/WhatAmISupposedToPutHere/fex-rootfs/releases/download/${release}/fex-rootfs.sqfs" +wget -nv "https://github.com/WhatAmISupposedToPutHere/fex-rootfs/releases/download/${release}/fex-chroot.sqfs" mkdir rootfs chroot layer1 layer2 work result mount fex-chroot.sqfs chroot mount fex-rootfs.sqfs rootfs diff --git a/envs.sh b/envs.sh index 1cd9530..153a2b0 100644 --- a/envs.sh +++ b/envs.sh @@ -1,4 +1,4 @@ #!/bin/bash export TIMESTAMP_L=20241110T170333Z -export TIMESTAMP_S=20241114 +export TIMESTAMP_S=20241116 export RELEASE=${TIMESTAMP_S} diff --git a/stage1-systemd-23.spec b/stage1-systemd-23.spec index d3f96af..63d3a7a 100644 --- a/stage1-systemd-23.spec +++ b/stage1-systemd-23.spec @@ -5,8 +5,8 @@ rel_type: 23.0-default profile: default/linux/amd64/23.0/systemd snapshot_treeish: @TREEISH@.xz source_subpath: 23.0-default/stage3-amd64-systemd-@TIMESTAMP@ -compression_mode: pixz +compression_mode: tar update_seed: yes -update_seed_command: --update --deep --newuse @world +update_seed_command: --update --newuse -1 jinja2 portage_confdir: /var/tmp/catalyst/config/stages portage_prefix: stage13 diff --git a/stage3d-systemd-23.spec b/stage3d-systemd-23.spec index 6aa5553..9bde5e5 100644 --- a/stage3d-systemd-23.spec +++ b/stage3d-systemd-23.spec @@ -5,7 +5,7 @@ rel_type: 23.0-default profile: default/linux/amd64/23.0/systemd snapshot_treeish: @TREEISH@.xz source_subpath: 23.0-default/stage1-amd64-systemd -compression_mode: pixz +compression_mode: tar portage_confdir: /var/tmp/catalyst/config/stages portage_prefix: stage13 binrepo_path: amd64/binpackages/23.0/x86-64 diff --git a/stage4-fex.spec b/stage4-fex.spec index 78a2cec..7535deb 100644 --- a/stage4-fex.spec +++ b/stage4-fex.spec @@ -5,12 +5,12 @@ rel_type: 23.0-default profile: default/linux/amd64/23.0/desktop/systemd snapshot_treeish: @TREEISH@.xz source_subpath: 23.0-default/stage4-amd64-clang -compression_mode: pixz +compression_mode: tar portage_confdir: /var/tmp/catalyst/config/stages portage_prefix: stage4 binrepo_path: amd64/binpackages/23.0/x86-64 stage4/fsscript: fsscript.sh -stage4/packages: --with-bdeps=y sys-fs/fuse:0 sys-fs/fuse:3 x11-libs/gtk+:2 x11-libs/gtk+:3 +stage4/packages: --with-bdeps=y --deep sys-fs/fuse:0 sys-fs/fuse:3 x11-libs/gtk+:2 x11-libs/gtk+:3 app-emulation/wine-vanilla dev-libs/nspr dev-libs/nss @@ -39,3 +39,4 @@ stage4/packages: --with-bdeps=y sys-fs/fuse:0 sys-fs/fuse:3 x11-libs/gtk+:2 x11- x11-libs/xcb-util-cursor x11-libs/xcb-util-xrm x11-terms/xterm + @world diff --git a/stage4-llvm.spec b/stage4-llvm.spec index ee483e2..9829eb9 100644 --- a/stage4-llvm.spec +++ b/stage4-llvm.spec @@ -2,10 +2,10 @@ subarch: amd64 target: stage4 version_stamp: clang rel_type: 23.0-default -profile: default/linux/amd64/23.0/systemd +profile: default/linux/amd64/23.0/desktop/systemd snapshot_treeish: @TREEISH@.xz source_subpath: 23.0-default/stage3-amd64-systemd -compression_mode: pixz +compression_mode: tar portage_confdir: /var/tmp/catalyst/config/stages portage_prefix: stage4 binrepo_path: amd64/binpackages/23.0/x86-64