From 105076d641ef82b1884fd7c497a37cfae696cd53 Mon Sep 17 00:00:00 2001 From: Georgy Yakovlev Date: Sun, 25 Jul 2021 13:57:45 -0700 Subject: [PATCH] tools/catalyst-auto-arm64.conf: uncomment KCONFIG_DIR without it catalyst will not copy kconfig to /tmp/catalyst-*/kconfig Signed-off-by: Georgy Yakovlev --- releases/specs/arm64/installcd-stage2-minimal.spec | 5 ++--- tools/catalyst-auto-arm64.conf | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/releases/specs/arm64/installcd-stage2-minimal.spec b/releases/specs/arm64/installcd-stage2-minimal.spec index 5ae887ed..f1d3c34b 100644 --- a/releases/specs/arm64/installcd-stage2-minimal.spec +++ b/releases/specs/arm64/installcd-stage2-minimal.spec @@ -15,8 +15,9 @@ livecd/volid: Gentoo arm64 @TIMESTAMP@ boot/kernel: gentoo -boot/kernel/gentoo/sources: gentoo-sources +boot/kernel/gentoo/sources: sys-kernel/gentoo-sources boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/arm64/arm64-5.10.52.config +boot/kernel/gentoo/packages: zfs zfs-kmod livecd/unmerge: app-admin/eselect @@ -81,8 +82,6 @@ livecd/empty: /usr/diet/include /usr/diet/man /usr/include - /usr/i?86-gentoo-linux-uclibc - /usr/i?86-pc-linux-uclibc /usr/lib/X11/config /usr/lib/X11/doc /usr/lib/X11/etc diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf index 62a4b23d..4957391b 100644 --- a/tools/catalyst-auto-arm64.conf +++ b/tools/catalyst-auto-arm64.conf @@ -11,7 +11,7 @@ SETS="default" SET_default_SPECS="stage1.spec stage3.spec systemd-stage1.spec systemd-stage3.spec" #SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" -#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc +KCONFIG_DIR=${REPO_DIR}/releases/kconfig/arm64 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"