commit: ab1966158bb6c39b523383122f346b5eb9f9c13a Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Fri Aug 30 12:45:17 2024 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Fri Aug 30 19:06:57 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab196615
sys-kernel/vanilla-kernel: fix applying savedconfig on arm, hppa, loong 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. Bug: https://bugs.gentoo.org/938725 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> sys-kernel/vanilla-kernel/vanilla-kernel-5.10.224.ebuild | 9 +++------ sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild | 9 +++------ sys-kernel/vanilla-kernel/vanilla-kernel-5.15.165.ebuild | 9 +++------ sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9999.ebuild | 9 +++------ sys-kernel/vanilla-kernel/vanilla-kernel-6.1.106.ebuild | 9 +++------ sys-kernel/vanilla-kernel/vanilla-kernel-6.1.107.ebuild | 9 +++------ sys-kernel/vanilla-kernel/vanilla-kernel-6.10.6.ebuild | 12 +++--------- sys-kernel/vanilla-kernel/vanilla-kernel-6.10.7.ebuild | 12 +++--------- sys-kernel/vanilla-kernel/vanilla-kernel-6.6.47.ebuild | 12 +++--------- sys-kernel/vanilla-kernel/vanilla-kernel-6.6.48.ebuild | 12 +++--------- sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild | 12 +++--------- 11 files changed, 33 insertions(+), 81 deletions(-) diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.224.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.224.ebuild index 900f0cd17578..3816ece2074d 100644 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.224.ebuild +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.224.ebuild @@ -76,19 +76,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/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild index 86480fbf041b..f1e4891c4a7e 100644 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild @@ -65,19 +65,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/vanilla-kernel/vanilla-kernel-5.15.165.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.165.ebuild index 7dcd0d3528a5..857634f8cd43 100644 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.165.ebuild +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.165.ebuild @@ -76,19 +76,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/vanilla-kernel/vanilla-kernel-5.15.9999.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9999.ebuild index b1493802e951..7d069a174e94 100644 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9999.ebuild +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9999.ebuild @@ -65,19 +65,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/vanilla-kernel/vanilla-kernel-6.1.106.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.106.ebuild index 7dcd0d3528a5..857634f8cd43 100644 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.106.ebuild +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.106.ebuild @@ -76,19 +76,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/vanilla-kernel/vanilla-kernel-6.1.107.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.107.ebuild index 7dcd0d3528a5..857634f8cd43 100644 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.107.ebuild +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.107.ebuild @@ -76,19 +76,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/vanilla-kernel/vanilla-kernel-6.10.6.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.6.ebuild index fe28dad4c959..2bc8ee080f62 100644 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.6.ebuild +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.6.ebuild @@ -77,22 +77,16 @@ src_prepare() { # prepare the default config case ${ARCH} in + arm | hppa | loong) + > .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 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.7.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.7.ebuild index fe28dad4c959..2bc8ee080f62 100644 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.7.ebuild +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.7.ebuild @@ -77,22 +77,16 @@ src_prepare() { # prepare the default config case ${ARCH} in + arm | hppa | loong) + > .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 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.47.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.47.ebuild index 2de327030b51..93587cc4db6d 100644 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.47.ebuild +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.47.ebuild @@ -77,22 +77,16 @@ src_prepare() { # prepare the default config case ${ARCH} in + arm | hppa | loong) + > .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 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.48.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.48.ebuild index 2de327030b51..93587cc4db6d 100644 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.48.ebuild +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.48.ebuild @@ -77,22 +77,16 @@ src_prepare() { # prepare the default config case ${ARCH} in + arm | hppa | loong) + > .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 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild index 53145fb7ba9a..ed9c2cfa781a 100644 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild @@ -66,22 +66,16 @@ src_prepare() { # prepare the default config case ${ARCH} in + arm | hppa | loong) + > .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
