diff mbox series

[v2,1/6] squashfs: bump version to e38956b92f738518c29734399629e7cdb33072d3

Message ID 20180409200429.22650-1-ps.report@gmx.net
State Accepted
Headers show
Series [v2,1/6] squashfs: bump version to e38956b92f738518c29734399629e7cdb33072d3 | expand

Commit Message

Peter Seiderer April 9, 2018, 8:04 p.m. UTC 
- delete patch 0001-musl.patch (superseeded by upstream commit [1])
- disable new zstd support for host/target

[1] https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git/commit/?id=a81678d6a698b8a016f9abac9f3d981281cc52eb

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
Changes v1 -> v2:
  - split off zstd support to extra patches (suggested by Yann E. MORIN)
---
 package/squashfs/0001-musl.patch | 71 ----------------------------------------
 package/squashfs/squashfs.hash   |  2 +-
 package/squashfs/squashfs.mk     |  7 ++--
 3 files changed, 5 insertions(+), 75 deletions(-)
 delete mode 100644 package/squashfs/0001-musl.patch

Comments

Yann E. MORIN April 11, 2018, 9:12 p.m. UTC | #1 
Peter, All,

On 2018-04-09 22:04 +0200, Peter Seiderer spake thusly:
> - delete patch 0001-musl.patch (superseeded by upstream commit [1])
> - disable new zstd support for host/target
> 
> [1] https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git/commit/?id=a81678d6a698b8a016f9abac9f3d981281cc52eb
> 
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

However, I don't think it is interesting to have the new version
(especially as it is a sha1) in the commit title. Having the title
read just "squashfs: bump version" is IMHO enough. My rev-by still
stands, though.

Thanks!

Regards,
Yann E. MORIN.

