[PATCH 1/2] kbuild: allow overriding mkimage

mail archive of the barebox mailing list
 help / color / mirror / Atom feed

* [PATCH 1/2] kbuild: allow overriding mkimage
@ 2025-01-16 14:09 Ahmad Fatoum
  2025-01-16 14:09 ` [PATCH 2/2] kbuild: allow overriding compression tools Ahmad Fatoum
  2025-01-21  8:59 ` [PATCH 1/2] kbuild: allow overriding mkimage Sascha Hauer
  0 siblings, 2 replies; 7+ messages in thread
From: Ahmad Fatoum @ 2025-01-16 14:09 UTC (permalink / raw)
  To: barebox; +Cc: Ahmad Fatoum

mkimage is not built as part of barebox and the barebox build for the
BeaglePlay assumes it's in PATH. To make integration in build systems
easier, let's allow specifying the location of the mkimage binary via
the MKIMAGE variable.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 Makefile        | 3 ++-
 images/Makefile | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 3de35d3a34cc..3487aba201b9 100644
--- a/Makefile
+++ b/Makefile
@@ -438,6 +438,7 @@ KALLSYMS	= scripts/kallsyms
 PERL		= perl
 PYTHON3		= python3
 CHECK		= sparse
+MKIMAGE		= mkimage
 BASH		= bash
 
 CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -Wbitwise $(CF)
@@ -500,7 +501,7 @@ LDFLAGS_elf += $(LDFLAGS_common) --nmagic -s
 export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC
 export CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL PYTHON3 UTS_MACHINE
 export LEX YACC
-export HOSTCXX CHECK CHECKFLAGS
+export HOSTCXX CHECK CHECKFLAGS MKIMAGE
 export KBUILD_HOSTCXXFLAGS KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS LDFLAGS_MODULE
 export KBUILD_USERCFLAGS KBUILD_USERLDFLAGS
 
diff --git a/images/Makefile b/images/Makefile
index 4e5cb693e40a..6daaee8b7c7e 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -117,7 +117,7 @@ $(obj)/%.s: $(obj)/% FORCE
 quiet_cmd_itb = FIT.ITS $@
 cmd_itb = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) \
 	-D'$(subst -,_,$(*F))_dts=1' $(foreach f,$< $(2),-include '$(f)') /dev/null ; \
-	mkimage -f $(dtc-tmp) $@ -E \
+	$(MKIMAGE) -f $(dtc-tmp) $@ -E \
 	cat $(depfile).pre $(depfile).dtc > $(depfile)
 
 $(obj)/%.itb: $(obj)/%.its FORCE
-- 
2.39.5




^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 2/2] kbuild: allow overriding compression tools
  2025-01-16 14:09 [PATCH 1/2] kbuild: allow overriding mkimage Ahmad Fatoum
@ 2025-01-16 14:09 ` Ahmad Fatoum
  2025-01-21  8:20   ` Sascha Hauer
  2025-01-21  9:38   ` Sascha Hauer
  2025-01-21  8:59 ` [PATCH 1/2] kbuild: allow overriding mkimage Sascha Hauer
  1 sibling, 2 replies; 7+ messages in thread
From: Ahmad Fatoum @ 2025-01-16 14:09 UTC (permalink / raw)
  To: barebox; +Cc: Ahmad Fatoum

barebox proper is usually compressed and this introduces a dependency on
an outside host tool depending on the chosen compression algo.

So far, we expected the utility to be in PATH, but to allow build
systems to place it elsewhere, let's copy what Linux does and adopt a number
of Make variable that can be overridden from the outside.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 Makefile             |  6 ++++++
 scripts/Makefile.lib | 12 ++++++------
 scripts/xz_wrap.sh   |  5 +++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 3487aba201b9..81cab701230e 100644
--- a/Makefile
+++ b/Makefile
@@ -440,6 +440,12 @@ PYTHON3		= python3
 CHECK		= sparse
 MKIMAGE		= mkimage
 BASH		= bash
