skiff-core-gentoo: fixes and use systemd suffix

Signed-off-by: Christian Stewart <christian@aperture.us>
skiffos · Sep 29, 2023 · 1f97717 · 1f97717
1 parent 1c467ab
commit 1f97717
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/configs/core/gentoo/buildroot_ext/package/skiff-core-gentoo/coreenv/Dockerfile b/configs/core/gentoo/buildroot_ext/package/skiff-core-gentoo/coreenv/Dockerfile
@@ -72,11 +72,12 @@ RUN rm -rf /var/db/repos/gentoo; \
     printf "masters = gentoo\nthin-manifests = true\n" > /var/db/repos/localrepo-crossdev/metadata/layout.conf; \
     chown -R portage:portage /var/db/repos/localrepo-crossdev; \
     rm -rf /etc/portage/package.use || true; \
-    mkdir -p /etc/portage/package.use; \
+    mkdir -p /etc/portage/package.{use,keywords}; \
     emerge --sync
 
 # apply package keywords, use flags, etc
-COPY ./make.conf ./package.accept_keywords /etc/portage/
+COPY ./make.conf /etc/portage/
+COPY ./package.accept_keywords /etc/portage/package.accept_keywords/00-skiffos
 COPY ./sysctl.conf /etc/sysctl.conf
 RUN \
   source /gentoo-skiff-overrides.sh; \

diff --git a/configs/core/gentoo/buildroot_ext/package/skiff-core-gentoo/coreenv/make.conf b/configs/core/gentoo/buildroot_ext/package/skiff-core-gentoo/coreenv/make.conf
@@ -36,6 +36,6 @@ INPUT_DEVICES="libinput synaptics mtrack"
 
 # select:
 # VIDEO_CARDS="panfrost tegra lima"
-# VIDEO_CARDS="nvidia nouveau intel i965 iris"
+# VIDEO_CARDS="nvidia nouveau intel i965 iris amdgpu radeonsi"
 
 GENTOO_MIRRORS="http://www.gtlib.gatech.edu/pub/gentoo http://mirrors.rit.edu/gentoo/ http://gentoo.osuosl.org/"
diff --git a/configs/core/gentoo/buildroot_ext/package/skiff-core-gentoo/skiff-core-gentoo.mk b/configs/core/gentoo/buildroot_ext/package/skiff-core-gentoo/skiff-core-gentoo.mk
@@ -10,6 +10,7 @@ SKIFF_CORE_GENTOO_DEPENDENCIES = skiff-core skiff-core-defconfig
 
 # amd64 (default)
 SKIFF_CORE_GENTOO_COREENV_ARCH = amd64
+SKIFF_CORE_GENTOO_COREENV_SUFFIX = -systemd
 
 # arm
 ifeq ($(BR2_arm),y)
@@ -23,7 +24,6 @@ SKIFF_CORE_GENTOO_COREENV_SUBPROFILE = armv6j/systemd
 # armv5
 ifeq ($(BR2_ARM_CPU_ARMV5),y)
 SKIFF_CORE_GENTOO_COREENV_MICROARCH = armv5tel
-SKIFF_CORE_GENTOO_COREENV_SUFFIX = -systemd
 SKIFF_CORE_GENTOO_COREENV_SUBPROFILE = armv5te/systemd
 endif
 
@@ -50,7 +50,6 @@ SKIFF_CORE_GENTOO_COREENV_MICROARCH = rv64_lp64d
 else
 SKIFF_CORE_GENTOO_COREENV_MICROARCH = rv64_lp64
 endif
-SKIFF_CORE_GENTOO_COREENV_SUFFIX = -systemd
 endif
 
 SKIFF_CORE_GENTOO_COREENV_DIST = \