> ---
> Changes v1 -> v2:
>   - split off zstd support to extra patches (suggested by Yann E. MORIN)
> ---
>  package/squashfs/0001-musl.patch | 71 ----------------------------------------
>  package/squashfs/squashfs.hash   |  2 +-
>  package/squashfs/squashfs.mk     |  7 ++--
>  3 files changed, 5 insertions(+), 75 deletions(-)
>  delete mode 100644 package/squashfs/0001-musl.patch
> 
> diff --git a/package/squashfs/0001-musl.patch b/package/squashfs/0001-musl.patch
> deleted file mode 100644
> index 891b1717a2..0000000000
> --- a/package/squashfs/0001-musl.patch
> +++ /dev/null
> @@ -1,71 +0,0 @@
> -Fix musl build
> -
> -Downloaded from
> -http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch
> -and adjusted paths.
> -
> -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> -
> -Define FNM_EXTMATCH if not defined its glibc specific define
> -include missing sys/stat.h for stat* function declarations
> -
> -Upstream-Status: Pending
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -
> -Index: squashfs-tools/action.c
> -===================================================================
> ---- a/squashfs-tools.orig/action.c
> -+++ b/squashfs-tools/action.c
> -@@ -44,6 +44,10 @@
> - #include "action.h"
> - #include "error.h"
> - 
> -+#if !defined(FNM_EXTMATCH)
> -+#define FNM_EXTMATCH 0
> -+#endif
> -+
> - /*
> -  * code to parse actions
> -  */
> -Index: squashfs-tools/mksquashfs.c
> -===================================================================
> ---- a/squashfs-tools.orig/mksquashfs.c
> -+++ b/squashfs-tools/mksquashfs.c
> -@@ -1286,6 +1286,10 @@ void write_dir(squashfs_inode *inode, st
> - 		dir_size + 3, directory_block, directory_offset, NULL, NULL,
> - 		dir, 0);
> - 
> -+#if !defined(FNM_EXTMATCH)
> -+#define FNM_EXTMATCH 0
> -+#endif
> -+
> - #ifdef SQUASHFS_TRACE
> - 	{
> - 		unsigned char *dirp;
> -Index: squashfs-tools/pseudo.c
> -===================================================================
> ---- a/squashfs-tools.orig/pseudo.c
> -+++ b/squashfs-tools/pseudo.c
> -@@ -32,6 +32,7 @@
> - #include <stdlib.h>
> - #include <sys/types.h>
> - #include <sys/wait.h>
> -+#include <sys/stat.h>
> - #include <ctype.h>
> - 
> - #include "pseudo.h"
> -Index: squashfs-tools/unsquashfs.c
> -===================================================================
> ---- a/squashfs-tools.orig/unsquashfs.c
> -+++ b/squashfs-tools/unsquashfs.c
> -@@ -38,6 +38,10 @@
> - #include <limits.h>
> - #include <ctype.h>
> - 
> -+#ifndef FNM_EXTMATCH
> -+#define FNM_EXTMATCH 0
> -+#endif
> -+
> - struct cache *fragment_cache, *data_cache;
> - struct queue *to_reader, *to_inflate, *to_writer, *from_writer;
> - pthread_t *thread, *inflator_thread;
> diff --git a/package/squashfs/squashfs.hash b/package/squashfs/squashfs.hash
> index 74fdb44354..82a650022c 100644
> --- a/package/squashfs/squashfs.hash
> +++ b/package/squashfs/squashfs.hash
> @@ -1,2 +1,2 @@
>  # Locally computed
> -sha256	2c49392816615b73bf5d6cdce9776cb66a01f5a1494b1d9af580667e32bab001  squashfs-3de1687d7432ea9b302c2db9521996f506c140a3.tar.gz
> +sha256 bd0aa3011320b8ebee68aa406060de277bef16daf81bad5b9f70cbea6db1a779 squashfs-e38956b92f738518c29734399629e7cdb33072d3.tar.gz
> diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk
> index 9599d892b2..e656218f97 100644
> --- a/package/squashfs/squashfs.mk
> +++ b/package/squashfs/squashfs.mk
> @@ -4,12 +4,12 @@
>  #
>  ################################################################################
>  
> -SQUASHFS_VERSION = 3de1687d7432ea9b302c2db9521996f506c140a3
> +SQUASHFS_VERSION = e38956b92f738518c29734399629e7cdb33072d3
>  SQUASHFS_SITE = https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git
>  SQUASHFS_SITE_METHOD = git
>  SQUASHFS_LICENSE = GPL-2.0+
>  SQUASHFS_LICENSE_FILES = COPYING
> -SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1
> +SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1 ZSTD_SUPPORT=0
>  
>  ifeq ($(BR2_PACKAGE_SQUASHFS_LZ4),y)
>  SQUASHFS_DEPENDENCIES += lz4
> @@ -54,7 +54,8 @@ HOST_SQUASHFS_MAKE_ARGS = \
>  	GZIP_SUPPORT=1 \
>  	LZ4_SUPPORT=1 \
>  	LZO_SUPPORT=1 \
> -	LZMA_XZ_SUPPORT=1
> +	LZMA_XZ_SUPPORT=1 \
> +	ZSTD_SUPPORT=0
>  
>  define SQUASHFS_BUILD_CMDS
>  	$(TARGET_MAKE_ENV) $(MAKE) \
> -- 
> 2.16.3
>
Peter Seiderer April 12, 2018, 6:51 p.m. UTC | #2 
Hello Yann,

On Wed, 11 Apr 2018 23:12:54 +0200, "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:

> Peter, All,
> 
> On 2018-04-09 22:04 +0200, Peter Seiderer spake thusly:
> > - delete patch 0001-musl.patch (superseeded by upstream commit [1])
> > - disable new zstd support for host/target
> > 
> > [1] https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git/commit/?id=a81678d6a698b8a016f9abac9f3d981281cc52eb
> > 
> > Signed-off-by: Peter Seiderer <ps.report@gmx.net>  
> 
> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> 
> However, I don't think it is interesting to have the new version
> (especially as it is a sha1) in the commit title. Having the title
> read just "squashfs: bump version" is IMHO enough. My rev-by still
> stands, though.

Matter of taste....and looking at a packet history of e.g.:

	squashfs: bump version
	squashfs: bump version
	squashfs: bump version
	[...]

is a little boring and makes every patch search or patch reference
more difficult....

Regards,
Peter

> 
> Thanks!
> 
> Regards,
> Yann E. MORIN.
> 
> > ---
> > Changes v1 -> v2:
> >   - split off zstd support to extra patches (suggested by Yann E. MORIN)
> > ---
> >  package/squashfs/0001-musl.patch | 71 ----------------------------------------
> >  package/squashfs/squashfs.hash   |  2 +-
> >  package/squashfs/squashfs.mk     |  7 ++--
> >  3 files changed, 5 insertions(+), 75 deletions(-)
> >  delete mode 100644 package/squashfs/0001-musl.patch
> > 
> > diff --git a/package/squashfs/0001-musl.patch b/package/squashfs/0001-musl.patch
> > deleted file mode 100644
> > index 891b1717a2..0000000000
> > --- a/package/squashfs/0001-musl.patch
> > +++ /dev/null
> > @@ -1,71 +0,0 @@
> > -Fix musl build
> > -
> > -Downloaded from
> > -http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch
> > -and adjusted paths.
> > -
> > -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> > -
> > -Define FNM_EXTMATCH if not defined its glibc specific define
> > -include missing sys/stat.h for stat* function declarations
> > -
> > -Upstream-Status: Pending
> > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > -
> > -Index: squashfs-tools/action.c
> > -===================================================================
> > ---- a/squashfs-tools.orig/action.c
> > -+++ b/squashfs-tools/action.c
> > -@@ -44,6 +44,10 @@
> > - #include "action.h"
> > - #include "error.h"
> > - 
> > -+#if !defined(FNM_EXTMATCH)
> > -+#define FNM_EXTMATCH 0
> > -+#endif
> > -+
> > - /*
> > -  * code to parse actions
> > -  */
> > -Index: squashfs-tools/mksquashfs.c
> > -===================================================================
> > ---- a/squashfs-tools.orig/mksquashfs.c
> > -+++ b/squashfs-tools/mksquashfs.c
> > -@@ -1286,6 +1286,10 @@ void write_dir(squashfs_inode *inode, st
> > - 		dir_size + 3, directory_block, directory_offset, NULL, NULL,
> > - 		dir, 0);
> > - 
> > -+#if !defined(FNM_EXTMATCH)
> > -+#define FNM_EXTMATCH 0
> > -+#endif
> > -+
> > - #ifdef SQUASHFS_TRACE
> > - 	{
> > - 		unsigned char *dirp;
> > -Index: squashfs-tools/pseudo.c
> > -===================================================================
> > ---- a/squashfs-tools.orig/pseudo.c
> > -+++ b/squashfs-tools/pseudo.c
> > -@@ -32,6 +32,7 @@
> > - #include <stdlib.h>
> > - #include <sys/types.h>
> > - #include <sys/wait.h>
> > -+#include <sys/stat.h>
> > - #include <ctype.h>
> > - 
> > - #include "pseudo.h"
> > -Index: squashfs-tools/unsquashfs.c
> > -===================================================================
> > ---- a/squashfs-tools.orig/unsquashfs.c
> > -+++ b/squashfs-tools/unsquashfs.c
> > -@@ -38,6 +38,10 @@
> > - #include <limits.h>
> > - #include <ctype.h>
> > - 
> > -+#ifndef FNM_EXTMATCH
> > -+#define FNM_EXTMATCH 0
> > -+#endif
> > -+
> > - struct cache *fragment_cache, *data_cache;
> > - struct queue *to_reader, *to_inflate, *to_writer, *from_writer;
> > - pthread_t *thread, *inflator_thread;
> > diff --git a/package/squashfs/squashfs.hash b/package/squashfs/squashfs.hash
> > index 74fdb44354..82a650022c 100644
> > --- a/package/squashfs/squashfs.hash
> > +++ b/package/squashfs/squashfs.hash
> > @@ -1,2 +1,2 @@
> >  # Locally computed
> > -sha256	2c49392816615b73bf5d6cdce9776cb66a01f5a1494b1d9af580667e32bab001  squashfs-3de1687d7432ea9b302c2db9521996f506c140a3.tar.gz
> > +sha256 bd0aa3011320b8ebee68aa406060de277bef16daf81bad5b9f70cbea6db1a779 squashfs-e38956b92f738518c29734399629e7cdb33072d3.tar.gz
> > diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk
> > index 9599d892b2..e656218f97 100644
> > --- a/package/squashfs/squashfs.mk
> > +++ b/package/squashfs/squashfs.mk
> > @@ -4,12 +4,12 @@
> >  #
> >  ################################################################################
> >  
> > -SQUASHFS_VERSION = 3de1687d7432ea9b302c2db9521996f506c140a3
> > +SQUASHFS_VERSION = e38956b92f738518c29734399629e7cdb33072d3
> >  SQUASHFS_SITE = https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git
> >  SQUASHFS_SITE_METHOD = git
> >  SQUASHFS_LICENSE = GPL-2.0+
> >  SQUASHFS_LICENSE_FILES = COPYING
> > -SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1
> > +SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1 ZSTD_SUPPORT=0
> >  
> >  ifeq ($(BR2_PACKAGE_SQUASHFS_LZ4),y)
> >  SQUASHFS_DEPENDENCIES += lz4
> > @@ -54,7 +54,8 @@ HOST_SQUASHFS_MAKE_ARGS = \
> >  	GZIP_SUPPORT=1 \
> >  	LZ4_SUPPORT=1 \
> >  	LZO_SUPPORT=1 \
> > -	LZMA_XZ_SUPPORT=1
> > +	LZMA_XZ_SUPPORT=1 \
> > +	ZSTD_SUPPORT=0
> >  
> >  define SQUASHFS_BUILD_CMDS
> >  	$(TARGET_MAKE_ENV) $(MAKE) \
> > -- 
> > 2.16.3
> >   
>
Thomas Petazzoni April 12, 2018, 7:01 p.m. UTC | #3 
Hello,

On Thu, 12 Apr 2018 20:51:57 +0200, Peter Seiderer wrote:

> > However, I don't think it is interesting to have the new version
> > (especially as it is a sha1) in the commit title. Having the title
> > read just "squashfs: bump version" is IMHO enough. My rev-by still
> > stands, though.  
> 
> Matter of taste....and looking at a packet history of e.g.:
> 
> 	squashfs: bump version
> 	squashfs: bump version
> 	squashfs: bump version
> 	[...]
> 
> is a little boring and makes every patch search or patch reference
> more difficult....

We normally like to have the version number in the commit title indeed,
like "foo: bump to version 1.2.0". For Git SHA1s, it is a bit more
questionable whether it is really useful or not. Indeed, while with
"bump to version 1.2.0" you can easily say "ah, yes good, they bumped
to that one", with "bump to version
e38956b92f738518c29734399629e7cdb33072d3", you're unlikely to be able
to say "aah very good, they are up to this commit, so they must have
this great new feature". Or if you are, and now all the SHA1s of a
project Git repository, you really have a *very* good memory.

That being said, it doesn't hurt, and we could say that for the sake of
consistency, we should do it for all packages, regardless of whether
they have human-readable version numbers or random SHA1s.

Best regards,

Thomas
Thomas Petazzoni April 12, 2018, 9:43 p.m. UTC | #4 
Hello,

On Mon,  9 Apr 2018 22:04:24 +0200, Peter Seiderer wrote:
> - delete patch 0001-musl.patch (superseeded by upstream commit [1])
> - disable new zstd support for host/target
> 
> [1] https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git/commit/?id=a81678d6a698b8a016f9abac9f3d981281cc52eb
> 
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
> Changes v1 -> v2:
>   - split off zstd support to extra patches (suggested by Yann E. MORIN)
> ---
>  package/squashfs/0001-musl.patch | 71 ----------------------------------------
>  package/squashfs/squashfs.hash   |  2 +-
>  package/squashfs/squashfs.mk     |  7 ++--
>  3 files changed, 5 insertions(+), 75 deletions(-)
>  delete mode 100644 package/squashfs/0001-musl.patch

Applied to master, thanks.

Thomas
diff mbox series

Patch

diff --git a/package/squashfs/0001-musl.patch b/package/squashfs/0001-musl.patch
deleted file mode 100644
index 891b1717a2..0000000000
--- a/package/squashfs/0001-musl.patch
+++ /dev/null
@@ -1,71 +0,0 @@ 
-Fix musl build
-
-Downloaded from
-http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch
-and adjusted paths.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-Define FNM_EXTMATCH if not defined its glibc specific define
-include missing sys/stat.h for stat* function declarations
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Index: squashfs-tools/action.c
-===================================================================
---- a/squashfs-tools.orig/action.c
-+++ b/squashfs-tools/action.c
-@@ -44,6 +44,10 @@
- #include "action.h"
- #include "error.h"
- 
-+#if !defined(FNM_EXTMATCH)
-+#define FNM_EXTMATCH 0
-+#endif
-+
- /*
-  * code to parse actions
-  */
-Index: squashfs-tools/mksquashfs.c
-===================================================================
---- a/squashfs-tools.orig/mksquashfs.c
-+++ b/squashfs-tools/mksquashfs.c
-@@ -1286,6 +1286,10 @@ void write_dir(squashfs_inode *inode, st
- 		dir_size + 3, directory_block, directory_offset, NULL, NULL,
- 		dir, 0);
- 
-+#if !defined(FNM_EXTMATCH)
-+#define FNM_EXTMATCH 0
-+#endif
-+
- #ifdef SQUASHFS_TRACE
- 	{
- 		unsigned char *dirp;
-Index: squashfs-tools/pseudo.c
-===================================================================
---- a/squashfs-tools.orig/pseudo.c
-+++ b/squashfs-tools/pseudo.c
-@@ -32,6 +32,7 @@
- #include <stdlib.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-+#include <sys/stat.h>
- #include <ctype.h>
- 
- #include "pseudo.h"
-Index: squashfs-tools/unsquashfs.c
-===================================================================
---- a/squashfs-tools.orig/unsquashfs.c
-+++ b/squashfs-tools/unsquashfs.c
-@@ -38,6 +38,10 @@
- #include <limits.h>
- #include <ctype.h>
- 
-+#ifndef FNM_EXTMATCH
-+#define FNM_EXTMATCH 0
-+#endif
-+
- struct cache *fragment_cache, *data_cache;
- struct queue *to_reader, *to_inflate, *to_writer, *from_writer;
- pthread_t *thread, *inflator_thread;
diff --git a/package/squashfs/squashfs.hash b/package/squashfs/squashfs.hash
index 74fdb44354..82a650022c 100644
--- a/package/squashfs/squashfs.hash
+++ b/package/squashfs/squashfs.hash
@@ -1,2 +1,2 @@ 
 # Locally computed
-sha256	2c49392816615b73bf5d6cdce9776cb66a01f5a1494b1d9af580667e32bab001  squashfs-3de1687d7432ea9b302c2db9521996f506c140a3.tar.gz
+sha256 bd0aa3011320b8ebee68aa406060de277bef16daf81bad5b9f70cbea6db1a779 squashfs-e38956b92f738518c29734399629e7cdb33072d3.tar.gz
diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk
index 9599d892b2..e656218f97 100644
--- a/package/squashfs/squashfs.mk
+++ b/package/squashfs/squashfs.mk
@@ -4,12 +4,12 @@ 
 #
 ################################################################################
 
-SQUASHFS_VERSION = 3de1687d7432ea9b302c2db9521996f506c140a3
+SQUASHFS_VERSION = e38956b92f738518c29734399629e7cdb33072d3
 SQUASHFS_SITE = https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git
 SQUASHFS_SITE_METHOD = git
 SQUASHFS_LICENSE = GPL-2.0+
 SQUASHFS_LICENSE_FILES = COPYING
-SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1
+SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1 ZSTD_SUPPORT=0
 
 ifeq ($(BR2_PACKAGE_SQUASHFS_LZ4),y)
 SQUASHFS_DEPENDENCIES += lz4
@@ -54,7 +54,8 @@  HOST_SQUASHFS_MAKE_ARGS = \
 	GZIP_SUPPORT=1 \
 	LZ4_SUPPORT=1 \
 	LZO_SUPPORT=1 \
-	LZMA_XZ_SUPPORT=1
+	LZMA_XZ_SUPPORT=1 \
+	ZSTD_SUPPORT=0
 
 define SQUASHFS_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) \