+KGZIP		= gzip
+KBZIP2		= bzip2
+KLZOP		= lzop
+LZMA		= lzma
+LZ4		= lz4
+XZ		= xz
 
 CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -Wbitwise $(CF)
 CFLAGS_KERNEL	=
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index f195ddb7e885..d4f202bd48bd 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -342,7 +342,7 @@ suffix_$(CONFIG_IMAGE_COMPRESSION_NONE) = comp_copy
 # ---------------------------------------------------------------------------
 
 quiet_cmd_gzip = GZIP    $@
-cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) || \
+cmd_gzip = (cat $(filter-out FORCE,$^) | $(KGZIP) -n -f -9 > $@) || \
 	(rm -f $@ ; false)
 
 %.gz: %
@@ -373,7 +373,7 @@ cmd_xzkern = (cat $(filter-out FORCE,$^) | \
 
 quiet_cmd_xzmisc = XZMISC  $@
 cmd_xzmisc = (cat $(filter-out FORCE,$^) | \
-	xz --check=crc32 --lzma2=dict=1MiB) > $@ || \
+	$(XZ) --check=crc32 --lzma2=dict=1MiB) > $@ || \
 	(rm -f $@ ; false)
 
 %.xzkern: %
@@ -482,7 +482,7 @@ printf "%08x\n" $$dec_size |						\
 
 quiet_cmd_bzip2 = BZIP2   $@
 cmd_bzip2 = (cat $(filter-out FORCE,$^) | \
-	bzip2 -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
+	$(KBZIP2) -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
 	(rm -f $@ ; false)
 
 %.bz2: %
@@ -493,7 +493,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) | \
 
 quiet_cmd_lzma = LZMA    $@
 cmd_lzma = (cat $(filter-out FORCE,$^) | \
-	lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
+	$(LZMA) -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
 	(rm -f $@ ; false)
 
 %.lzma: %
@@ -501,7 +501,7 @@ cmd_lzma = (cat $(filter-out FORCE,$^) | \
 
 quiet_cmd_lzo = LZO     $@
 cmd_lzo = (cat $(filter-out FORCE,$^) | \
-	lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
+	$(KLZOP) -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
 	(rm -f $@ ; false)
 
 %.lzo: %
@@ -512,7 +512,7 @@ cmd_lzo = (cat $(filter-out FORCE,$^) | \
 
 quiet_cmd_lz4 = LZ4     $@
 cmd_lz4 = (cat $(filter-out FORCE,$^) | \
-	lz4 -l --best stdin stdout && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
+	$(LZ4) -l --best stdin stdout && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
 	(rm -f $@ ; false)
 
 %.lz4: %
diff --git a/scripts/xz_wrap.sh b/scripts/xz_wrap.sh
index 02823bc1df18..a106b1a9e6d2 100755
--- a/scripts/xz_wrap.sh
+++ b/scripts/xz_wrap.sh
@@ -11,6 +11,7 @@
 
 BCJ=
 LZMA2OPTS=
+XZ=${XZ:-xz}
 
 case $SRCARCH in
 	x86)            BCJ=--x86 ;;
@@ -26,7 +27,7 @@ fi
 
 # clear BCJ filter if unsupported
 if [ -n "${BCJ}" ]; then
-	xz -H | grep -q -- $BCJ || BCJ=
+	$XZ -H | grep -q -- $BCJ || BCJ=
 fi
 
-exec xz --check=crc32 $BCJ --lzma2=$LZMA2OPTS,dict=32MiB
+exec $XZ --check=crc32 $BCJ --lzma2=$LZMA2OPTS,dict=32MiB
-- 
2.39.5




^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/2] kbuild: allow overriding compression tools
  2025-01-16 14:09 ` [PATCH 2/2] kbuild: allow overriding compression tools Ahmad Fatoum
@ 2025-01-21  8:20   ` Sascha Hauer
  2025-01-21  8:52     ` Ahmad Fatoum
  2025-01-21  9:38   ` Sascha Hauer
  1 sibling, 1 reply; 7+ messages in thread
From: Sascha Hauer @ 2025-01-21  8:20 UTC (permalink / raw)
  To: Ahmad Fatoum; +Cc: barebox

On Thu, Jan 16, 2025 at 03:09:24PM +0100, Ahmad Fatoum wrote:
> barebox proper is usually compressed and this introduces a dependency on
> an outside host tool depending on the chosen compression algo.
> 
> So far, we expected the utility to be in PATH, but to allow build
> systems to place it elsewhere, let's copy what Linux does and adopt a number
> of Make variable that can be overridden from the outside.

What about the recently introduced scripts/make_fit.py?

Sascha

> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  Makefile             |  6 ++++++
>  scripts/Makefile.lib | 12 ++++++------
>  scripts/xz_wrap.sh   |  5 +++--
>  3 files changed, 15 insertions(+), 8 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 3487aba201b9..81cab701230e 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -440,6 +440,12 @@ PYTHON3		= python3
>  CHECK		= sparse
>  MKIMAGE		= mkimage
>  BASH		= bash
> +KGZIP		= gzip
> +KBZIP2		= bzip2
> +KLZOP		= lzop
> +LZMA		= lzma
> +LZ4		= lz4
> +XZ		= xz
>  
>  CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -Wbitwise $(CF)
>  CFLAGS_KERNEL	=
> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
> index f195ddb7e885..d4f202bd48bd 100644
> --- a/scripts/Makefile.lib
> +++ b/scripts/Makefile.lib
> @@ -342,7 +342,7 @@ suffix_$(CONFIG_IMAGE_COMPRESSION_NONE) = comp_copy
>  # ---------------------------------------------------------------------------
>  
>  quiet_cmd_gzip = GZIP    $@
> -cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) || \
> +cmd_gzip = (cat $(filter-out FORCE,$^) | $(KGZIP) -n -f -9 > $@) || \
>  	(rm -f $@ ; false)
>  
>  %.gz: %
> @@ -373,7 +373,7 @@ cmd_xzkern = (cat $(filter-out FORCE,$^) | \
>  
>  quiet_cmd_xzmisc = XZMISC  $@
>  cmd_xzmisc = (cat $(filter-out FORCE,$^) | \
> -	xz --check=crc32 --lzma2=dict=1MiB) > $@ || \
> +	$(XZ) --check=crc32 --lzma2=dict=1MiB) > $@ || \
>  	(rm -f $@ ; false)
>  
>  %.xzkern: %
> @@ -482,7 +482,7 @@ printf "%08x\n" $$dec_size |						\
>  
>  quiet_cmd_bzip2 = BZIP2   $@
>  cmd_bzip2 = (cat $(filter-out FORCE,$^) | \
> -	bzip2 -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
> +	$(KBZIP2) -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
>  	(rm -f $@ ; false)
>  
>  %.bz2: %
> @@ -493,7 +493,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) | \
>  
>  quiet_cmd_lzma = LZMA    $@
>  cmd_lzma = (cat $(filter-out FORCE,$^) | \
> -	lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
> +	$(LZMA) -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
>  	(rm -f $@ ; false)
>  
>  %.lzma: %
> @@ -501,7 +501,7 @@ cmd_lzma = (cat $(filter-out FORCE,$^) | \
>  
>  quiet_cmd_lzo = LZO     $@
>  cmd_lzo = (cat $(filter-out FORCE,$^) | \
> -	lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
> +	$(KLZOP) -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
>  	(rm -f $@ ; false)
>  
>  %.lzo: %
> @@ -512,7 +512,7 @@ cmd_lzo = (cat $(filter-out FORCE,$^) | \
>  
>  quiet_cmd_lz4 = LZ4     $@
>  cmd_lz4 = (cat $(filter-out FORCE,$^) | \
> -	lz4 -l --best stdin stdout && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
> +	$(LZ4) -l --best stdin stdout && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
>  	(rm -f $@ ; false)
>  
>  %.lz4: %
> diff --git a/scripts/xz_wrap.sh b/scripts/xz_wrap.sh
> index 02823bc1df18..a106b1a9e6d2 100755
> --- a/scripts/xz_wrap.sh
> +++ b/scripts/xz_wrap.sh
> @@ -11,6 +11,7 @@
>  
>  BCJ=
>  LZMA2OPTS=
> +XZ=${XZ:-xz}
>  
>  case $SRCARCH in
>  	x86)            BCJ=--x86 ;;
> @@ -26,7 +27,7 @@ fi
>  
>  # clear BCJ filter if unsupported
>  if [ -n "${BCJ}" ]; then
> -	xz -H | grep -q -- $BCJ || BCJ=
> +	$XZ -H | grep -q -- $BCJ || BCJ=
>  fi
>  
> -exec xz --check=crc32 $BCJ --lzma2=$LZMA2OPTS,dict=32MiB
> +exec $XZ --check=crc32 $BCJ --lzma2=$LZMA2OPTS,dict=32MiB
> -- 
> 2.39.5
> 
> 
> 

-- 
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 |



^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/2] kbuild: allow overriding compression tools
  2025-01-21  8:20   ` Sascha Hauer
@ 2025-01-21  8:52     ` Ahmad Fatoum
  0 siblings, 0 replies; 7+ messages in thread
From: Ahmad Fatoum @ 2025-01-21  8:52 UTC (permalink / raw)
  To: Sascha Hauer; +Cc: barebox

On 21.01.25 09:20, Sascha Hauer wrote:
> On Thu, Jan 16, 2025 at 03:09:24PM +0100, Ahmad Fatoum wrote:
>> barebox proper is usually compressed and this introduces a dependency on
>> an outside host tool depending on the chosen compression algo.
>>
>> So far, we expected the utility to be in PATH, but to allow build
>> systems to place it elsewhere, let's copy what Linux does and adopt a number
>> of Make variable that can be overridden from the outside.
> 
> What about the recently introduced scripts/make_fit.py?

We don't use it to compress FIT images yet.

Cheers,
Ahma

> 
> Sascha
> 
>>
>> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
>> ---
>>  Makefile             |  6 ++++++
>>  scripts/Makefile.lib | 12 ++++++------
>>  scripts/xz_wrap.sh   |  5 +++--
>>  3 files changed, 15 insertions(+), 8 deletions(-)
>>
>> diff --git a/Makefile b/Makefile
>> index 3487aba201b9..81cab701230e 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -440,6 +440,12 @@ PYTHON3		= python3
>>  CHECK		= sparse
>>  MKIMAGE		= mkimage
>>  BASH		= bash
>> +KGZIP		= gzip
>> +KBZIP2		= bzip2
>> +KLZOP		= lzop
>> +LZMA		= lzma
>> +LZ4		= lz4
>> +XZ		= xz
>>  
>>  CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -Wbitwise $(CF)
>>  CFLAGS_KERNEL	=
>> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
>> index f195ddb7e885..d4f202bd48bd 100644
>> --- a/scripts/Makefile.lib
>> +++ b/scripts/Makefile.lib
>> @@ -342,7 +342,7 @@ suffix_$(CONFIG_IMAGE_COMPRESSION_NONE) = comp_copy
>>  # ---------------------------------------------------------------------------
>>  
>>  quiet_cmd_gzip = GZIP    $@
>> -cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) || \
>> +cmd_gzip = (cat $(filter-out FORCE,$^) | $(KGZIP) -n -f -9 > $@) || \
>>  	(rm -f $@ ; false)
>>  
>>  %.gz: %
>> @@ -373,7 +373,7 @@ cmd_xzkern = (cat $(filter-out FORCE,$^) | \
>>  
>>  quiet_cmd_xzmisc = XZMISC  $@
>>  cmd_xzmisc = (cat $(filter-out FORCE,$^) | \
>> -	xz --check=crc32 --lzma2=dict=1MiB) > $@ || \
>> +	$(XZ) --check=crc32 --lzma2=dict=1MiB) > $@ || \
>>  	(rm -f $@ ; false)
>>  
>>  %.xzkern: %
>> @@ -482,7 +482,7 @@ printf "%08x\n" $$dec_size |						\
>>  
>>  quiet_cmd_bzip2 = BZIP2   $@
>>  cmd_bzip2 = (cat $(filter-out FORCE,$^) | \
>> -	bzip2 -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
>> +	$(KBZIP2) -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
>>  	(rm -f $@ ; false)
>>  
>>  %.bz2: %
>> @@ -493,7 +493,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) | \
>>  
>>  quiet_cmd_lzma = LZMA    $@
>>  cmd_lzma = (cat $(filter-out FORCE,$^) | \
>> -	lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
>> +	$(LZMA) -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
>>  	(rm -f $@ ; false)
>>  
>>  %.lzma: %
>> @@ -501,7 +501,7 @@ cmd_lzma = (cat $(filter-out FORCE,$^) | \
>>  
>>  quiet_cmd_lzo = LZO     $@
>>  cmd_lzo = (cat $(filter-out FORCE,$^) | \
>> -	lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
>> +	$(KLZOP) -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
>>  	(rm -f $@ ; false)
>>  
>>  %.lzo: %
>> @@ -512,7 +512,7 @@ cmd_lzo = (cat $(filter-out FORCE,$^) | \
>>  
>>  quiet_cmd_lz4 = LZ4     $@
>>  cmd_lz4 = (cat $(filter-out FORCE,$^) | \
>> -	lz4 -l --best stdin stdout && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
>> +	$(LZ4) -l --best stdin stdout && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
>>  	(rm -f $@ ; false)
>>  
>>  %.lz4: %
>> diff --git a/scripts/xz_wrap.sh b/scripts/xz_wrap.sh
>> index 02823bc1df18..a106b1a9e6d2 100755
>> --- a/scripts/xz_wrap.sh
>> +++ b/scripts/xz_wrap.sh
>> @@ -11,6 +11,7 @@
>>  
>>  BCJ=
>>  LZMA2OPTS=
>> +XZ=${XZ:-xz}
>>  
>>  case $SRCARCH in
>>  	x86)            BCJ=--x86 ;;
>> @@ -26,7 +27,7 @@ fi
>>  
>>  # clear BCJ filter if unsupported
>>  if [ -n "${BCJ}" ]; then
>> -	xz -H | grep -q -- $BCJ || BCJ=
>> +	$XZ -H | grep -q -- $BCJ || BCJ=
>>  fi
>>  
>> -exec xz --check=crc32 $BCJ --lzma2=$LZMA2OPTS,dict=32MiB
>> +exec $XZ --check=crc32 $BCJ --lzma2=$LZMA2OPTS,dict=32MiB
>> -- 
>> 2.39.5
>>
>>
>>
> 


-- 
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 |



^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/2] kbuild: allow overriding mkimage
  2025-01-16 14:09 [PATCH 1/2] kbuild: allow overriding mkimage Ahmad Fatoum
  2025-01-16 14:09 ` [PATCH 2/2] kbuild: allow overriding compression tools Ahmad Fatoum
@ 2025-01-21  8:59 ` Sascha Hauer
  1 sibling, 0 replies; 7+ messages in thread
From: Sascha Hauer @ 2025-01-21  8:59 UTC (permalink / raw)
  To: barebox, Ahmad Fatoum


On Thu, 16 Jan 2025 15:09:23 +0100, Ahmad Fatoum wrote:
> mkimage is not built as part of barebox and the barebox build for the
> BeaglePlay assumes it's in PATH. To make integration in build systems
> easier, let's allow specifying the location of the mkimage binary via
> the MKIMAGE variable.
> 
> 

Applied, thanks!

[1/2] kbuild: allow overriding mkimage
      https://git.pengutronix.de/cgit/barebox/commit/?id=367dbec66b2c (link may not be stable)
[2/2] kbuild: allow overriding compression tools
      https://git.pengutronix.de/cgit/barebox/commit/?id=29082943c3ca (link may not be stable)

Best regards,
-- 
Sascha Hauer <s.hauer@pengutronix.de>




^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/2] kbuild: allow overriding compression tools
  2025-01-16 14:09 ` [PATCH 2/2] kbuild: allow overriding compression tools Ahmad Fatoum
  2025-01-21  8:20   ` Sascha Hauer
@ 2025-01-21  9:38   ` Sascha Hauer
  2025-01-21  9:39     ` Ahmad Fatoum
  1 sibling, 1 reply; 7+ messages in thread
From: Sascha Hauer @ 2025-01-21  9:38 UTC (permalink / raw)
  To: Ahmad Fatoum; +Cc: barebox

On Thu, Jan 16, 2025 at 03:09:24PM +0100, Ahmad Fatoum wrote:
> barebox proper is usually compressed and this introduces a dependency on
> an outside host tool depending on the chosen compression algo.
> 
> So far, we expected the utility to be in PATH, but to allow build
> systems to place it elsewhere, let's copy what Linux does and adopt a number
> of Make variable that can be overridden from the outside.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  Makefile             |  6 ++++++
>  scripts/Makefile.lib | 12 ++++++------
>  scripts/xz_wrap.sh   |  5 +++--
>  3 files changed, 15 insertions(+), 8 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 3487aba201b9..81cab701230e 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -440,6 +440,12 @@ PYTHON3		= python3
>  CHECK		= sparse
>  MKIMAGE		= mkimage
>  BASH		= bash
> +KGZIP		= gzip
> +KBZIP2		= bzip2
> +KLZOP		= lzop
> +LZMA		= lzma
> +LZ4		= lz4
> +XZ		= xz

Added missing

export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ

to make this patch work.

Sascha

-- 
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 |



^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/2] kbuild: allow overriding compression tools
  2025-01-21  9:38   ` Sascha Hauer
@ 2025-01-21  9:39     ` Ahmad Fatoum
  0 siblings, 0 replies; 7+ messages in thread
From: Ahmad Fatoum @ 2025-01-21  9:39 UTC (permalink / raw)
  To: Sascha Hauer; +Cc: barebox

On 21.01.25 10:38, Sascha Hauer wrote:
> On Thu, Jan 16, 2025 at 03:09:24PM +0100, Ahmad Fatoum wrote:
>> barebox proper is usually compressed and this introduces a dependency on
>> an outside host tool depending on the chosen compression algo.
>>
>> So far, we expected the utility to be in PATH, but to allow build
>> systems to place it elsewhere, let's copy what Linux does and adopt a number
>> of Make variable that can be overridden from the outside.
>>
>> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
>> ---
>>  Makefile             |  6 ++++++
>>  scripts/Makefile.lib | 12 ++++++------
>>  scripts/xz_wrap.sh   |  5 +++--
>>  3 files changed, 15 insertions(+), 8 deletions(-)
>>
>> diff --git a/Makefile b/Makefile
>> index 3487aba201b9..81cab701230e 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -440,6 +440,12 @@ PYTHON3		= python3
>>  CHECK		= sparse
>>  MKIMAGE		= mkimage
>>  BASH		= bash
>> +KGZIP		= gzip
>> +KBZIP2		= bzip2
>> +KLZOP		= lzop
>> +LZMA		= lzma
>> +LZ4		= lz4
>> +XZ		= xz
> 
> Added missing
> 
> export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ
> 
> to make this patch work.

Thanks..

> 
> Sascha
> 


-- 
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 |



^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2025-01-21  9:42 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-01-16 14:09 [PATCH 1/2] kbuild: allow overriding mkimage Ahmad Fatoum
2025-01-16 14:09 ` [PATCH 2/2] kbuild: allow overriding compression tools Ahmad Fatoum
2025-01-21  8:20   ` Sascha Hauer
2025-01-21  8:52     ` Ahmad Fatoum
2025-01-21  9:38   ` Sascha Hauer
2025-01-21  9:39     ` Ahmad Fatoum
2025-01-21  8:59 ` [PATCH 1/2] kbuild: allow overriding mkimage Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox