On Fri, Sep 11, 2020 at 10:21 AM Peter Morrow <pemor...@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 <pemor...@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 <pemor...@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 <pemor...@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 > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#142443): https://lists.openembedded.org/g/openembedded-core/message/142443 Mute This Topic: https://lists.openembedded.org/mt/76784587/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
