Hello community, here is the log from the commit of package erofs-utils for openSUSE:Factory checked in at 2018-12-13 19:48:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/erofs-utils (Old) and /work/SRC/openSUSE:Factory/.erofs-utils.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "erofs-utils" Thu Dec 13 19:48:22 2018 rev:1 rq:656920 version:0.0.1~4 Changes: -------- New Changes file: --- /dev/null 2018-10-29 14:05:42.522318975 +0100 +++ /work/SRC/openSUSE:Factory/.erofs-utils.new.28833/erofs-utils.changes 2018-12-13 19:48:22.968705731 +0100 @@ -0,0 +1,10 @@ +------------------------------------------------------------------- +Mon Dec 10 10:11:43 UTC 2018 - Jan Engelhardt <jeng...@inai.de> + +- Use lz4hc.h from bundled copy, not the system. + +------------------------------------------------------------------- +Mon Nov 19 20:57:48 UTC 2018 - Jan Engelhardt <jeng...@inai.de> + +- Initial version (0.0.1~4 / 4f437e3) for build.opensuse.org +- Add constant.diff, no-static.diff, no-date.diff New: ---- _service constant.diff erofs-utils-0.0.1~4.tar.xz erofs-utils.changes erofs-utils.spec lz4-1.8.3.tar.gz no-date.diff no-static.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ erofs-utils.spec ++++++ # # spec file for package erofs-utils # # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: erofs-utils Version: 0.0.1~4 Release: 0 Summary: Utilities for the Extendable Read-Only Filesystem (EROFS) License: GPL-2.0-or-later Group: System/Filesystems URL: https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/ Source: %name-%version.tar.xz Source2: https://github.com/lz4/lz4/archive/v1.8.3.tar.gz#/lz4-1.8.3.tar.gz Patch1: constant.diff Patch2: no-static.diff Patch3: no-date.diff BuildRequires: autoconf >= 2.69 BuildRequires: automake BuildRequires: libtool BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build Supplements: filesystem(erofs) # erofs depends on an unstable nonexported API (and at the same time the headers from liblz4-devel...) Provides: bundled(lz4) = 1.8.3 %description mkfs.erofs is a user-space tool to create erofs filesystem images. It can create two main types of erofs images, compressed and uncompressed: * For compressed images, it is able to integrate several compression algorithms, LZ4 is supported according to the current erofs kernel implementation. * For uncompressed images, it can decide whether the last page of a file should be inlined or not properly. %prep %setup -qa2 %patch -P 1 -P 2 -P 3 -p1 %build pushd lz4-1.8.3/ make %{?_smp_mflags} CFLAGS="%{optflags}" V=1 popd autoreconf -fiv export CPPFLAGS="-I$PWD/lz4-1.8.3/lib" %configure --disable-static --with-lz4="$PWD/lz4-1.8.3/lib" --bindir="%_sbindir" make %{?_smp_mflags} %install %make_install %files %license COPYING %_sbindir/mkfs* %changelog ++++++ _service ++++++ <services> <service mode="disabled" name="tar_scm"> <param name="url">https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/</param> <param name="scm">git</param> <param name="revision">mkfs-dev</param> <param name="parent-tag">dfb7ee1144ec47df68e823105cd0cea8cffcd1dc</param> <param name="versionformat">0.0.1~@TAG_OFFSET@</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service mode="disabled" name="set_version"/> </services> ++++++ constant.diff ++++++ From: Jan Engelhardt <jeng...@inai.de> Date: 2018-11-19 22:07:39.047450605 +0100 --- erofs_types.h | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) Index: erofs-utils-0.0.1~4/erofs_types.h =================================================================== --- erofs-utils-0.0.1~4.orig/erofs_types.h +++ erofs-utils-0.0.1~4/erofs_types.h @@ -26,13 +26,24 @@ #define s32 int32_t #define s64 int64_t -#define cpu_to_le16(X) htole16(X) -#define cpu_to_le32(X) htole32(X) -#define cpu_to_le64(X) htole64(X) - -#define le16_to_cpu(X) le16toh(X) -#define le32_to_cpu(X) le32toh(X) -#define le64_to_cpu(X) le64toh(X) +#if (defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN) || \ + (defined(_BYTE_ORDER) && _BYTE_ORDER == _BIG_ENDIAN) + /* We need to use constexpr functions, and htole16 unfortunately is not. */ +# define cpu_to_le16(x) __builtin_bswap16(x) +# define cpu_to_le32(x) __builtin_bswap32(x) +# define cpu_to_be64(x) (x) +# define le16_to_cpu(x) __builtin_bswap16(x) +# define le32_to_cpu(x) __builtin_bswap32(x) +# define be64_to_cpu(x) (x) +#else +# define cpu_to_le16(x) (x) +# define cpu_to_le32(x) (x) +# define cpu_to_le64(x) (x) +# define cpu_to_be64(x) __builtin_bswap64(x) +# define le16_to_cpu(x) (x) +# define le32_to_cpu(x) (x) +# define be64_to_cpu(x) __builtin_bswap64(x) +#endif #ifndef __OPTIMIZE__ #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)])) ++++++ no-date.diff ++++++ From: Jan Engelhardt <jeng...@inai.de> Date: 2018-11-20 00:09:16.003548811 +0100 --- erofs_config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: erofs-utils-0.0.1~4/erofs_config.c =================================================================== --- erofs-utils-0.0.1~4.orig/erofs_config.c +++ erofs-utils-0.0.1~4/erofs_config.c @@ -19,7 +19,7 @@ void mkfs_init_configure(void) memset(&erofs_cfg, 0, sizeof(erofs_cfg)); erofs_cfg.c_alg_name = "none"; erofs_cfg.c_dbg_lvl = 0; - erofs_cfg.c_version = EROFS_MKFS_VERSION " " __DATE__ " " __TIME__; + erofs_cfg.c_version = EROFS_MKFS_VERSION; } void mkfs_dump_config(void) ++++++ no-static.diff ++++++ From: Jan Engelhardt <jeng...@inai.de> Date: 2018-11-20 00:03:33.951298480 +0100 The flag is just completely wrong (it's supposed to be "-static", duh), and it is not needed because LIBLZ4_STATIC is always specified as an .a file anyway. --- Makefile.am | 1 - 1 file changed, 1 deletion(-) Index: erofs-utils-0.0.1~4/Makefile.am =================================================================== --- erofs-utils-0.0.1~4.orig/Makefile.am +++ erofs-utils-0.0.1~4/Makefile.am @@ -25,7 +25,6 @@ noinst_HEADERS = erofs_config.h \ mkfs_file.h mkfs_erofs_CFLAGS = -Wall -Werror -DEROFS_MKFS_VERSION=\"v1.0\" -mkfs_erofs_LDFLAGS = --static mkfs_erofs_LDADD = $(LIBLZ4_STATIC) ACLOCAL_AMFLAGS = -I m4
