DistroKit Mailinglist
 help / color / mirror / Atom feed
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: Roland Hieber <rhi@pengutronix.de>
Cc: distrokit@pengutronix.de
Subject: Re: [DistroKit] [PATCH 7/8] mips, mipsel: don't actually compile the kernel
Date: Mon, 25 Oct 2021 09:37:35 +0200	[thread overview]
Message-ID: <20211025073735.GD29451@pengutronix.de> (raw)
In-Reply-To: <20211024194534.6704-7-rhi@pengutronix.de>

On Sun, Oct 24, 2021 at 09:45:33PM +0200, Roland Hieber wrote:
> The kernel package only exists to serve a REF_CONFIG for the extra
> kernel packages, and to compile the userspace kernel tools for debugging
> purposes. Make the actual kernel compilation and install steps a no-op
> to save time during the build process, but leave the respective lines in
> to make porting upstream patches to the kernel recipe easier in the
> future.

Why is it easier? The kernel package is completely different now. It serves
a different purpose and the lines that are commented mean that patches
won't apply either. And I don't think it's actually useful to backport
anything.

> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  configs/platform-mips/platforms/kernel.in   | 103 ++++++++++---------
>  configs/platform-mips/rules/kernel.make     | 107 +++++++++++---------
>  configs/platform-mipsel/platforms/kernel.in | 103 ++++++++++---------
>  configs/platform-mipsel/rules/kernel.make   | 107 +++++++++++---------
>  4 files changed, 222 insertions(+), 198 deletions(-)
> 
> diff --git a/configs/platform-mips/platforms/kernel.in b/configs/platform-mips/platforms/kernel.in
> index 06b6e24a6756..d84d0122ec41 100644
> --- a/configs/platform-mips/platforms/kernel.in
> +++ b/configs/platform-mips/platforms/kernel.in
> @@ -23,36 +23,39 @@ config KERNEL_XPKG
>  	  Select this symbol if kernel tools or other non kernel
>  	  modules are installed.
>  
> -config KERNEL_INSTALL
> -	bool
> -	prompt "install kernel into /boot"
> -	select KERNEL_XPKG
> -
> -config KERNEL_MODULES
> -	bool
> -	default y
> -	prompt "build kernel-modules"
> +comment "NOTE: this kernel only exists for the userspace kernel tools and a REF_CONFIG."
> +comment "The actual kernels come from the extra kernel-* packages."
> +#
> + config KERNEL_INSTALL
> +	 bool
> +# 	prompt "install kernel into /boot"

Do you need to keep the symbol? I would prefer to remove all of this
stuff.

Michael

