[ptxdist] [PATCH] kernel: Ignore config difference when using rootfs in kernel option

[ptxdist] [PATCH] kernel: Ignore config difference when using rootfs in kernel option

[Bart vdr. Meulen]

From: "Bart vdr. Meulen" <bartvdrmeulen@gmail.com>

When using a rootfs inside the kernel the config option CONFIG_INITRAMFS_SOURCE
is changed build time, ignore this when checking for differences
after running oldconfig.

This prevents a make failure when the source kernel.config is read-only,
preventing the copy back action that normally takes place when a
difference is detected.

Signed-off-by: Bart vdr. Meulen <bartvdrmeulen@gmail.com>
---
 rules/kernel.make |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/rules/kernel.make b/rules/kernel.make
index 4a45a3f..e1e3a6a 100644
--- a/rules/kernel.make
+++ b/rules/kernel.make
@@ -111,16 +111,19 @@ ifdef KERNEL_INITRAMFS_SOURCE_y
 endif
 
 	@$(call ptx/oldconfig, KERNEL)
-	@diff -q -I "# [^C]" "$(KERNEL_DIR)/.config" "$(<)" > /dev/null || cp "$(KERNEL_DIR)/.config" "$(<)"
-
 #
+# CONFIG_INITRAMFS_SOURCE has been changed in .config, ignore when taking diff.
 # Don't keep the expanded path to INITRAMS_SOURCE in $(KERNEL_CONFIG),
 # because it contains local workdir path which is not relevant to
 # other developers.
 #
 ifdef KERNEL_INITRAMFS_SOURCE_y
+	@diff -q -I "# [^C]" -I "^CONFIG_INITRAMFS_SOURCE=[^C]" "$(KERNEL_DIR)/.config" "$(<)" > /dev/null || \
+		cp "$(KERNEL_DIR)/.config" "$(<)"
 	@sed -i -e 's,^CONFIG_INITRAMFS_SOURCE.*$$,CONFIG_INITRAMFS_SOURCE=\"# Automatically set by PTXDist\",g' \
 		"$(<)"
+else
+	@diff -q -I "# [^C]" "$(KERNEL_DIR)/.config" "$(<)" > /dev/null || cp "$(KERNEL_DIR)/.config" "$(<)"
 endif
 	@$(call touch)
 
-- 
1.7.9.5


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] kernel: Ignore config difference when using rootfs in kernel option

[Michael Olbrich]

On Mon, May 28, 2012 at 02:42:37PM +0200, Bart vdr. Meulen wrote:
> From: "Bart vdr. Meulen" <bartvdrmeulen@gmail.com>
> 
> When using a rootfs inside the kernel the config option CONFIG_INITRAMFS_SOURCE
> is changed build time, ignore this when checking for differences
> after running oldconfig.
> 
> This prevents a make failure when the source kernel.config is read-only,
> preventing the copy back action that normally takes place when a
> difference is detected.
> 
> Signed-off-by: Bart vdr. Meulen <bartvdrmeulen@gmail.com>
> ---
>  rules/kernel.make |    7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/kernel.make b/rules/kernel.make
> index 4a45a3f..e1e3a6a 100644
> --- a/rules/kernel.make
> +++ b/rules/kernel.make
> @@ -111,16 +111,19 @@ ifdef KERNEL_INITRAMFS_SOURCE_y
>  endif
>  
>  	@$(call ptx/oldconfig, KERNEL)
> -	@diff -q -I "# [^C]" "$(KERNEL_DIR)/.config" "$(<)" > /dev/null || cp "$(KERNEL_DIR)/.config" "$(<)"
> -
>  #
> +# CONFIG_INITRAMFS_SOURCE has been changed in .config, ignore when taking diff.
>  # Don't keep the expanded path to INITRAMS_SOURCE in $(KERNEL_CONFIG),
>  # because it contains local workdir path which is not relevant to
>  # other developers.
>  #
>  ifdef KERNEL_INITRAMFS_SOURCE_y
> +	@diff -q -I "# [^C]" -I "^CONFIG_INITRAMFS_SOURCE=[^C]" "$(KERNEL_DIR)/.config" "$(<)" > /dev/null || \
> +		cp "$(KERNEL_DIR)/.config" "$(<)"
>  	@sed -i -e 's,^CONFIG_INITRAMFS_SOURCE.*$$,CONFIG_INITRAMFS_SOURCE=\"# Automatically set by PTXDist\",g' \
>  		"$(<)"
> +else
> +	@diff -q -I "# [^C]" "$(KERNEL_DIR)/.config" "$(<)" > /dev/null || cp "$(KERNEL_DIR)/.config" "$(<)"
>  endif

This is getting rather complex. Maybe like this (untested):

	@cp "$(KERNEL_DIR)/.config" "$(KERNEL_DIR)/.config.ptx"
ifdef KERNEL_INITRAMFS_SOURCE_y
	@sed -i -e 's,^CONFIG_INITRAMFS_SOURCE.*$$,CONFIG_INITRAMFS_SOURCE=\"# Automatically set by PTXDist\",g' \
		"$(KERNEL_DIR)/.config.ptx"
endif
	@diff -q -I "# [^C]" "$(KERNEL_DIR)/.config.ptx" "$(<)" > /dev/null || cp "$(KERNEL_DIR)/.config.ptx" "$(<)"


Michael

>  	@$(call touch)
>  
> -- 
> 1.7.9.5
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de