From a457a7cd83dd7afd076d154f9c564dc6ce3d6782 Mon Sep 17 00:00:00 2001 From: xz-dev Date: Tue, 14 Oct 2025 16:00:08 +0800 Subject: [PATCH 1/7] installkernel-9999.ebuild: fix as an live ebuild --- installkernel-9999.ebuild | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/installkernel-9999.ebuild b/installkernel-9999.ebuild index 2027690..0bc9349 100644 --- a/installkernel-9999.ebuild +++ b/installkernel-9999.ebuild @@ -10,13 +10,17 @@ HOMEPAGE=" https://github.com/projg2/installkernel-gentoo https://wiki.gentoo.org/wiki/Installkernel " -SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz - -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-gentoo-${PV}" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/projg2/installkernel-gentoo.git" + inherit git-r3 +else + SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify" REQUIRED_USE=" systemd-boot? ( systemd ) From 2a86fb478383638170179d3ffb8323987ccf3f3c Mon Sep 17 00:00:00 2001 From: xz-dev Date: Tue, 14 Oct 2025 17:33:48 +0800 Subject: [PATCH 2/7] Dockerfile: fix ACCEPT_KEYWORDS for live ebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f0ce559..df9c10f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM gentoo/stage3:amd64-systemd RUN wget --progress=dot:mega -O - https://github.com/gentoo-mirror/gentoo/archive/master.tar.gz | tar -xz \ && mv gentoo-master /var/db/repos/gentoo -RUN echo -e "ACCEPT_KEYWORDS=\"~amd64\"\nACCEPT_LICENSE=\"*\"\nFEATURES=\"-news -sandbox -usersandbox -cgroup binpkg-multi-instance -binpkg-docompress -binpkg-dostrip parallel-install -ipc-sandbox -network-sandbox -pid-sandbox binpkg-ignore-signature buildpkg getbinpkg\"\nMAKEOPTS=\"--jobs=$(nproc) --load-average=$(nproc)\"\nUSE=\"-initramfs kernel-install boot ukify -bash dash\"" >> /etc/portage/make.conf +RUN echo -e "ACCEPT_KEYWORDS=\"**\"\nACCEPT_LICENSE=\"*\"\nFEATURES=\"-news -sandbox -usersandbox -cgroup binpkg-multi-instance -binpkg-docompress -binpkg-dostrip parallel-install -ipc-sandbox -network-sandbox -pid-sandbox binpkg-ignore-signature buildpkg getbinpkg\"\nMAKEOPTS=\"--jobs=$(nproc) --load-average=$(nproc)\"\nUSE=\"-initramfs kernel-install boot ukify -bash dash\"" >> /etc/portage/make.conf RUN echo -e "sys-kernel/installkernel systemd -dracut -grub -systemd-boot -uki -ukify" >> /etc/portage/package.use/installkernel RUN emerge --jobs="$(nproc)" --load-average="$(nproc)" sys-kernel/gentoo-kernel-bin app-text/tree app-text/asciidoc sys-apps/systemd sys-kernel/dracut sys-boot/grub sys-kernel/installkernel sys-fs/dosfstools sys-boot/refind app-alternatives/sh From 77251a447ef14857fc5c0871612995d04fabaade Mon Sep 17 00:00:00 2001 From: xz-dev Date: Tue, 14 Oct 2025 17:41:47 +0800 Subject: [PATCH 3/7] Dockerfile: fix ACCEPT_KEYWORDS for live ebuild --- .github/workflows/test.yml | 2 ++ Dockerfile | 6 +++--- installkernel-9999.ebuild | 1 + run_tests.sh | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b886535..a5e6713 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,6 +10,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + with: + fetch-depth: 0 - name: Run tests run: ./run_tests_in_docker.sh diff --git a/Dockerfile b/Dockerfile index df9c10f..78fd5f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,10 +2,10 @@ FROM gentoo/stage3:amd64-systemd RUN wget --progress=dot:mega -O - https://github.com/gentoo-mirror/gentoo/archive/master.tar.gz | tar -xz \ && mv gentoo-master /var/db/repos/gentoo -RUN echo -e "ACCEPT_KEYWORDS=\"**\"\nACCEPT_LICENSE=\"*\"\nFEATURES=\"-news -sandbox -usersandbox -cgroup binpkg-multi-instance -binpkg-docompress -binpkg-dostrip parallel-install -ipc-sandbox -network-sandbox -pid-sandbox binpkg-ignore-signature buildpkg getbinpkg\"\nMAKEOPTS=\"--jobs=$(nproc) --load-average=$(nproc)\"\nUSE=\"-initramfs kernel-install boot ukify -bash dash\"" >> /etc/portage/make.conf +RUN echo -e "ACCEPT_KEYWORDS=\"~amd64\"\nACCEPT_LICENSE=\"*\"\nFEATURES=\"-news -sandbox -usersandbox -cgroup binpkg-multi-instance -binpkg-docompress -binpkg-dostrip parallel-install -ipc-sandbox -network-sandbox -pid-sandbox binpkg-ignore-signature buildpkg getbinpkg\"\nMAKEOPTS=\"--jobs=$(nproc) --load-average=$(nproc)\"\nUSE=\"-initramfs kernel-install boot ukify -bash dash\"" >> /etc/portage/make.conf RUN echo -e "sys-kernel/installkernel systemd -dracut -grub -systemd-boot -uki -ukify" >> /etc/portage/package.use/installkernel +RUN echo -e "sys-kernel/installkernel **" >> /etc/portage/package.accept_keywords/installkernel RUN emerge --jobs="$(nproc)" --load-average="$(nproc)" sys-kernel/gentoo-kernel-bin app-text/tree app-text/asciidoc sys-apps/systemd sys-kernel/dracut sys-boot/grub sys-kernel/installkernel sys-fs/dosfstools sys-boot/refind app-alternatives/sh +ENV LOCAL_TEST=1 CMD /tmp/installkernel-gentoo-9999/run_tests.sh - - diff --git a/installkernel-9999.ebuild b/installkernel-9999.ebuild index 0bc9349..b6aa098 100644 --- a/installkernel-9999.ebuild +++ b/installkernel-9999.ebuild @@ -13,6 +13,7 @@ HOMEPAGE=" if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/projg2/installkernel-gentoo.git" + [[ -n ${LOCAL_TEST} ]] && EGIT_REPO_URI="file:///tmp/installkernel-gentoo-9999/" inherit git-r3 else SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz -> ${P}.tar.gz" diff --git a/run_tests.sh b/run_tests.sh index 7cd859c..dd09385 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -4,7 +4,7 @@ cd /tmp || exit 1 cp /tmp/installkernel-gentoo-9999/installkernel-9999.ebuild /var/db/repos/gentoo/sys-kernel/installkernel/installkernel-9999.ebuild || exit 1 -tar -czf /var/cache/distfiles/installkernel-9999.tar.gz installkernel-gentoo-9999/. || exit 1 +ls -la /tmp/installkernel-gentoo-9999/ || exit 1 ebuild /var/db/repos/gentoo/sys-kernel/installkernel/installkernel-9999.ebuild manifest || exit 1 INST_KERN="$(ls /boot/kernel*-gentoo-dist* || exit 1)" From 412e2df31e69a1a319a3ffe8638afa4b40b9e25d Mon Sep 17 00:00:00 2001 From: xz-dev <32761048+xz-dev@users.noreply.github.com> Date: Tue, 14 Oct 2025 20:24:44 +0800 Subject: [PATCH 4/7] installkernel-9999.ebuild: minor format update Co-authored-by: Nowa Ammerlaan --- installkernel-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installkernel-9999.ebuild b/installkernel-9999.ebuild index b6aa098..a30a257 100644 --- a/installkernel-9999.ebuild +++ b/installkernel-9999.ebuild @@ -12,9 +12,9 @@ HOMEPAGE=" " if [[ ${PV} == 9999 ]]; then + inherit git-r3 EGIT_REPO_URI="https://github.com/projg2/installkernel-gentoo.git" [[ -n ${LOCAL_TEST} ]] && EGIT_REPO_URI="file:///tmp/installkernel-gentoo-9999/" - inherit git-r3 else SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" From a98ad733f617a5f68366cffe78511f24497ef58e Mon Sep 17 00:00:00 2001 From: xz-dev Date: Tue, 14 Oct 2025 23:51:43 +0800 Subject: [PATCH 5/7] workflows: rename action --- .github/workflows/shellcheck.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index 152c11a..2cb646b 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -1,4 +1,4 @@ -name: Test installkernel +name: ShellCheck Lint on: push: branches: [ master ] diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a5e6713..7781149 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,4 +1,4 @@ -name: Test installkernel +name: installkernel tests on: push: branches: [ master ] From 95452c8c32414f3347e19291b2719d16189cd994 Mon Sep 17 00:00:00 2001 From: xz-dev Date: Wed, 15 Oct 2025 00:28:56 +0800 Subject: [PATCH 6/7] run_tests.sh: remove ebuild manifest --- run_tests.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/run_tests.sh b/run_tests.sh index dd09385..760425e 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -5,7 +5,6 @@ cd /tmp || exit 1 cp /tmp/installkernel-gentoo-9999/installkernel-9999.ebuild /var/db/repos/gentoo/sys-kernel/installkernel/installkernel-9999.ebuild || exit 1 ls -la /tmp/installkernel-gentoo-9999/ || exit 1 -ebuild /var/db/repos/gentoo/sys-kernel/installkernel/installkernel-9999.ebuild manifest || exit 1 INST_KERN="$(ls /boot/kernel*-gentoo-dist* || exit 1)" INST_KV_FULL="${INST_KERN#/boot/kernel-}" From 0057dd6df0953130989aa31084de56e99612b21d Mon Sep 17 00:00:00 2001 From: xz-dev Date: Wed, 15 Oct 2025 09:45:43 +0800 Subject: [PATCH 7/7] Dockerfile: remove LOCAL_TEST env --- Dockerfile | 1 - installkernel-9999.ebuild | 1 - run_tests.sh | 4 +++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 78fd5f2..a68a02a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,5 +7,4 @@ RUN echo -e "sys-kernel/installkernel systemd -dracut -grub -systemd-boot -uki - RUN echo -e "sys-kernel/installkernel **" >> /etc/portage/package.accept_keywords/installkernel RUN emerge --jobs="$(nproc)" --load-average="$(nproc)" sys-kernel/gentoo-kernel-bin app-text/tree app-text/asciidoc sys-apps/systemd sys-kernel/dracut sys-boot/grub sys-kernel/installkernel sys-fs/dosfstools sys-boot/refind app-alternatives/sh -ENV LOCAL_TEST=1 CMD /tmp/installkernel-gentoo-9999/run_tests.sh diff --git a/installkernel-9999.ebuild b/installkernel-9999.ebuild index a30a257..3c319f8 100644 --- a/installkernel-9999.ebuild +++ b/installkernel-9999.ebuild @@ -14,7 +14,6 @@ HOMEPAGE=" if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/projg2/installkernel-gentoo.git" - [[ -n ${LOCAL_TEST} ]] && EGIT_REPO_URI="file:///tmp/installkernel-gentoo-9999/" else SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" diff --git a/run_tests.sh b/run_tests.sh index 760425e..20cc09b 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -4,7 +4,9 @@ cd /tmp || exit 1 cp /tmp/installkernel-gentoo-9999/installkernel-9999.ebuild /var/db/repos/gentoo/sys-kernel/installkernel/installkernel-9999.ebuild || exit 1 -ls -la /tmp/installkernel-gentoo-9999/ || exit 1 + +# Modify EGIT_REPO_URI to use local path instead of GitHub +sed -i 's|EGIT_REPO_URI="https://github.com/projg2/installkernel-gentoo.git"|EGIT_REPO_URI="file:///tmp/installkernel-gentoo-9999/"|' /var/db/repos/gentoo/sys-kernel/installkernel/installkernel-9999.ebuild || exit 1 INST_KERN="$(ls /boot/kernel*-gentoo-dist* || exit 1)" INST_KV_FULL="${INST_KERN#/boot/kernel-}"