Skip to content

Commit 77251a4

Browse files
committed
Dockerfile: fix ACCEPT_KEYWORDS for live ebuild
1 parent 2a86fb4 commit 77251a4

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v3
13+
with:
14+
fetch-depth: 0
1315
- name: Run tests
1416
run: ./run_tests_in_docker.sh
1517

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ FROM gentoo/stage3:amd64-systemd
22

33
RUN wget --progress=dot:mega -O - https://github.com/gentoo-mirror/gentoo/archive/master.tar.gz | tar -xz \
44
&& mv gentoo-master /var/db/repos/gentoo
5-
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
5+
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
66
RUN echo -e "sys-kernel/installkernel systemd -dracut -grub -systemd-boot -uki -ukify" >> /etc/portage/package.use/installkernel
7+
RUN echo -e "sys-kernel/installkernel **" >> /etc/portage/package.accept_keywords/installkernel
78
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
89

10+
ENV LOCAL_TEST=1
911
CMD /tmp/installkernel-gentoo-9999/run_tests.sh
10-
11-

installkernel-9999.ebuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ HOMEPAGE="
1313

1414
if [[ ${PV} == 9999 ]]; then
1515
EGIT_REPO_URI="https://github.com/projg2/installkernel-gentoo.git"
16+
[[ -n ${LOCAL_TEST} ]] && EGIT_REPO_URI="file:///tmp/installkernel-gentoo-9999/"
1617
inherit git-r3
1718
else
1819
SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz -> ${P}.tar.gz"

run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
cd /tmp || exit 1
55

66
cp /tmp/installkernel-gentoo-9999/installkernel-9999.ebuild /var/db/repos/gentoo/sys-kernel/installkernel/installkernel-9999.ebuild || exit 1
7-
tar -czf /var/cache/distfiles/installkernel-9999.tar.gz installkernel-gentoo-9999/. || exit 1
7+
ls -la /tmp/installkernel-gentoo-9999/ || exit 1
88
ebuild /var/db/repos/gentoo/sys-kernel/installkernel/installkernel-9999.ebuild manifest || exit 1
99

1010
INST_KERN="$(ls /boot/kernel*-gentoo-dist* || exit 1)"

0 commit comments

Comments
 (0)