commit: 622df249fa49dde6589ed2ce35729e17fd6452fe Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Fri Aug 30 12:49:41 2024 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Fri Aug 30 19:07:04 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=622df249
sys-kernel/gentoo-kernel: fix applying savedconfig on alt arches On arches where we do not supply a default .config will still want to call kernel-build_merge_configs to apply the savedconfig. Otherwise we end up with no .config in src_configure. Closes: https://bugs.gentoo.org/938725 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> sys-kernel/gentoo-kernel/gentoo-kernel-5.10.224.ebuild | 9 +++------ sys-kernel/gentoo-kernel/gentoo-kernel-5.15.165.ebuild | 12 +++--------- sys-kernel/gentoo-kernel/gentoo-kernel-6.1.106.ebuild | 15 +++------------ sys-kernel/gentoo-kernel/gentoo-kernel-6.1.107.ebuild | 15 +++------------ sys-kernel/gentoo-kernel/gentoo-kernel-6.10.6.ebuild | 18 +++--------------- sys-kernel/gentoo-kernel/gentoo-kernel-6.10.7.ebuild | 18 +++--------------- sys-kernel/gentoo-kernel/gentoo-kernel-6.6.47.ebuild | 18 +++--------------- sys-kernel/gentoo-kernel/gentoo-kernel-6.6.48.ebuild | 18 +++--------------- 8 files changed, 24 insertions(+), 99 deletions(-) diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.224.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.224.ebuild index 27f4a7de32fa..faa3575b372a 100644 --- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.224.ebuild +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.224.ebuild @@ -73,19 +73,16 @@ src_prepare() { # prepare the default config case ${ARCH} in + arm | hppa) + > .config || die + ;; amd64) cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die ;; - arm) - return - ;; arm64) cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die biendian=true ;; - hppa) - return - ;; ppc) # assume powermac/powerbook defconfig # we still package.use.force savedconfig diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.165.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.165.ebuild index c4d0d7ec2ceb..60ead9bfada5 100644 --- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.165.ebuild +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.165.ebuild @@ -78,19 +78,16 @@ src_prepare() { # prepare the default config case ${ARCH} in + arm | hppa | sparc) + > .config || die + ;; amd64) cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die ;; - arm) - return - ;; arm64) cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die biendian=true ;; - hppa) - return - ;; ppc) # assume powermac/powerbook defconfig # we still package.use.force savedconfig @@ -100,9 +97,6 @@ src_prepare() { cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die biendian=true ;; - sparc) - return - ;; x86) cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die ;; diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.106.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.106.ebuild index 7b4cc2c8b2fc..abad8f6c97dc 100644 --- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.106.ebuild +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.106.ebuild @@ -79,19 +79,16 @@ src_prepare() { # prepare the default config case ${ARCH} in + arm | hppa | riscv | sparc) + > .config || die + ;; amd64) cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die ;; - arm) - return - ;; arm64) cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die biendian=true ;; - hppa) - return - ;; ppc) # assume powermac/powerbook defconfig # we still package.use.force savedconfig @@ -101,12 +98,6 @@ src_prepare() { cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die biendian=true ;; - riscv) - return - ;; - sparc) - return - ;; x86) cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die ;; diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.107.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.107.ebuild index dcba4a9c42af..21c9b05e1334 100644 --- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.107.ebuild +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.107.ebuild @@ -79,19 +79,16 @@ src_prepare() { # prepare the default config case ${ARCH} in + arm | hppa | riscv | sparc) + > .config || die + ;; amd64) cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die ;; - arm) - return - ;; arm64) cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die biendian=true ;; - hppa) - return - ;; ppc) # assume powermac/powerbook defconfig # we still package.use.force savedconfig @@ -101,12 +98,6 @@ src_prepare() { cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die biendian=true ;; - riscv) - return - ;; - sparc) - return - ;; x86) cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die ;; diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.6.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.6.ebuild index 2bcdbee61cf0..bd5891485cf2 100644 --- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.6.ebuild +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.6.ebuild @@ -81,22 +81,16 @@ src_prepare() { # prepare the default config case ${ARCH} in + arm | hppa | loong | riscv | sparc) + > .config || die + ;; amd64) cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die ;; - arm) - return - ;; arm64) cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die biendian=true ;; - hppa) - return - ;; - loong) - return - ;; ppc) # assume powermac/powerbook defconfig # we still package.use.force savedconfig @@ -106,12 +100,6 @@ src_prepare() { cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die biendian=true ;; - riscv) - return - ;; - sparc) - return - ;; x86) cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die ;; diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.7.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.7.ebuild index 2bcdbee61cf0..bd5891485cf2 100644 --- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.7.ebuild +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.7.ebuild @@ -81,22 +81,16 @@ src_prepare() { # prepare the default config case ${ARCH} in + arm | hppa | loong | riscv | sparc) + > .config || die + ;; amd64) cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die ;; - arm) - return - ;; arm64) cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die biendian=true ;; - hppa) - return - ;; - loong) - return - ;; ppc) # assume powermac/powerbook defconfig # we still package.use.force savedconfig @@ -106,12 +100,6 @@ src_prepare() { cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die biendian=true ;; - riscv) - return - ;; - sparc) - return - ;; x86) cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die ;; diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.47.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.47.ebuild index d037ffe5cc80..094236f9d67e 100644 --- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.47.ebuild +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.47.ebuild @@ -81,22 +81,16 @@ src_prepare() { # prepare the default config case ${ARCH} in + arm | hppa | loong | riscv | sparc) + > .config || die + ;; amd64) cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die ;; - arm) - return - ;; arm64) cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die biendian=true ;; - hppa) - return - ;; - loong) - return - ;; ppc) # assume powermac/powerbook defconfig # we still package.use.force savedconfig @@ -106,12 +100,6 @@ src_prepare() { cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die biendian=true ;; - riscv) - return - ;; - sparc) - return - ;; x86) cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die ;; diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.48.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.48.ebuild index 4f603a059b70..12051547386c 100644 --- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.48.ebuild +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.48.ebuild @@ -81,22 +81,16 @@ src_prepare() { # prepare the default config case ${ARCH} in + arm | hppa | loong | riscv | sparc) + > .config || die + ;; amd64) cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die ;; - arm) - return - ;; arm64) cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die biendian=true ;; - hppa) - return - ;; - loong) - return - ;; ppc) # assume powermac/powerbook defconfig # we still package.use.force savedconfig @@ -106,12 +100,6 @@ src_prepare() { cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die biendian=true ;; - riscv) - return - ;; - sparc) - return - ;; x86) cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die ;;