> +# 	select KERNEL_XPKG
> +
> + config KERNEL_MODULES
> +	 bool
> +# 	default y
> +# 	prompt "build kernel-modules"
>  
>  config KERNEL_MODULES_INSTALL
>  	bool
> -	default y
> -	prompt "Install modules into /lib/modules"
> -	depends on KERNEL_MODULES
> -
> +#	default y
> +#	prompt "Install modules into /lib/modules"
> +#	depends on KERNEL_MODULES
> +#
>  config KERNEL_MODULES_SIGN
>  	bool
> -	depends on KERNEL_MODULES
> -	select KERNEL_CODE_SIGNING
> -	select KERNEL_MODULES_INSTALL
> -	prompt "sign modules"
> -	help
> -	  If enabled, kernel modules are signed during the install stage with
> -	  the key specified by the code signing provider in the "kernel-modules"
> -	  role.
> -
> -	  See the section "Kernel module signing" in the "Daily Work" chapter in
> -	  the PTXdist manual for use cases and more infos about what needs to be
> -	  enabled in the kernel config file.
> +#	depends on KERNEL_MODULES
> +#	select KERNEL_CODE_SIGNING
> +#	select KERNEL_MODULES_INSTALL
> +#	prompt "sign modules"
> +#	help
> +#	  If enabled, kernel modules are signed during the install stage with
> +#	  the key specified by the code signing provider in the "kernel-modules"
> +#	  role.
> +#
> +#	  See the section "Kernel module signing" in the "Daily Work" chapter in
> +#	  the PTXdist manual for use cases and more infos about what needs to be
> +#	  enabled in the kernel config file.
>  
>  config KERNEL_VERSION
>  	prompt "kernel version"
> @@ -174,31 +177,31 @@ config KERNEL_IMAGE
>  	default "Image"		if KERNEL_IMAGE_RAW
>  	default "simpleImage.${PTXCONF_KERNEL_IMAGE_SIMPLE_TARGET}.elf" if KERNEL_IMAGE_SIMPLE
>  
> -menuconfig KERNEL_DTB
> -	bool
> -	prompt "Build device trees            "
> -
> -if KERNEL_DTB
> -
> -config KERNEL_DTS_PATH
> -	string "path to source dts file"
> -	default "${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts"
> -	help
> -	  Define path to the dts source file. Multiple directories can be
> -	  specified separated by ':'. A relative path will be expanded relative
> -	  to the workspace and all other layers. Only on of the specified paths
> -	  can be a relative path.
> -
> -config KERNEL_DTS
> -	string "source dts file"
> -	default "<yourboard>.dts"
> -	help
> -	  Select the dts file to use for the device tree binary
> -	  blob generation. For relative file names KERNEL_DTS_PATH
> -	  is used as a search path for the device tree files specified
> -	  here. Multiple dts files can be specified, separated by spaces.
> -
> -endif
> +#menuconfig KERNEL_DTB
> +#	bool
> +#	prompt "Build device trees            "
> +#
> +#if KERNEL_DTB
> +#
> +#config KERNEL_DTS_PATH
> +#	string "path to source dts file"
> +#	default "${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts"
> +#	help
> +#	  Define path to the dts source file. Multiple directories can be
> +#	  specified separated by ':'. A relative path will be expanded relative
> +#	  to the workspace and all other layers. Only on of the specified paths
> +#	  can be a relative path.
> +#
> +#config KERNEL_DTS
> +#	string "source dts file"
> +#	default "<yourboard>.dts"
> +#	help
> +#	  Select the dts file to use for the device tree binary
> +#	  blob generation. For relative file names KERNEL_DTS_PATH
> +#	  is used as a search path for the device tree files specified
> +#	  here. Multiple dts files can be specified, separated by spaces.
> +#
> +#endif
>  
>  config KERNEL_CODE_SIGNING
>  	prompt "use code signing infrastructure"
> diff --git a/configs/platform-mips/rules/kernel.make b/configs/platform-mips/rules/kernel.make
> index 9caff677918e..d422ecf1030b 100644
> --- a/configs/platform-mips/rules/kernel.make
> +++ b/configs/platform-mips/rules/kernel.make
> @@ -235,10 +235,12 @@ KERNEL_TOOL_IIO_OPTS	:= \
>  
>  $(STATEDIR)/kernel.compile:
>  	@$(call targetinfo)
> -	@rm -f \
> -		$(KERNEL_BUILD_DIR)/usr/initramfs_data.cpio.* \
> -		$(KERNEL_BUILD_DIR)/usr/.initramfs_data.cpio.*
> -	@$(call world/compile, KERNEL)
> +# NOTE: this kernel only exists for the userspace kernel tools and a REF_CONFIG.
> +# The actual kernels come from the extra kernel-* packages.
> +#	@rm -f \
> +#		$(KERNEL_BUILD_DIR)/usr/initramfs_data.cpio.* \
> +#		$(KERNEL_BUILD_DIR)/usr/.initramfs_data.cpio.*
> +#	@$(call world/compile, KERNEL)
>  ifdef PTXCONF_KERNEL_TOOL_PERF
>  	@mkdir -p $(KERNEL_BUILD_DIR)/tools/perf
>  	@$(call compile, KERNEL, $(KERNEL_TOOL_PERF_OPTS))
> @@ -260,10 +262,12 @@ KERNEL_INSTALL_OPT = \
>  
>  $(STATEDIR)/kernel.install:
>  	@$(call targetinfo)
> -ifdef PTXCONF_KERNEL_MODULES_INSTALL
> -	@$(call world/install, KERNEL)
> -endif
> -	@$(call world/dtb, KERNEL)
> +# NOTE: this kernel only exists for the userspace kernel tools and a REF_CONFIG.
> +# The actual kernels come from the extra kernel-* packages.
> +#ifdef PTXCONF_KERNEL_MODULES_INSTALL
> +#	@$(call world/install, KERNEL)
> +#endif
> +#	@$(call world/dtb, KERNEL)
>  	@$(call touch)
>  
>  # ----------------------------------------------------------------------------
> @@ -272,11 +276,13 @@ endif
>  
>  $(STATEDIR)/kernel.targetinstall:
>  	@$(call targetinfo)
> -
> -	@$(foreach dtb, $(KERNEL_DTB_FILES), \
> -		echo -e "Installing $(dtb) ...\n"$(ptx/nl) \
> -		install -D -m0644 $(KERNEL_PKGDIR)/boot/$(dtb) \
> -			$(IMAGEDIR)/$(dtb)$(ptx/nl))
> +# NOTE: this kernel only exists for the userspace kernel tools and a REF_CONFIG.
> +# The actual kernels come from the extra kernel-* packages.
> +#
> +#	@$(foreach dtb, $(KERNEL_DTB_FILES), \
> +#		echo -e "Installing $(dtb) ...\n"$(ptx/nl) \
> +#		install -D -m0644 $(KERNEL_PKGDIR)/boot/$(dtb) \
> +#			$(IMAGEDIR)/$(dtb)$(ptx/nl))
>  
>  ifdef PTXCONF_KERNEL_XPKG
>  	@$(call install_init,  kernel)
> @@ -285,20 +291,20 @@ ifdef PTXCONF_KERNEL_XPKG
>  	@$(call install_fixup, kernel, AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
>  	@$(call install_fixup, kernel, DESCRIPTION,missing)
>  
> -	@$(call install_copy, kernel, 0, 0, 0755, /boot);
> -
> -ifdef PTXCONF_KERNEL_INSTALL
> -	@$(call install_copy, kernel, 0, 0, 0644, $(KERNEL_IMAGE_PATH_y), /boot/$(KERNEL_IMAGE), n)
> -
> -	@$(foreach dtb, $(KERNEL_DTB_FILES), \
> -		$(call install_copy, kernel, 0, 0, 0644, -, \
> -			/boot/$(dtb), n)$(ptx/nl))
> -endif
> +#	@$(call install_copy, kernel, 0, 0, 0755, /boot);
> +#
> +#ifdef PTXCONF_KERNEL_INSTALL
> +#	@$(call install_copy, kernel, 0, 0, 0644, $(KERNEL_IMAGE_PATH_y), /boot/$(KERNEL_IMAGE), n)
> +#
> +#	@$(foreach dtb, $(KERNEL_DTB_FILES), \
> +#		$(call install_copy, kernel, 0, 0, 0644, -, \
> +#			/boot/$(dtb), n)$(ptx/nl))
> +#endif
>  
>  # install the ELF kernel image for debugging purpose
> -ifdef PTXCONF_KERNEL_VMLINUX
> -	@$(call install_copy, kernel, 0, 0, 0644, $(KERNEL_BUILD_DIR)/vmlinux, /boot/vmlinux, n)
> -endif
> +#ifdef PTXCONF_KERNEL_VMLINUX
> +#	@$(call install_copy, kernel, 0, 0, 0644, $(KERNEL_BUILD_DIR)/vmlinux, /boot/vmlinux, n)
> +#endif
>  
>  ifdef PTXCONF_KERNEL_TOOL_PERF
>  	@$(call install_copy, kernel, 0, 0, 0755, $(KERNEL_BUILD_DIR)/tools/perf/perf, \
> @@ -324,30 +330,33 @@ endif
>  # Target-Install-post
>  # ----------------------------------------------------------------------------
>  
> -ifdef PTXCONF_IMAGE_KERNEL_INSTALL_EARLY
> -$(STATEDIR)/kernel.targetinstall.post: $(IMAGEDIR)/linuximage
> -ifdef PTXCONF_IMAGE_KERNEL_LZOP
> -$(STATEDIR)/kernel.targetinstall.post: $(IMAGEDIR)/linuximage.lzo
> -endif
> -endif
> -
> -$(STATEDIR)/kernel.targetinstall.post:
> -	@$(call targetinfo)
> -
> -ifdef PTXCONF_KERNEL_MODULES_INSTALL
> -	@$(call install_init,  kernel-modules)
> -	@$(call install_fixup, kernel-modules, PRIORITY,optional)
> -	@$(call install_fixup, kernel-modules, SECTION,base)
> -	@$(call install_fixup, kernel-modules, AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
> -	@$(call install_fixup, kernel-modules, DESCRIPTION,missing)
> -
> -	@$(call install_glob, kernel-modules, 0, 0, -, /lib/modules, *.ko,, n)
> -	@$(call install_glob, kernel-modules, 0, 0, -, /lib/modules,, *.ko */build */source, n)
> -
> -	@$(call install_finish, kernel-modules)
> -endif
> -
> -	@$(call touch)
> +# NOTE: this kernel only exists for the userspace kernel tools and a REF_CONFIG.
> +# The actual kernels come from the extra kernel-* packages.
> +#
> +#ifdef PTXCONF_IMAGE_KERNEL_INSTALL_EARLY
> +#$(STATEDIR)/kernel.targetinstall.post: $(IMAGEDIR)/linuximage
> +#ifdef PTXCONF_IMAGE_KERNEL_LZOP
> +#$(STATEDIR)/kernel.targetinstall.post: $(IMAGEDIR)/linuximage.lzo
> +#endif
> +#endif
> +#
> +#$(STATEDIR)/kernel.targetinstall.post:
> +#	@$(call targetinfo)
> +#
> +#ifdef PTXCONF_KERNEL_MODULES_INSTALL
> +#	@$(call install_init,  kernel-modules)
> +#	@$(call install_fixup, kernel-modules, PRIORITY,optional)
> +#	@$(call install_fixup, kernel-modules, SECTION,base)
> +#	@$(call install_fixup, kernel-modules, AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
> +#	@$(call install_fixup, kernel-modules, DESCRIPTION,missing)
> +#
> +#	@$(call install_glob, kernel-modules, 0, 0, -, /lib/modules, *.ko,, n)
> +#	@$(call install_glob, kernel-modules, 0, 0, -, /lib/modules,, *.ko */build */source, n)
> +#
> +#	@$(call install_finish, kernel-modules)
> +#endif
> +#
> +#	@$(call touch)
>  
>  # ----------------------------------------------------------------------------
>  # Clean
> diff --git a/configs/platform-mipsel/platforms/kernel.in b/configs/platform-mipsel/platforms/kernel.in
> index 06b6e24a6756..d84d0122ec41 100644
> --- a/configs/platform-mipsel/platforms/kernel.in
> +++ b/configs/platform-mipsel/platforms/kernel.in
> @@ -23,36 +23,39 @@ config KERNEL_XPKG
>  	  Select this symbol if kernel tools or other non kernel
>  	  modules are installed.
>  
> -config KERNEL_INSTALL
> -	bool
> -	prompt "install kernel into /boot"
> -	select KERNEL_XPKG
> -
> -config KERNEL_MODULES
> -	bool
> -	default y
> -	prompt "build kernel-modules"
> +comment "NOTE: this kernel only exists for the userspace kernel tools and a REF_CONFIG."
> +comment "The actual kernels come from the extra kernel-* packages."
> +#
> + config KERNEL_INSTALL
> +	 bool
> +# 	prompt "install kernel into /boot"
> +# 	select KERNEL_XPKG
> +
> + config KERNEL_MODULES
> +	 bool
> +# 	default y
> +# 	prompt "build kernel-modules"
>  
>  config KERNEL_MODULES_INSTALL
>  	bool
> -	default y
> -	prompt "Install modules into /lib/modules"
> -	depends on KERNEL_MODULES
> -
> +#	default y
> +#	prompt "Install modules into /lib/modules"
> +#	depends on KERNEL_MODULES
> +#
>  config KERNEL_MODULES_SIGN
>  	bool
> -	depends on KERNEL_MODULES
> -	select KERNEL_CODE_SIGNING
> -	select KERNEL_MODULES_INSTALL
> -	prompt "sign modules"
> -	help
> -	  If enabled, kernel modules are signed during the install stage with
> -	  the key specified by the code signing provider in the "kernel-modules"
> -	  role.
> -
> -	  See the section "Kernel module signing" in the "Daily Work" chapter in
> -	  the PTXdist manual for use cases and more infos about what needs to be
> -	  enabled in the kernel config file.
> +#	depends on KERNEL_MODULES
> +#	select KERNEL_CODE_SIGNING
> +#	select KERNEL_MODULES_INSTALL
> +#	prompt "sign modules"
> +#	help
> +#	  If enabled, kernel modules are signed during the install stage with
> +#	  the key specified by the code signing provider in the "kernel-modules"
> +#	  role.
> +#
> +#	  See the section "Kernel module signing" in the "Daily Work" chapter in
> +#	  the PTXdist manual for use cases and more infos about what needs to be
> +#	  enabled in the kernel config file.
>  
>  config KERNEL_VERSION
>  	prompt "kernel version"
> @@ -174,31 +177,31 @@ config KERNEL_IMAGE
>  	default "Image"		if KERNEL_IMAGE_RAW
>  	default "simpleImage.${PTXCONF_KERNEL_IMAGE_SIMPLE_TARGET}.elf" if KERNEL_IMAGE_SIMPLE
>  
> -menuconfig KERNEL_DTB
> -	bool
> -	prompt "Build device trees            "
> -
> -if KERNEL_DTB
> -
> -config KERNEL_DTS_PATH
> -	string "path to source dts file"
> -	default "${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts"
> -	help
> -	  Define path to the dts source file. Multiple directories can be
> -	  specified separated by ':'. A relative path will be expanded relative
> -	  to the workspace and all other layers. Only on of the specified paths
> -	  can be a relative path.
> -
> -config KERNEL_DTS
> -	string "source dts file"
> -	default "<yourboard>.dts"
> -	help
> -	  Select the dts file to use for the device tree binary
> -	  blob generation. For relative file names KERNEL_DTS_PATH
> -	  is used as a search path for the device tree files specified
> -	  here. Multiple dts files can be specified, separated by spaces.
> -
> -endif
> +#menuconfig KERNEL_DTB
> +#	bool
> +#	prompt "Build device trees            "
> +#
> +#if KERNEL_DTB
> +#
> +#config KERNEL_DTS_PATH
> +#	string "path to source dts file"
> +#	default "${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts"
> +#	help
> +#	  Define path to the dts source file. Multiple directories can be
> +#	  specified separated by ':'. A relative path will be expanded relative
> +#	  to the workspace and all other layers. Only on of the specified paths
> +#	  can be a relative path.
> +#
> +#config KERNEL_DTS
> +#	string "source dts file"
> +#	default "<yourboard>.dts"
> +#	help
> +#	  Select the dts file to use for the device tree binary
> +#	  blob generation. For relative file names KERNEL_DTS_PATH
> +#	  is used as a search path for the device tree files specified
> +#	  here. Multiple dts files can be specified, separated by spaces.
> +#
> +#endif
>  
>  config KERNEL_CODE_SIGNING
>  	prompt "use code signing infrastructure"
> diff --git a/configs/platform-mipsel/rules/kernel.make b/configs/platform-mipsel/rules/kernel.make
> index 9caff677918e..d422ecf1030b 100644
> --- a/configs/platform-mipsel/rules/kernel.make
> +++ b/configs/platform-mipsel/rules/kernel.make
> @@ -235,10 +235,12 @@ KERNEL_TOOL_IIO_OPTS	:= \
>  
>  $(STATEDIR)/kernel.compile:
>  	@$(call targetinfo)
> -	@rm -f \
> -		$(KERNEL_BUILD_DIR)/usr/initramfs_data.cpio.* \
> -		$(KERNEL_BUILD_DIR)/usr/.initramfs_data.cpio.*
> -	@$(call world/compile, KERNEL)
> +# NOTE: this kernel only exists for the userspace kernel tools and a REF_CONFIG.
> +# The actual kernels come from the extra kernel-* packages.
> +#	@rm -f \
> +#		$(KERNEL_BUILD_DIR)/usr/initramfs_data.cpio.* \
> +#		$(KERNEL_BUILD_DIR)/usr/.initramfs_data.cpio.*
> +#	@$(call world/compile, KERNEL)
>  ifdef PTXCONF_KERNEL_TOOL_PERF
>  	@mkdir -p $(KERNEL_BUILD_DIR)/tools/perf
>  	@$(call compile, KERNEL, $(KERNEL_TOOL_PERF_OPTS))
> @@ -260,10 +262,12 @@ KERNEL_INSTALL_OPT = \
>  
>  $(STATEDIR)/kernel.install:
>  	@$(call targetinfo)
> -ifdef PTXCONF_KERNEL_MODULES_INSTALL
> -	@$(call world/install, KERNEL)
> -endif
> -	@$(call world/dtb, KERNEL)
> +# NOTE: this kernel only exists for the userspace kernel tools and a REF_CONFIG.
> +# The actual kernels come from the extra kernel-* packages.
> +#ifdef PTXCONF_KERNEL_MODULES_INSTALL
> +#	@$(call world/install, KERNEL)
> +#endif
> +#	@$(call world/dtb, KERNEL)
>  	@$(call touch)
>  
>  # ----------------------------------------------------------------------------
> @@ -272,11 +276,13 @@ endif
>  
>  $(STATEDIR)/kernel.targetinstall:
>  	@$(call targetinfo)
> -
> -	@$(foreach dtb, $(KERNEL_DTB_FILES), \
> -		echo -e "Installing $(dtb) ...\n"$(ptx/nl) \
> -		install -D -m0644 $(KERNEL_PKGDIR)/boot/$(dtb) \
> -			$(IMAGEDIR)/$(dtb)$(ptx/nl))
> +# NOTE: this kernel only exists for the userspace kernel tools and a REF_CONFIG.
> +# The actual kernels come from the extra kernel-* packages.
> +#
> +#	@$(foreach dtb, $(KERNEL_DTB_FILES), \
> +#		echo -e "Installing $(dtb) ...\n"$(ptx/nl) \
> +#		install -D -m0644 $(KERNEL_PKGDIR)/boot/$(dtb) \
> +#			$(IMAGEDIR)/$(dtb)$(ptx/nl))
>  
>  ifdef PTXCONF_KERNEL_XPKG
>  	@$(call install_init,  kernel)
> @@ -285,20 +291,20 @@ ifdef PTXCONF_KERNEL_XPKG
>  	@$(call install_fixup, kernel, AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
>  	@$(call install_fixup, kernel, DESCRIPTION,missing)
>  
> -	@$(call install_copy, kernel, 0, 0, 0755, /boot);
> -
> -ifdef PTXCONF_KERNEL_INSTALL
> -	@$(call install_copy, kernel, 0, 0, 0644, $(KERNEL_IMAGE_PATH_y), /boot/$(KERNEL_IMAGE), n)
> -
> -	@$(foreach dtb, $(KERNEL_DTB_FILES), \
> -		$(call install_copy, kernel, 0, 0, 0644, -, \
> -			/boot/$(dtb), n)$(ptx/nl))
> -endif
> +#	@$(call install_copy, kernel, 0, 0, 0755, /boot);
> +#
> +#ifdef PTXCONF_KERNEL_INSTALL
> +#	@$(call install_copy, kernel, 0, 0, 0644, $(KERNEL_IMAGE_PATH_y), /boot/$(KERNEL_IMAGE), n)
> +#
> +#	@$(foreach dtb, $(KERNEL_DTB_FILES), \
> +#		$(call install_copy, kernel, 0, 0, 0644, -, \
> +#			/boot/$(dtb), n)$(ptx/nl))
> +#endif
>  
>  # install the ELF kernel image for debugging purpose
> -ifdef PTXCONF_KERNEL_VMLINUX
> -	@$(call install_copy, kernel, 0, 0, 0644, $(KERNEL_BUILD_DIR)/vmlinux, /boot/vmlinux, n)
> -endif
> +#ifdef PTXCONF_KERNEL_VMLINUX
> +#	@$(call install_copy, kernel, 0, 0, 0644, $(KERNEL_BUILD_DIR)/vmlinux, /boot/vmlinux, n)
> +#endif
>  
>  ifdef PTXCONF_KERNEL_TOOL_PERF
>  	@$(call install_copy, kernel, 0, 0, 0755, $(KERNEL_BUILD_DIR)/tools/perf/perf, \
> @@ -324,30 +330,33 @@ endif
>  # Target-Install-post
>  # ----------------------------------------------------------------------------
>  
> -ifdef PTXCONF_IMAGE_KERNEL_INSTALL_EARLY
> -$(STATEDIR)/kernel.targetinstall.post: $(IMAGEDIR)/linuximage
> -ifdef PTXCONF_IMAGE_KERNEL_LZOP
> -$(STATEDIR)/kernel.targetinstall.post: $(IMAGEDIR)/linuximage.lzo
> -endif
> -endif
> -
> -$(STATEDIR)/kernel.targetinstall.post:
> -	@$(call targetinfo)
> -
> -ifdef PTXCONF_KERNEL_MODULES_INSTALL
> -	@$(call install_init,  kernel-modules)
> -	@$(call install_fixup, kernel-modules, PRIORITY,optional)
> -	@$(call install_fixup, kernel-modules, SECTION,base)
> -	@$(call install_fixup, kernel-modules, AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
> -	@$(call install_fixup, kernel-modules, DESCRIPTION,missing)
> -
> -	@$(call install_glob, kernel-modules, 0, 0, -, /lib/modules, *.ko,, n)
> -	@$(call install_glob, kernel-modules, 0, 0, -, /lib/modules,, *.ko */build */source, n)
> -
> -	@$(call install_finish, kernel-modules)
> -endif
> -
> -	@$(call touch)
> +# NOTE: this kernel only exists for the userspace kernel tools and a REF_CONFIG.
> +# The actual kernels come from the extra kernel-* packages.
> +#
> +#ifdef PTXCONF_IMAGE_KERNEL_INSTALL_EARLY
> +#$(STATEDIR)/kernel.targetinstall.post: $(IMAGEDIR)/linuximage
> +#ifdef PTXCONF_IMAGE_KERNEL_LZOP
> +#$(STATEDIR)/kernel.targetinstall.post: $(IMAGEDIR)/linuximage.lzo
> +#endif
> +#endif
> +#
> +#$(STATEDIR)/kernel.targetinstall.post:
> +#	@$(call targetinfo)
> +#
> +#ifdef PTXCONF_KERNEL_MODULES_INSTALL
> +#	@$(call install_init,  kernel-modules)
> +#	@$(call install_fixup, kernel-modules, PRIORITY,optional)
> +#	@$(call install_fixup, kernel-modules, SECTION,base)
> +#	@$(call install_fixup, kernel-modules, AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
> +#	@$(call install_fixup, kernel-modules, DESCRIPTION,missing)
> +#
> +#	@$(call install_glob, kernel-modules, 0, 0, -, /lib/modules, *.ko,, n)
> +#	@$(call install_glob, kernel-modules, 0, 0, -, /lib/modules,, *.ko */build */source, n)
> +#
> +#	@$(call install_finish, kernel-modules)
> +#endif
> +#
> +#	@$(call touch)
>  
>  # ----------------------------------------------------------------------------
>  # Clean
> -- 
> 2.30.2
> 
> 
> _______________________________________________
> DistroKit mailing list
> DistroKit@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de


  reply	other threads:[~2021-10-25  7:37 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-24 19:45 [DistroKit] [PATCH 1/8] mips, mipsel: kernel-*: bring back KERNEL_*_PATH Roland Hieber
2021-10-24 19:45 ` [DistroKit] [PATCH 2/8] mips, mipsel: kernel-*: bring up-to-date with PTXdist 2021.07.0 template Roland Hieber
2021-10-24 19:45 ` [DistroKit] [PATCH 3/8] mips, mipsel: kernel-*: rework device-tree handling Roland Hieber
2021-10-24 19:45 ` [DistroKit] [PATCH 4/8] mips, mipsel: kernel-*: use ptx/config-version and ptx/config-md5 Roland Hieber
2021-10-24 19:45 ` [DistroKit] [PATCH 5/8] ptxdist: migrate 2021.06.0 -> 2021.10.0 Roland Hieber
2021-10-24 19:45 ` [DistroKit] [PATCH 6/8] mips, mipsel: kernel: re-fork from PTXdist 2021.10.0 Roland Hieber
2021-10-24 19:54   ` [DistroKit] [PATCH v2 " Roland Hieber
2021-10-24 19:45 ` [DistroKit] [PATCH 7/8] mips, mipsel: don't actually compile the kernel Roland Hieber
2021-10-25  7:37   ` Michael Olbrich [this message]
2021-11-24 14:53     ` Robert Schwebel
2021-11-25 11:42       ` Roland Hieber
2021-10-24 19:45 ` [DistroKit] [PATCH 8/8] mips, mipsel: update kernel configs Roland Hieber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211025073735.GD29451@pengutronix.de \
    --to=m.olbrich@pengutronix.de \
    --cc=distrokit@pengutronix.de \
    --cc=rhi@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox