* [PATCH v2] squashfs-tools: Allow COMP_DEFAULT to be changed easily at build time
@ 2020-09-11 17:21 Peter Morrow
2020-09-11 17:33 ` [OE-core] " Andre McCurdy
0 siblings, 1 reply; 7+ messages in thread
From: Peter Morrow @ 2020-09-11 17:21 UTC (permalink / raw)
To: openembedded-core
The default compression algorithm is gzip, this patch allows the default
to be changed via a bbappend file by setting SQUASHFS_TOOLS_COMP_DEFAULT
to a valid compression algorithm.
Signed-off-by: Peter Morrow <pemorrow@linux.microsoft.com>
---
...ols-Allow-COMP_DEFAULT-to-be-overridden-v.patch | 34 ++++++++++++++++++++++
.../squashfs-tools/squashfs-tools_git.bb | 4 +++
2 files changed, 38 insertions(+)
create mode 100644 meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch
diff --git a/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch b/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch
new file mode 100644
index 0000000..5f12c42
--- /dev/null
+++ b/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch
@@ -0,0 +1,34 @@
+From d2d9b517696f5950597f5b60ae8fdade5b7c14a9 Mon Sep 17 00:00:00 2001
+From: Peter Morrow <pemorrow@linux.microsoft.com>
+Date: Fri, 4 Sep 2020 15:43:15 +0100
+Subject: [PATCH] squashfs-tools: Allow COMP_DEFAULT to be overridden via make
+ cmdline
+
+Currently the only way to modify the default compression algorithm is to
+modify the Makefile. It is useful to be able to set the default compression
+algorithm via the make command line since otherwise a build time search
+replace operation needs to be performed on the Makefile.
+
+Upstream-Status: Submitted [https://github.com/plougher/squashfs-tools/pull/93 ]
+
+Signed-off-by: Peter Morrow <pemorrow@linux.microsoft.com>
+---
+ squashfs-tools/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/squashfs-tools/Makefile b/squashfs-tools/Makefile
+index aee4b96..7425605 100644
+--- a/squashfs-tools/Makefile
++++ b/squashfs-tools/Makefile
+@@ -85,7 +85,7 @@ GZIP_SUPPORT = 1
+ # in Mksquashfs. Obviously the compression algorithm must have been
+ # selected to be built
+ #
+-COMP_DEFAULT = gzip
++COMP_DEFAULT ?= gzip
+
+
+ ###############################################
+--
+2.20.1
+
diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
index b06951d..df025d4 100644
--- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
+++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
@@ -9,6 +9,7 @@ PV = "4.4"
SRCREV = "52eb4c279cd283ed9802dd1ceb686560b22ffb67"
SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \
file://0001-squashfs-tools-fix-build-failure-against-gcc-10.patch;striplevel=2 \
+ file://0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch;striplevel=2 \
"
S = "${WORKDIR}/git/squashfs-tools"
@@ -25,6 +26,9 @@ PACKAGECONFIG[xattr] = "XATTR_SUPPORT=1,XATTR_SUPPORT=0,attr"
PACKAGECONFIG[zstd] = "ZSTD_SUPPORT=1,ZSTD_SUPPORT=0,zstd"
PACKAGECONFIG[reproducible] = "REPRODUCIBLE_DEFAULT=1,REPRODUCIBLE_DEFAULT=0,"
+SQUASHFS_TOOLS_COMP_DEFAULT ?= "gzip"
+EXTRA_OEMAKE += "COMP_DEFAULT=${SQUASHFS_TOOLS_COMP_DEFAULT}"
+
do_compile() {
oe_runmake all
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [OE-core] [PATCH v2] squashfs-tools: Allow COMP_DEFAULT to be changed easily at build time
2020-09-11 17:21 [PATCH v2] squashfs-tools: Allow COMP_DEFAULT to be changed easily at build time Peter Morrow
@ 2020-09-11 17:33 ` Andre McCurdy
2020-09-12 5:04 ` Khem Raj
0 siblings, 1 reply; 7+ messages in thread
From: Andre McCurdy @ 2020-09-11 17:33 UTC (permalink / raw)
To: Peter Morrow; +Cc: OE Core mailing list
On Fri, Sep 11, 2020 at 10:21 AM Peter Morrow
<pemorrow@linux.microsoft.com> wrote:
>
> The default compression algorithm is gzip, this patch allows the default
> to be changed via a bbappend file by setting SQUASHFS_TOOLS_COMP_DEFAULT
> to a valid compression algorithm.
>
> Signed-off-by: Peter Morrow <pemorrow@linux.microsoft.com>
> ---
> ...ols-Allow-COMP_DEFAULT-to-be-overridden-v.patch | 34 ++++++++++++++++++++++
> .../squashfs-tools/squashfs-tools_git.bb | 4 +++
> 2 files changed, 38 insertions(+)
> create mode 100644 meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch
>
> diff --git a/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch b/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch
> new file mode 100644
> index 0000000..5f12c42
> --- /dev/null
> +++ b/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch
> @@ -0,0 +1,34 @@
> +From d2d9b517696f5950597f5b60ae8fdade5b7c14a9 Mon Sep 17 00:00:00 2001
> +From: Peter Morrow <pemorrow@linux.microsoft.com>
> +Date: Fri, 4 Sep 2020 15:43:15 +0100
> +Subject: [PATCH] squashfs-tools: Allow COMP_DEFAULT to be overridden via make
> + cmdline
> +
> +Currently the only way to modify the default compression algorithm is to
> +modify the Makefile. It is useful to be able to set the default compression
> +algorithm via the make command line since otherwise a build time search
> +replace operation needs to be performed on the Makefile.
That's not how Makefiles normally work. Options set via the command
line over-ride variables set with = in the Makefile.
Does setting your chosen value for COMP_DEFAULT on the make command
line really not work?
> +Upstream-Status: Submitted [https://github.com/plougher/squashfs-tools/pull/93 ]
> +
> +Signed-off-by: Peter Morrow <pemorrow@linux.microsoft.com>
> +---
> + squashfs-tools/Makefile | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/squashfs-tools/Makefile b/squashfs-tools/Makefile
> +index aee4b96..7425605 100644
> +--- a/squashfs-tools/Makefile
> ++++ b/squashfs-tools/Makefile
> +@@ -85,7 +85,7 @@ GZIP_SUPPORT = 1
> + # in Mksquashfs. Obviously the compression algorithm must have been
> + # selected to be built
> + #
> +-COMP_DEFAULT = gzip
> ++COMP_DEFAULT ?= gzip
> +
> +
> + ###############################################
> +--
> +2.20.1
> +
> diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
> index b06951d..df025d4 100644
> --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
> +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
> @@ -9,6 +9,7 @@ PV = "4.4"
> SRCREV = "52eb4c279cd283ed9802dd1ceb686560b22ffb67"
> SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \
> file://0001-squashfs-tools-fix-build-failure-against-gcc-10.patch;striplevel=2 \
> + file://0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch;striplevel=2 \
> "
>
> S = "${WORKDIR}/git/squashfs-tools"
> @@ -25,6 +26,9 @@ PACKAGECONFIG[xattr] = "XATTR_SUPPORT=1,XATTR_SUPPORT=0,attr"
> PACKAGECONFIG[zstd] = "ZSTD_SUPPORT=1,ZSTD_SUPPORT=0,zstd"
> PACKAGECONFIG[reproducible] = "REPRODUCIBLE_DEFAULT=1,REPRODUCIBLE_DEFAULT=0,"
>
> +SQUASHFS_TOOLS_COMP_DEFAULT ?= "gzip"
> +EXTRA_OEMAKE += "COMP_DEFAULT=${SQUASHFS_TOOLS_COMP_DEFAULT}"
Note that this will force the recipe's default value even if upstream
squashfs-tools changes. Not a problem now as the two are the same, but
something which will need to be checked each time squashfs-tools is
updated.
> do_compile() {
> oe_runmake all
> }
> --
> 1.8.3.1
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [OE-core] [PATCH v2] squashfs-tools: Allow COMP_DEFAULT to be changed easily at build time
2020-09-11 17:33 ` [OE-core] " Andre McCurdy
@ 2020-09-12 5:04 ` Khem Raj
2020-09-12 6:36 ` Andre McCurdy
2020-09-14 9:56 ` Peter Morrow
0 siblings, 2 replies; 7+ messages in thread
From: Khem Raj @ 2020-09-12 5:04 UTC (permalink / raw)
To: Andre McCurdy, Peter Morrow; +Cc: OE Core mailing list
[-- Attachment #1: Type: text/plain, Size: 4219 bytes --]
On 9/11/20 10:33 AM, Andre McCurdy wrote:
> On Fri, Sep 11, 2020 at 10:21 AM Peter Morrow
> <pemorrow@linux.microsoft.com> wrote:
>>
>> The default compression algorithm is gzip, this patch allows the default
>> to be changed via a bbappend file by setting SQUASHFS_TOOLS_COMP_DEFAULT
>> to a valid compression algorithm.
>>
>> Signed-off-by: Peter Morrow <pemorrow@linux.microsoft.com>
>> ---
>> ...ols-Allow-COMP_DEFAULT-to-be-overridden-v.patch | 34 ++++++++++++++++++++++
>> .../squashfs-tools/squashfs-tools_git.bb | 4 +++
>> 2 files changed, 38 insertions(+)
>> create mode 100644 meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch
>>
>> diff --git a/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch b/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch
>> new file mode 100644
>> index 0000000..5f12c42
>> --- /dev/null
>> +++ b/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch
>> @@ -0,0 +1,34 @@
>> +From d2d9b517696f5950597f5b60ae8fdade5b7c14a9 Mon Sep 17 00:00:00 2001
>> +From: Peter Morrow <pemorrow@linux.microsoft.com>
>> +Date: Fri, 4 Sep 2020 15:43:15 +0100
>> +Subject: [PATCH] squashfs-tools: Allow COMP_DEFAULT to be overridden via make
>> + cmdline
>> +
>> +Currently the only way to modify the default compression algorithm is to
>> +modify the Makefile. It is useful to be able to set the default compression
>> +algorithm via the make command line since otherwise a build time search
>> +replace operation needs to be performed on the Makefile.
>
> That's not how Makefiles normally work. Options set via the command
> line over-ride variables set with = in the Makefile.
>
> Does setting your chosen value for COMP_DEFAULT on the make command
> line really not work?
that works if make is invoked with -e option, We do not use make -e with
bare makefile based recipes.
>
>> +Upstream-Status: Submitted [https://github.com/plougher/squashfs-tools/pull/93 ]
>> +
>> +Signed-off-by: Peter Morrow <pemorrow@linux.microsoft.com>
>> +---
>> + squashfs-tools/Makefile | 2 +-
>> + 1 file changed, 1 insertion(+), 1 deletion(-)
>> +
>> +diff --git a/squashfs-tools/Makefile b/squashfs-tools/Makefile
>> +index aee4b96..7425605 100644
>> +--- a/squashfs-tools/Makefile
>> ++++ b/squashfs-tools/Makefile
>> +@@ -85,7 +85,7 @@ GZIP_SUPPORT = 1
>> + # in Mksquashfs. Obviously the compression algorithm must have been
>> + # selected to be built
>> + #
>> +-COMP_DEFAULT = gzip
>> ++COMP_DEFAULT ?= gzip
>> +
>> +
>> + ###############################################
>> +--
>> +2.20.1
>> +
>> diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
>> index b06951d..df025d4 100644
>> --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
>> +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
>> @@ -9,6 +9,7 @@ PV = "4.4"
>> SRCREV = "52eb4c279cd283ed9802dd1ceb686560b22ffb67"
>> SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \
>> file://0001-squashfs-tools-fix-build-failure-against-gcc-10.patch;striplevel=2 \
>> + file://0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch;striplevel=2 \
>> "
>>
>> S = "${WORKDIR}/git/squashfs-tools"
>> @@ -25,6 +26,9 @@ PACKAGECONFIG[xattr] = "XATTR_SUPPORT=1,XATTR_SUPPORT=0,attr"
>> PACKAGECONFIG[zstd] = "ZSTD_SUPPORT=1,ZSTD_SUPPORT=0,zstd"
>> PACKAGECONFIG[reproducible] = "REPRODUCIBLE_DEFAULT=1,REPRODUCIBLE_DEFAULT=0,"
>>
>> +SQUASHFS_TOOLS_COMP_DEFAULT ?= "gzip"
>> +EXTRA_OEMAKE += "COMP_DEFAULT=${SQUASHFS_TOOLS_COMP_DEFAULT}"
>
> Note that this will force the recipe's default value even if upstream
> squashfs-tools changes. Not a problem now as the two are the same, but
> something which will need to be checked each time squashfs-tools is
> updated.
>
>> do_compile() {
>> oe_runmake all
>> }
>> --
>> 1.8.3.1
>>
>>
>>
>>
[-- Attachment #2: pEpkey.asc --]
[-- Type: application/pgp-keys, Size: 2373 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [OE-core] [PATCH v2] squashfs-tools: Allow COMP_DEFAULT to be changed easily at build time
2020-09-12 5:04 ` Khem Raj
@ 2020-09-12 6:36 ` Andre McCurdy
2020-09-12 7:37 ` Khem Raj
2020-09-14 9:56 ` Peter Morrow
1 sibling, 1 reply; 7+ messages in thread
From: Andre McCurdy @ 2020-09-12 6:36 UTC (permalink / raw)
To: Khem Raj; +Cc: Peter Morrow, OE Core mailing list
On Fri, Sep 11, 2020 at 10:04 PM Khem Raj <raj.khem@gmail.com> wrote:
>
>
>
> On 9/11/20 10:33 AM, Andre McCurdy wrote:
> > On Fri, Sep 11, 2020 at 10:21 AM Peter Morrow
> > <pemorrow@linux.microsoft.com> wrote:
> >>
> >> The default compression algorithm is gzip, this patch allows the default
> >> to be changed via a bbappend file by setting SQUASHFS_TOOLS_COMP_DEFAULT
> >> to a valid compression algorithm.
> >>
> >> Signed-off-by: Peter Morrow <pemorrow@linux.microsoft.com>
> >> ---
> >> ...ols-Allow-COMP_DEFAULT-to-be-overridden-v.patch | 34 ++++++++++++++++++++++
> >> .../squashfs-tools/squashfs-tools_git.bb | 4 +++
> >> 2 files changed, 38 insertions(+)
> >> create mode 100644 meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch
> >>
> >> diff --git a/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch b/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch
> >> new file mode 100644
> >> index 0000000..5f12c42
> >> --- /dev/null
> >> +++ b/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch
> >> @@ -0,0 +1,34 @@
> >> +From d2d9b517696f5950597f5b60ae8fdade5b7c14a9 Mon Sep 17 00:00:00 2001
> >> +From: Peter Morrow <pemorrow@linux.microsoft.com>
> >> +Date: Fri, 4 Sep 2020 15:43:15 +0100
> >> +Subject: [PATCH] squashfs-tools: Allow COMP_DEFAULT to be overridden via make
> >> + cmdline
> >> +
> >> +Currently the only way to modify the default compression algorithm is to
> >> +modify the Makefile. It is useful to be able to set the default compression
> >> +algorithm via the make command line since otherwise a build time search
> >> +replace operation needs to be performed on the Makefile.
> >
> > That's not how Makefiles normally work. Options set via the command
> > line over-ride variables set with = in the Makefile.
> >
> > Does setting your chosen value for COMP_DEFAULT on the make command
> > line really not work?
>
> that works if make is invoked with -e option, We do not use make -e with
> bare makefile based recipes.
The -e option is related to environment variables. It's not relevant
for this discussion - which is about setting options via the make
command line.
> >> +Upstream-Status: Submitted [https://github.com/plougher/squashfs-tools/pull/93 ]
> >> +
> >> +Signed-off-by: Peter Morrow <pemorrow@linux.microsoft.com>
> >> +---
> >> + squashfs-tools/Makefile | 2 +-
> >> + 1 file changed, 1 insertion(+), 1 deletion(-)
> >> +
> >> +diff --git a/squashfs-tools/Makefile b/squashfs-tools/Makefile
> >> +index aee4b96..7425605 100644
> >> +--- a/squashfs-tools/Makefile
> >> ++++ b/squashfs-tools/Makefile
> >> +@@ -85,7 +85,7 @@ GZIP_SUPPORT = 1
> >> + # in Mksquashfs. Obviously the compression algorithm must have been
> >> + # selected to be built
> >> + #
> >> +-COMP_DEFAULT = gzip
> >> ++COMP_DEFAULT ?= gzip
> >> +
> >> +
> >> + ###############################################
> >> +--
> >> +2.20.1
> >> +
> >> diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
> >> index b06951d..df025d4 100644
> >> --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
> >> +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
> >> @@ -9,6 +9,7 @@ PV = "4.4"
> >> SRCREV = "52eb4c279cd283ed9802dd1ceb686560b22ffb67"
> >> SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \
> >> file://0001-squashfs-tools-fix-build-failure-against-gcc-10.patch;striplevel=2 \
> >> + file://0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch;striplevel=2 \
> >> "
> >>
> >> S = "${WORKDIR}/git/squashfs-tools"
> >> @@ -25,6 +26,9 @@ PACKAGECONFIG[xattr] = "XATTR_SUPPORT=1,XATTR_SUPPORT=0,attr"
> >> PACKAGECONFIG[zstd] = "ZSTD_SUPPORT=1,ZSTD_SUPPORT=0,zstd"
> >> PACKAGECONFIG[reproducible] = "REPRODUCIBLE_DEFAULT=1,REPRODUCIBLE_DEFAULT=0,"
> >>
> >> +SQUASHFS_TOOLS_COMP_DEFAULT ?= "gzip"
> >> +EXTRA_OEMAKE += "COMP_DEFAULT=${SQUASHFS_TOOLS_COMP_DEFAULT}"
> >
> > Note that this will force the recipe's default value even if upstream
> > squashfs-tools changes. Not a problem now as the two are the same, but
> > something which will need to be checked each time squashfs-tools is
> > updated.
> >
> >> do_compile() {
> >> oe_runmake all
> >> }
> >> --
> >> 1.8.3.1
> >>
> >>
> >>
> >>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [OE-core] [PATCH v2] squashfs-tools: Allow COMP_DEFAULT to be changed easily at build time
2020-09-12 6:36 ` Andre McCurdy
@ 2020-09-12 7:37 ` Khem Raj
2020-09-14 9:17 ` Peter Morrow
0 siblings, 1 reply; 7+ messages in thread
From: Khem Raj @ 2020-09-12 7:37 UTC (permalink / raw)
To: Andre McCurdy; +Cc: Peter Morrow, OE Core mailing list
On Fri, Sep 11, 2020 at 11:36 PM Andre McCurdy <armccurdy@gmail.com> wrote:
>
> On Fri, Sep 11, 2020 at 10:04 PM Khem Raj <raj.khem@gmail.com> wrote:
> >
> >
> >
> > On 9/11/20 10:33 AM, Andre McCurdy wrote:
> > > On Fri, Sep 11, 2020 at 10:21 AM Peter Morrow
> > > <pemorrow@linux.microsoft.com> wrote:
> > >>
> > >> The default compression algorithm is gzip, this patch allows the default
> > >> to be changed via a bbappend file by setting SQUASHFS_TOOLS_COMP_DEFAULT
> > >> to a valid compression algorithm.
> > >>
> > >> Signed-off-by: Peter Morrow <pemorrow@linux.microsoft.com>
> > >> ---
> > >> ...ols-Allow-COMP_DEFAULT-to-be-overridden-v.patch | 34 ++++++++++++++++++++++
> > >> .../squashfs-tools/squashfs-tools_git.bb | 4 +++
> > >> 2 files changed, 38 insertions(+)
> > >> create mode 100644 meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch
> > >>
> > >> diff --git a/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch b/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch
> > >> new file mode 100644
> > >> index 0000000..5f12c42
> > >> --- /dev/null
> > >> +++ b/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch
> > >> @@ -0,0 +1,34 @@
> > >> +From d2d9b517696f5950597f5b60ae8fdade5b7c14a9 Mon Sep 17 00:00:00 2001
> > >> +From: Peter Morrow <pemorrow@linux.microsoft.com>
> > >> +Date: Fri, 4 Sep 2020 15:43:15 +0100
> > >> +Subject: [PATCH] squashfs-tools: Allow COMP_DEFAULT to be overridden via make
> > >> + cmdline
> > >> +
> > >> +Currently the only way to modify the default compression algorithm is to
> > >> +modify the Makefile. It is useful to be able to set the default compression
> > >> +algorithm via the make command line since otherwise a build time search
> > >> +replace operation needs to be performed on the Makefile.
> > >
> > > That's not how Makefiles normally work. Options set via the command
> > > line over-ride variables set with = in the Makefile.
> > >
> > > Does setting your chosen value for COMP_DEFAULT on the make command
> > > line really not work?
> >
> > that works if make is invoked with -e option, We do not use make -e with
> > bare makefile based recipes.
>
> The -e option is related to environment variables. It's not relevant
> for this discussion - which is about setting options via the make
> command line.
>
I somehow oversaw the fact its being passed as make variable on
cmdline and not becoming
an export. so you are right, I think we don't need the patch perhaps
setting it via EXTRA_OEMAKE
should suffice
> > >> +Upstream-Status: Submitted [https://github.com/plougher/squashfs-tools/pull/93 ]
> > >> +
> > >> +Signed-off-by: Peter Morrow <pemorrow@linux.microsoft.com>
> > >> +---
> > >> + squashfs-tools/Makefile | 2 +-
> > >> + 1 file changed, 1 insertion(+), 1 deletion(-)
> > >> +
> > >> +diff --git a/squashfs-tools/Makefile b/squashfs-tools/Makefile
> > >> +index aee4b96..7425605 100644
> > >> +--- a/squashfs-tools/Makefile
> > >> ++++ b/squashfs-tools/Makefile
> > >> +@@ -85,7 +85,7 @@ GZIP_SUPPORT = 1
> > >> + # in Mksquashfs. Obviously the compression algorithm must have been
> > >> + # selected to be built
> > >> + #
> > >> +-COMP_DEFAULT = gzip
> > >> ++COMP_DEFAULT ?= gzip
> > >> +
> > >> +
> > >> + ###############################################
> > >> +--
> > >> +2.20.1
> > >> +
> > >> diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
> > >> index b06951d..df025d4 100644
> > >> --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
> > >> +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
> > >> @@ -9,6 +9,7 @@ PV = "4.4"
> > >> SRCREV = "52eb4c279cd283ed9802dd1ceb686560b22ffb67"
> > >> SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \
> > >> file://0001-squashfs-tools-fix-build-failure-against-gcc-10.patch;striplevel=2 \
> > >> + file://0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch;striplevel=2 \
> > >> "
> > >>
> > >> S = "${WORKDIR}/git/squashfs-tools"
> > >> @@ -25,6 +26,9 @@ PACKAGECONFIG[xattr] = "XATTR_SUPPORT=1,XATTR_SUPPORT=0,attr"
> > >> PACKAGECONFIG[zstd] = "ZSTD_SUPPORT=1,ZSTD_SUPPORT=0,zstd"
> > >> PACKAGECONFIG[reproducible] = "REPRODUCIBLE_DEFAULT=1,REPRODUCIBLE_DEFAULT=0,"
> > >>
> > >> +SQUASHFS_TOOLS_COMP_DEFAULT ?= "gzip"
> > >> +EXTRA_OEMAKE += "COMP_DEFAULT=${SQUASHFS_TOOLS_COMP_DEFAULT}"
> > >
> > > Note that this will force the recipe's default value even if upstream
> > > squashfs-tools changes. Not a problem now as the two are the same, but
> > > something which will need to be checked each time squashfs-tools is
> > > updated.
> > >
> > >> do_compile() {
> > >> oe_runmake all
> > >> }
> > >> --
> > >> 1.8.3.1
> > >>
> > >>
> > >>
> > >>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [OE-core] [PATCH v2] squashfs-tools: Allow COMP_DEFAULT to be changed easily at build time
2020-09-12 7:37 ` Khem Raj
@ 2020-09-14 9:17 ` Peter Morrow
0 siblings, 0 replies; 7+ messages in thread
From: Peter Morrow @ 2020-09-14 9:17 UTC (permalink / raw)
To: Khem Raj; +Cc: Andre McCurdy, OE Core mailing list
On Sat, Sep 12, 2020 at 12:37:28AM -0700, Khem Raj wrote:
> On Fri, Sep 11, 2020 at 11:36 PM Andre McCurdy <armccurdy@gmail.com> wrote:
> >
> > On Fri, Sep 11, 2020 at 10:04 PM Khem Raj <raj.khem@gmail.com> wrote:
> > >
> > >
> > >
> > > On 9/11/20 10:33 AM, Andre McCurdy wrote:
> > > > On Fri, Sep 11, 2020 at 10:21 AM Peter Morrow
> > > > <pemorrow@linux.microsoft.com> wrote:
> > > >>
> > > >> The default compression algorithm is gzip, this patch allows the default
> > > >> to be changed via a bbappend file by setting SQUASHFS_TOOLS_COMP_DEFAULT
> > > >> to a valid compression algorithm.
> > > >>
> > > >> Signed-off-by: Peter Morrow <pemorrow@linux.microsoft.com>
> > > >> ---
> > > >> ...ols-Allow-COMP_DEFAULT-to-be-overridden-v.patch | 34 ++++++++++++++++++++++
> > > >> .../squashfs-tools/squashfs-tools_git.bb | 4 +++
> > > >> 2 files changed, 38 insertions(+)
> > > >> create mode 100644 meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch
> > > >>
> > > >> diff --git a/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch b/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch
> > > >> new file mode 100644
> > > >> index 0000000..5f12c42
> > > >> --- /dev/null
> > > >> +++ b/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch
> > > >> @@ -0,0 +1,34 @@
> > > >> +From d2d9b517696f5950597f5b60ae8fdade5b7c14a9 Mon Sep 17 00:00:00 2001
> > > >> +From: Peter Morrow <pemorrow@linux.microsoft.com>
> > > >> +Date: Fri, 4 Sep 2020 15:43:15 +0100
> > > >> +Subject: [PATCH] squashfs-tools: Allow COMP_DEFAULT to be overridden via make
> > > >> + cmdline
> > > >> +
> > > >> +Currently the only way to modify the default compression algorithm is to
> > > >> +modify the Makefile. It is useful to be able to set the default compression
> > > >> +algorithm via the make command line since otherwise a build time search
> > > >> +replace operation needs to be performed on the Makefile.
> > > >
> > > > That's not how Makefiles normally work. Options set via the command
> > > > line over-ride variables set with = in the Makefile.
> > > >
> > > > Does setting your chosen value for COMP_DEFAULT on the make command
> > > > line really not work?
> > >
> > > that works if make is invoked with -e option, We do not use make -e with
> > > bare makefile based recipes.
> >
> > The -e option is related to environment variables. It's not relevant
> > for this discussion - which is about setting options via the make
> > command line.
> >
>
> I somehow oversaw the fact its being passed as make variable on
> cmdline and not becoming
> an export. so you are right, I think we don't need the patch perhaps
> setting it via EXTRA_OEMAKE
> should suffice
Yes, not sure what I was thinking. I've tested again without the
squashfs-tools patch and setting via EXTRA_OEMAKE works as expected.
Thanks,
Peter.
>
> > > >> +Upstream-Status: Submitted [https://github.com/plougher/squashfs-tools/pull/93 ]
> > > >> +
> > > >> +Signed-off-by: Peter Morrow <pemorrow@linux.microsoft.com>
> > > >> +---
> > > >> + squashfs-tools/Makefile | 2 +-
> > > >> + 1 file changed, 1 insertion(+), 1 deletion(-)
> > > >> +
> > > >> +diff --git a/squashfs-tools/Makefile b/squashfs-tools/Makefile
> > > >> +index aee4b96..7425605 100644
> > > >> +--- a/squashfs-tools/Makefile
> > > >> ++++ b/squashfs-tools/Makefile
> > > >> +@@ -85,7 +85,7 @@ GZIP_SUPPORT = 1
> > > >> + # in Mksquashfs. Obviously the compression algorithm must have been
> > > >> + # selected to be built
> > > >> + #
> > > >> +-COMP_DEFAULT = gzip
> > > >> ++COMP_DEFAULT ?= gzip
> > > >> +
> > > >> +
> > > >> + ###############################################
> > > >> +--
> > > >> +2.20.1
> > > >> +
> > > >> diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
> > > >> index b06951d..df025d4 100644
> > > >> --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
> > > >> +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
> > > >> @@ -9,6 +9,7 @@ PV = "4.4"
> > > >> SRCREV = "52eb4c279cd283ed9802dd1ceb686560b22ffb67"
> > > >> SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \
> > > >> file://0001-squashfs-tools-fix-build-failure-against-gcc-10.patch;striplevel=2 \
> > > >> + file://0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch;striplevel=2 \
> > > >> "
> > > >>
> > > >> S = "${WORKDIR}/git/squashfs-tools"
> > > >> @@ -25,6 +26,9 @@ PACKAGECONFIG[xattr] = "XATTR_SUPPORT=1,XATTR_SUPPORT=0,attr"
> > > >> PACKAGECONFIG[zstd] = "ZSTD_SUPPORT=1,ZSTD_SUPPORT=0,zstd"
> > > >> PACKAGECONFIG[reproducible] = "REPRODUCIBLE_DEFAULT=1,REPRODUCIBLE_DEFAULT=0,"
> > > >>
> > > >> +SQUASHFS_TOOLS_COMP_DEFAULT ?= "gzip"
> > > >> +EXTRA_OEMAKE += "COMP_DEFAULT=${SQUASHFS_TOOLS_COMP_DEFAULT}"
> > > >
> > > > Note that this will force the recipe's default value even if upstream
> > > > squashfs-tools changes. Not a problem now as the two are the same, but
> > > > something which will need to be checked each time squashfs-tools is
> > > > updated.
> > > >
> > > >> do_compile() {
> > > >> oe_runmake all
> > > >> }
> > > >> --
> > > >> 1.8.3.1
> > > >>
> > > >>
> > > >>
> > > >>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [OE-core] [PATCH v2] squashfs-tools: Allow COMP_DEFAULT to be changed easily at build time
2020-09-12 5:04 ` Khem Raj
2020-09-12 6:36 ` Andre McCurdy
@ 2020-09-14 9:56 ` Peter Morrow
1 sibling, 0 replies; 7+ messages in thread
From: Peter Morrow @ 2020-09-14 9:56 UTC (permalink / raw)
To: Khem Raj; +Cc: Andre McCurdy, OE Core mailing list
On Fri, Sep 11, 2020 at 10:04:00PM -0700, Khem Raj wrote:
>
>
> On 9/11/20 10:33 AM, Andre McCurdy wrote:
> > On Fri, Sep 11, 2020 at 10:21 AM Peter Morrow
> > <pemorrow@linux.microsoft.com> wrote:
> >>
> >> The default compression algorithm is gzip, this patch allows the default
> >> to be changed via a bbappend file by setting SQUASHFS_TOOLS_COMP_DEFAULT
> >> to a valid compression algorithm.
> >>
> >> Signed-off-by: Peter Morrow <pemorrow@linux.microsoft.com>
> >> ---
> >> ...ols-Allow-COMP_DEFAULT-to-be-overridden-v.patch | 34 ++++++++++++++++++++++
> >> .../squashfs-tools/squashfs-tools_git.bb | 4 +++
> >> 2 files changed, 38 insertions(+)
> >> create mode 100644 meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch
> >>
> >> diff --git a/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch b/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch
> >> new file mode 100644
> >> index 0000000..5f12c42
> >> --- /dev/null
> >> +++ b/meta/recipes-devtools/squashfs-tools/files/0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch
> >> @@ -0,0 +1,34 @@
> >> +From d2d9b517696f5950597f5b60ae8fdade5b7c14a9 Mon Sep 17 00:00:00 2001
> >> +From: Peter Morrow <pemorrow@linux.microsoft.com>
> >> +Date: Fri, 4 Sep 2020 15:43:15 +0100
> >> +Subject: [PATCH] squashfs-tools: Allow COMP_DEFAULT to be overridden via make
> >> + cmdline
> >> +
> >> +Currently the only way to modify the default compression algorithm is to
> >> +modify the Makefile. It is useful to be able to set the default compression
> >> +algorithm via the make command line since otherwise a build time search
> >> +replace operation needs to be performed on the Makefile.
> >
> > That's not how Makefiles normally work. Options set via the command
> > line over-ride variables set with = in the Makefile.
> >
> > Does setting your chosen value for COMP_DEFAULT on the make command
> > line really not work?
>
> that works if make is invoked with -e option, We do not use make -e with
> bare makefile based recipes.
>
> >
> >> +Upstream-Status: Submitted [https://github.com/plougher/squashfs-tools/pull/93 ]
> >> +
> >> +Signed-off-by: Peter Morrow <pemorrow@linux.microsoft.com>
> >> +---
> >> + squashfs-tools/Makefile | 2 +-
> >> + 1 file changed, 1 insertion(+), 1 deletion(-)
> >> +
> >> +diff --git a/squashfs-tools/Makefile b/squashfs-tools/Makefile
> >> +index aee4b96..7425605 100644
> >> +--- a/squashfs-tools/Makefile
> >> ++++ b/squashfs-tools/Makefile
> >> +@@ -85,7 +85,7 @@ GZIP_SUPPORT = 1
> >> + # in Mksquashfs. Obviously the compression algorithm must have been
> >> + # selected to be built
> >> + #
> >> +-COMP_DEFAULT = gzip
> >> ++COMP_DEFAULT ?= gzip
> >> +
> >> +
> >> + ###############################################
> >> +--
> >> +2.20.1
> >> +
> >> diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
> >> index b06951d..df025d4 100644
> >> --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
> >> +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
> >> @@ -9,6 +9,7 @@ PV = "4.4"
> >> SRCREV = "52eb4c279cd283ed9802dd1ceb686560b22ffb67"
> >> SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \
> >> file://0001-squashfs-tools-fix-build-failure-against-gcc-10.patch;striplevel=2 \
> >> + file://0001-squashfs-tools-Allow-COMP_DEFAULT-to-be-overridden-v.patch;striplevel=2 \
> >> "
> >>
> >> S = "${WORKDIR}/git/squashfs-tools"
> >> @@ -25,6 +26,9 @@ PACKAGECONFIG[xattr] = "XATTR_SUPPORT=1,XATTR_SUPPORT=0,attr"
> >> PACKAGECONFIG[zstd] = "ZSTD_SUPPORT=1,ZSTD_SUPPORT=0,zstd"
> >> PACKAGECONFIG[reproducible] = "REPRODUCIBLE_DEFAULT=1,REPRODUCIBLE_DEFAULT=0,"
> >>
> >> +SQUASHFS_TOOLS_COMP_DEFAULT ?= "gzip"
> >> +EXTRA_OEMAKE += "COMP_DEFAULT=${SQUASHFS_TOOLS_COMP_DEFAULT}"
> >
> > Note that this will force the recipe's default value even if upstream
> > squashfs-tools changes. Not a problem now as the two are the same, but
> > something which will need to be checked each time squashfs-tools is
> > updated.
Yep, good point. I covered this in V1, though have not covered it in V3.
I'm happy to add something to cover this in a V4 if you'd like?
Thanks,
Peter.
> >
> >> do_compile() {
> >> oe_runmake all
> >> }
> >> --
> >> 1.8.3.1
> >>
> >>
> >>
> >>
> pub 1024D/919D3314 2009-08-28 Khem Raj <raj.khem@gmail.com>
> sub 4096g/7CF5958F 2009-08-28
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-09-14 9:56 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-11 17:21 [PATCH v2] squashfs-tools: Allow COMP_DEFAULT to be changed easily at build time Peter Morrow
2020-09-11 17:33 ` [OE-core] " Andre McCurdy
2020-09-12 5:04 ` Khem Raj
2020-09-12 6:36 ` Andre McCurdy
2020-09-12 7:37 ` Khem Raj
2020-09-14 9:17 ` Peter Morrow
2020-09-14 9:56 ` Peter Morrow
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.