From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 13 Aug 2024 15:21:05 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sdrST-009CvU-1u for lore@lore.pengutronix.de; Tue, 13 Aug 2024 15:21:05 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1sdrSS-0007XY-SL; Tue, 13 Aug 2024 15:21:04 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sdrSI-0007Ti-D3; Tue, 13 Aug 2024 15:20:54 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sdrSH-0008L3-RH; Tue, 13 Aug 2024 15:20:53 +0200 Received: from rhi by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1sdrSH-00GQQ9-2Y; Tue, 13 Aug 2024 15:20:53 +0200 From: Roland Hieber To: distrokit@pengutronix.de Date: Tue, 13 Aug 2024 15:20:43 +0200 Message-Id: <20240813132050.3914043-3-rhi@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240813132050.3914043-1-rhi@pengutronix.de> References: <20240801113819.3981009-1-a.fatoum@pengutronix.de> <20240813132050.3914043-1-rhi@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH v3 2/9] mips, mipsel: remove forked kernel rule X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Roland Hieber Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Our forked kernel rule is outdated, but it is only a stripped-down version of the upstream kernel rule that does not actually build a kernel, but is used to provide a REF_CONFIG for other kernel recipes. Remove the forked rule to make future maintainance easier, and set the platformconfig options and the KERNEL_MAKE_ENV suitably so that the upstream kernel rule does the same as before. Also run 'oldconfig' to update the kernelconfig and pick up the changes from the upstream kernel rule. The changes in the PAHOLE version in the kernelconfig diffs stem from the fact that the kernel rules are outdated, which we'll fix in later commits. Nevertheless, keep the kernelconfigs in sync so as not to break bisectability. Signed-off-by: Roland Hieber --- configs/platform-mips/kernelconfig | 1 - .../platform-mips/kernelconfig-ar9331.diff | 3 +- configs/platform-mips/kernelconfig-malta.diff | 3 +- configs/platform-mips/platformconfig | 35 ++++++++ configs/platform-mips/platforms/kernel.in | 26 ------ configs/platform-mips/rules/kernel.make | 83 ------------------- .../platform-mips/rules/kernel.noexec.make | 2 + configs/platform-mipsel/kernelconfig | 3 +- .../platform-mipsel/kernelconfig-malta.diff | 4 +- configs/platform-mipsel/platformconfig | 35 ++++++++ configs/platform-mipsel/platforms/kernel.in | 26 ------ configs/platform-mipsel/rules/kernel.make | 82 ------------------ .../platform-mipsel/rules/kernel.noexec.make | 2 + 13 files changed, 79 insertions(+), 226 deletions(-) delete mode 100644 configs/platform-mips/platforms/kernel.in delete mode 100644 configs/platform-mips/rules/kernel.make create mode 100644 configs/platform-mips/rules/kernel.noexec.make delete mode 100644 configs/platform-mipsel/platforms/kernel.in delete mode 100644 configs/platform-mipsel/rules/kernel.make create mode 100644 configs/platform-mipsel/rules/kernel.noexec.make diff --git a/configs/platform-mips/kernelconfig b/configs/platform-mips/kernelconfig index a84595b3abdd..98f3196ef1ef 100644 --- a/configs/platform-mips/kernelconfig +++ b/configs/platform-mips/kernelconfig @@ -474,7 +474,6 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y # end of GCOV-based kernel profiling CONFIG_HAVE_GCC_PLUGINS=y -# CONFIG_GCC_PLUGINS is not set CONFIG_FUNCTION_ALIGNMENT=0 # end of General architecture-dependent options diff --git a/configs/platform-mips/kernelconfig-ar9331.diff b/configs/platform-mips/kernelconfig-ar9331.diff index e58712b1d558..727497c2a06c 100644 --- a/configs/platform-mips/kernelconfig-ar9331.diff +++ b/configs/platform-mips/kernelconfig-ar9331.diff @@ -1,4 +1,4 @@ -13afb78f9f73380b2d43b220956bd5d8 +af97ac2360293c1315a7accdcaa0b01e # CONFIG_ACORN_PARTITION is undefined # CONFIG_AIX_PARTITION is undefined # CONFIG_AMIGA_PARTITION is undefined @@ -6,7 +6,6 @@ CONFIG_BLK_DEBUG_FS=y # CONFIG_BSD_DISKLABEL is undefined # CONFIG_CMDLINE_PARTITION is undefined -# CONFIG_GCC_PLUGINS is undefined # CONFIG_KARMA_PARTITION is undefined # CONFIG_LDM_PARTITION is undefined CONFIG_LOCALVERSION="-ar9331" diff --git a/configs/platform-mips/kernelconfig-malta.diff b/configs/platform-mips/kernelconfig-malta.diff index 4aad01f21607..ce4b18d27390 100644 --- a/configs/platform-mips/kernelconfig-malta.diff +++ b/configs/platform-mips/kernelconfig-malta.diff @@ -1,4 +1,4 @@ -13afb78f9f73380b2d43b220956bd5d8 +af97ac2360293c1315a7accdcaa0b01e # CONFIG_8139CP is not set # CONFIG_8139TOO is not set # CONFIG_ACENIC is not set @@ -364,7 +364,6 @@ CONFIG_FUSE_FS=m CONFIG_FWNODE_MDIO=m CONFIG_GACT_PROB=y CONFIG_GARP=m -# CONFIG_GCC_PLUGINS is undefined CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y CONFIG_GENERIC_IRQ_IPI=y CONFIG_GENERIC_ISA_DMA=y diff --git a/configs/platform-mips/platformconfig b/configs/platform-mips/platformconfig index 86e4d6f40537..6a7cab8ef6a7 100644 --- a/configs/platform-mips/platformconfig +++ b/configs/platform-mips/platformconfig @@ -114,9 +114,43 @@ PTXCONF_TARGET_EXTRA_LDFLAGS="" # end of architecture PTXCONF_KERNEL=y +# PTXCONF_KERNEL_INSTALL is not set +# PTXCONF_KERNEL_MODULES is not set PTXCONF_KERNEL_VERSION="6.6" PTXCONF_KERNEL_MD5="452098d80ba925af3a4ab35998f3aef5" +# PTXCONF_KERNEL_IMAGE_BZ is not set +# PTXCONF_KERNEL_IMAGE_Z is not set +# PTXCONF_KERNEL_IMAGE_XIP is not set +# PTXCONF_KERNEL_IMAGE_U is not set +# PTXCONF_KERNEL_IMAGE_VM is not set +# PTXCONF_KERNEL_IMAGE_VMLINUX is not set +PTXCONF_KERNEL_IMAGE_VMLINUZ=y +# PTXCONF_KERNEL_IMAGE_RAW is not set +# PTXCONF_KERNEL_IMAGE_SIMPLE is not set +PTXCONF_KERNEL_IMAGE="vmlinuz" +# PTXCONF_KERNEL_DTB is not set +# PTXCONF_KERNEL_DTBO is not set +# PTXCONF_KERNEL_CODE_SIGNING is not set +# PTXCONF_KERNEL_ZSTD is not set +# PTXCONF_KERNEL_XZ is not set PTXCONF_KERNEL_LZOP=y +# PTXCONF_KERNEL_LZ4 is not set +# PTXCONF_KERNEL_OPENSSL is not set +# PTXCONF_KERNEL_LIBELF is not set +# PTXCONF_KERNEL_GCC_PLUGINS is not set +# PTXCONF_KERNEL_CONFIG_BASE_VERSION is not set + +# +# patching & configuration +# +PTXCONF_KERNEL_SERIES="series" +PTXCONF_KERNEL_CONFIG="kernelconfig" +# end of patching & configuration + +# +# Development features +# +PTXCONF_KERNEL_EXTRA_MAKEVARS="" # # console options @@ -225,6 +259,7 @@ PTXCONF_HOST_OPENSSL=y PTXCONF_HOST_P11_KIT=y PTXCONF_HOST_SOFTHSM=y PTXCONF_HOST_SQLITE=y +PTXCONF_HOST_SYSTEM_BC=y PTXCONF_HOST_SYSTEM_PYTHON3_FLIT_CORE=y PTXCONF_HOST_SYSTEM_PYTHON3_INSTALLER=y PTXCONF_HOST_SYSTEM_PYTHON3_PACKAGING=y diff --git a/configs/platform-mips/platforms/kernel.in b/configs/platform-mips/platforms/kernel.in deleted file mode 100644 index 1889211a7ae2..000000000000 --- a/configs/platform-mips/platforms/kernel.in +++ /dev/null @@ -1,26 +0,0 @@ -## SECTION=base_kernel - -menuconfig KERNEL - bool - default y - prompt "Linux kernel " - -if KERNEL - -config KERNEL_VERSION - prompt "kernel version" - string - default "4.15" - -config KERNEL_MD5 - prompt "kernel source md5sum" - string - -config KERNEL_INSTALL - bool - -config KERNEL_LZOP - prompt "build lzop hosttool" - bool - -endif # KERNEL diff --git a/configs/platform-mips/rules/kernel.make b/configs/platform-mips/rules/kernel.make deleted file mode 100644 index e4efb46f68de..000000000000 --- a/configs/platform-mips/rules/kernel.make +++ /dev/null @@ -1,83 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2002-2009 by Pengutronix e.K., Hildesheim, Germany -# 2010 by Marc Kleine-Budde -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_KERNEL) += kernel - -# -# Paths and names -# -KERNEL := linux-$(KERNEL_VERSION) -KERNEL_MD5 := $(call remove_quotes,$(PTXCONF_KERNEL_MD5)) -ifneq ($(KERNEL_NEEDS_GIT_URL),y) -KERNEL_SUFFIX := tar.xz -KERNEL_URL := $(call kernel-url, KERNEL) -else -KERNEL_SUFFIX := tar.gz -KERNEL_URL := https://git.kernel.org/torvalds/t/$(KERNEL).$(KERNEL_SUFFIX) -endif -KERNEL_DIR := $(BUILDDIR)/$(KERNEL) -KERNEL_BUILD_DIR := $(KERNEL_DIR)-build -KERNEL_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig) -KERNEL_LICENSE := GPL-2.0-only -KERNEL_SOURCE := $(SRCDIR)/$(KERNEL).$(KERNEL_SUFFIX) -KERNEL_DEVPKG := NO -KERNEL_BUILD_OOT := KEEP - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -KERNEL_CONF_OPT := \ - -C $(KERNEL_DIR) \ - O=$(KERNEL_BUILD_DIR) \ - PAHOLE=false \ - $(call kernel-opts, KERNEL) - -# no gcc plugins; avoid config changes depending on the host compiler -KERNEL_CONF_OPT += \ - HOSTCXX=false - -ifdef PTXCONF_KERNEL -$(KERNEL_CONFIG): - @echo - @echo "*************************************************************************" - @echo "**** Please generate a kernelconfig with 'ptxdist menuconfig kernel' ****" - @echo "*************************************************************************" - @echo - @echo - @exit 1 -endif - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -$(STATEDIR)/kernel.compile: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/kernel.install: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# oldconfig / menuconfig -# ---------------------------------------------------------------------------- - -$(call ptx/kconfig-targets, kernel): $(STATEDIR)/kernel.extract - @$(call world/kconfig, KERNEL, $(subst kernel_,,$@)) - -# vim: syntax=make diff --git a/configs/platform-mips/rules/kernel.noexec.make b/configs/platform-mips/rules/kernel.noexec.make new file mode 100644 index 000000000000..df74af2c5b3d --- /dev/null +++ b/configs/platform-mips/rules/kernel.noexec.make @@ -0,0 +1,2 @@ +# short-circuit the build since the recipe is only used to serve a REF_CONFIG +KERNEL_MAKE_ENV=: diff --git a/configs/platform-mipsel/kernelconfig b/configs/platform-mipsel/kernelconfig index 176969bb7c9b..117c56cca057 100644 --- a/configs/platform-mipsel/kernelconfig +++ b/configs/platform-mipsel/kernelconfig @@ -17,7 +17,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y -CONFIG_PAHOLE_VERSION=124 +CONFIG_PAHOLE_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y @@ -536,7 +536,6 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y # end of GCOV-based kernel profiling CONFIG_HAVE_GCC_PLUGINS=y -# CONFIG_GCC_PLUGINS is not set CONFIG_FUNCTION_ALIGNMENT=0 # end of General architecture-dependent options diff --git a/configs/platform-mipsel/kernelconfig-malta.diff b/configs/platform-mipsel/kernelconfig-malta.diff index ec0a67f42e54..8e5b3352dedb 100644 --- a/configs/platform-mipsel/kernelconfig-malta.diff +++ b/configs/platform-mipsel/kernelconfig-malta.diff @@ -1,4 +1,4 @@ -f4618f2656cf4f48bc6b8561c7b86726 +9b8cb4d1395ae94191677a625040e2fa # CONFIG_8139CP is not set # CONFIG_8139TOO is not set # CONFIG_ACENIC is not set @@ -338,7 +338,6 @@ CONFIG_FUSE_FS=m CONFIG_FWNODE_MDIO=m CONFIG_GACT_PROB=y CONFIG_GARP=m -# CONFIG_GCC_PLUGINS is undefined # CONFIG_GENERIC_PINCONF is undefined # CONFIG_GENERIC_PINCTRL_GROUPS is undefined # CONFIG_GENERIC_PINMUX_FUNCTIONS is undefined @@ -1110,6 +1109,7 @@ CONFIG_OF_MDIO=m CONFIG_PAGE_POOL_STATS=y CONFIG_PAGE_SIZE_16KB=y # CONFIG_PAGE_SIZE_4KB is not set +CONFIG_PAHOLE_VERSION=124 # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_ON_OOPS_VALUE=0 CONFIG_PANIC_TIMEOUT=0 diff --git a/configs/platform-mipsel/platformconfig b/configs/platform-mipsel/platformconfig index ca1112e01e76..d69bab59bdd1 100644 --- a/configs/platform-mipsel/platformconfig +++ b/configs/platform-mipsel/platformconfig @@ -114,9 +114,43 @@ PTXCONF_TARGET_EXTRA_LDFLAGS="" # end of architecture PTXCONF_KERNEL=y +# PTXCONF_KERNEL_INSTALL is not set +# PTXCONF_KERNEL_MODULES is not set PTXCONF_KERNEL_VERSION="6.4.10" PTXCONF_KERNEL_MD5="2e19e7badc3d4b080bf6b4864912f2d3" +# PTXCONF_KERNEL_IMAGE_BZ is not set +# PTXCONF_KERNEL_IMAGE_Z is not set +# PTXCONF_KERNEL_IMAGE_XIP is not set +# PTXCONF_KERNEL_IMAGE_U is not set +# PTXCONF_KERNEL_IMAGE_VM is not set +# PTXCONF_KERNEL_IMAGE_VMLINUX is not set +PTXCONF_KERNEL_IMAGE_VMLINUZ=y +# PTXCONF_KERNEL_IMAGE_RAW is not set +# PTXCONF_KERNEL_IMAGE_SIMPLE is not set +PTXCONF_KERNEL_IMAGE="vmlinuz" +# PTXCONF_KERNEL_DTB is not set +# PTXCONF_KERNEL_DTBO is not set +# PTXCONF_KERNEL_CODE_SIGNING is not set +# PTXCONF_KERNEL_ZSTD is not set +# PTXCONF_KERNEL_XZ is not set PTXCONF_KERNEL_LZOP=y +# PTXCONF_KERNEL_LZ4 is not set +# PTXCONF_KERNEL_OPENSSL is not set +# PTXCONF_KERNEL_LIBELF is not set +# PTXCONF_KERNEL_GCC_PLUGINS is not set +# PTXCONF_KERNEL_CONFIG_BASE_VERSION is not set + +# +# patching & configuration +# +PTXCONF_KERNEL_SERIES="series" +PTXCONF_KERNEL_CONFIG="kernelconfig" +# end of patching & configuration + +# +# Development features +# +PTXCONF_KERNEL_EXTRA_MAKEVARS="" # # console options @@ -221,6 +255,7 @@ PTXCONF_HOST_OPENSSL=y PTXCONF_HOST_P11_KIT=y PTXCONF_HOST_SOFTHSM=y PTXCONF_HOST_SQLITE=y +PTXCONF_HOST_SYSTEM_BC=y PTXCONF_HOST_SYSTEM_PYTHON3_FLIT_CORE=y PTXCONF_HOST_SYSTEM_PYTHON3_INSTALLER=y PTXCONF_HOST_SYSTEM_PYTHON3_PACKAGING=y diff --git a/configs/platform-mipsel/platforms/kernel.in b/configs/platform-mipsel/platforms/kernel.in deleted file mode 100644 index 1889211a7ae2..000000000000 --- a/configs/platform-mipsel/platforms/kernel.in +++ /dev/null @@ -1,26 +0,0 @@ -## SECTION=base_kernel - -menuconfig KERNEL - bool - default y - prompt "Linux kernel " - -if KERNEL - -config KERNEL_VERSION - prompt "kernel version" - string - default "4.15" - -config KERNEL_MD5 - prompt "kernel source md5sum" - string - -config KERNEL_INSTALL - bool - -config KERNEL_LZOP - prompt "build lzop hosttool" - bool - -endif # KERNEL diff --git a/configs/platform-mipsel/rules/kernel.make b/configs/platform-mipsel/rules/kernel.make deleted file mode 100644 index 6d5ca4d4ea0e..000000000000 --- a/configs/platform-mipsel/rules/kernel.make +++ /dev/null @@ -1,82 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2002-2009 by Pengutronix e.K., Hildesheim, Germany -# 2010 by Marc Kleine-Budde -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_KERNEL) += kernel - -# -# Paths and names -# -KERNEL := linux-$(KERNEL_VERSION) -KERNEL_MD5 := $(call remove_quotes,$(PTXCONF_KERNEL_MD5)) -ifneq ($(KERNEL_NEEDS_GIT_URL),y) -KERNEL_SUFFIX := tar.xz -KERNEL_URL := $(call kernel-url, KERNEL) -else -KERNEL_SUFFIX := tar.gz -KERNEL_URL := https://git.kernel.org/torvalds/t/$(KERNEL).$(KERNEL_SUFFIX) -endif -KERNEL_DIR := $(BUILDDIR)/$(KERNEL) -KERNEL_BUILD_DIR := $(KERNEL_DIR)-build -KERNEL_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig) -KERNEL_LICENSE := GPL-2.0-only -KERNEL_SOURCE := $(SRCDIR)/$(KERNEL).$(KERNEL_SUFFIX) -KERNEL_DEVPKG := NO -KERNEL_BUILD_OOT := KEEP - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -KERNEL_CONF_OPT := \ - -C $(KERNEL_DIR) \ - O=$(KERNEL_BUILD_DIR) \ - $(call kernel-opts, KERNEL) - -# no gcc plugins; avoid config changes depending on the host compiler -KERNEL_CONF_OPT += \ - HOSTCXX=false - -ifdef PTXCONF_KERNEL -$(KERNEL_CONFIG): - @echo - @echo "*************************************************************************" - @echo "**** Please generate a kernelconfig with 'ptxdist menuconfig kernel' ****" - @echo "*************************************************************************" - @echo - @echo - @exit 1 -endif - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -$(STATEDIR)/kernel.compile: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/kernel.install: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# oldconfig / menuconfig -# ---------------------------------------------------------------------------- - -$(call ptx/kconfig-targets, kernel): $(STATEDIR)/kernel.extract - @$(call world/kconfig, KERNEL, $(subst kernel_,,$@)) - -# vim: syntax=make diff --git a/configs/platform-mipsel/rules/kernel.noexec.make b/configs/platform-mipsel/rules/kernel.noexec.make new file mode 100644 index 000000000000..df74af2c5b3d --- /dev/null +++ b/configs/platform-mipsel/rules/kernel.noexec.make @@ -0,0 +1,2 @@ +# short-circuit the build since the recipe is only used to serve a REF_CONFIG +KERNEL_MAKE_ENV=: -- 2.39.2