From 448c82016761fdb9c4ba37f2892735da8872591c8f050ad4ffce85aa926b2361 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 14 Mar 2019 20:15:27 +0000 Subject: [PATCH] - Move to new git snapshot 72ae01c3e97c7b2de569b2b86ea4ed6b245acb72 OBS-URL: https://build.opensuse.org/package/show/filesystems/erofs-utils?expand=0&rev=6 --- _service | 2 +- constant.diff | 43 ------------------------------------- erofs-utils-0.0.1~23.tar.xz | 3 +++ erofs-utils-0.0.1~4.tar.xz | 3 --- erofs-utils.changes | 7 +++--- erofs-utils.spec | 13 ++++++----- no-date.diff | 16 +++++++------- no-static.diff | 22 ------------------- 8 files changed, 22 insertions(+), 87 deletions(-) delete mode 100644 constant.diff create mode 100644 erofs-utils-0.0.1~23.tar.xz delete mode 100644 erofs-utils-0.0.1~4.tar.xz delete mode 100644 no-static.diff diff --git a/_service b/_service index 2f14cf5..aae5dc9 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/ git mkfs-dev - dfb7ee1144ec47df68e823105cd0cea8cffcd1dc + c38695e5e036a5ab6c7847c1b6d78cdf1a118585 0.0.1~@TAG_OFFSET@ diff --git a/constant.diff b/constant.diff deleted file mode 100644 index ebde689..0000000 --- a/constant.diff +++ /dev/null @@ -1,43 +0,0 @@ -From: Jan Engelhardt -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,25 @@ - #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_le64(x) __builtin_bswap64(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)])) diff --git a/erofs-utils-0.0.1~23.tar.xz b/erofs-utils-0.0.1~23.tar.xz new file mode 100644 index 0000000..0d0342f --- /dev/null +++ b/erofs-utils-0.0.1~23.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e8fcc55b3148b8bd6d9758e529417b08264c896a4b67dd6858974a0534a7f26 +size 28364 diff --git a/erofs-utils-0.0.1~4.tar.xz b/erofs-utils-0.0.1~4.tar.xz deleted file mode 100644 index 74869f9..0000000 --- a/erofs-utils-0.0.1~4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ac09d5cefbfa0d2fc0b17c93c5c5ea2481b346ff7841638b720441431508c7e -size 27008 diff --git a/erofs-utils.changes b/erofs-utils.changes index a0a2bf1..bb2c550 100644 --- a/erofs-utils.changes +++ b/erofs-utils.changes @@ -1,8 +1,9 @@ ------------------------------------------------------------------- -Wed Mar 13 08:37:18 UTC 2019 - +Thu Mar 14 19:34:57 UTC 2019 - Jan Engelhardt -- Edit constant.diff and add definition for cpu_to_le64 - for big-endian systems. +- Move to new git snapshot 72ae01c3e97c7b2de569b2b86ea4ed6b245acb72 + * No changelog was provided +- Drop constant.diff, no-static.diff (no longer needed) ------------------------------------------------------------------- Mon Dec 10 10:11:43 UTC 2018 - Jan Engelhardt diff --git a/erofs-utils.spec b/erofs-utils.spec index 02f8b5c..9ff0456 100644 --- a/erofs-utils.spec +++ b/erofs-utils.spec @@ -17,7 +17,7 @@ Name: erofs-utils -Version: 0.0.1~4 +Version: 0.0.1~23 Release: 0 Summary: Utilities for the Extendable Read-Only Filesystem (EROFS) License: GPL-2.0-or-later @@ -25,16 +25,14 @@ 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 +Patch1: 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...) +# erofs depends on an unstable nonexported API Provides: bundled(lz4) = 1.8.3 %description @@ -50,7 +48,7 @@ uncompressed: %prep %setup -qa2 -%patch -P 1 -P 2 -P 3 -p1 +%patch -P 1 -p1 %build pushd lz4-1.8.3/ @@ -58,7 +56,8 @@ 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" +%configure --disable-static --with-lz4-include="$PWD/lz4-1.8.3/lib" \ + --with-lz4-lib="$PWD/lz4-1.8.3/lib" --bindir="%_sbindir" make %{?_smp_mflags} %install diff --git a/no-date.diff b/no-date.diff index 71b8873..5523b8f 100644 --- a/no-date.diff +++ b/no-date.diff @@ -2,19 +2,19 @@ From: Jan Engelhardt Date: 2018-11-20 00:09:16.003548811 +0100 --- - erofs_config.c | 2 +- + mkfs/erofs_config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: erofs-utils-0.0.1~4/erofs_config.c +Index: erofs-utils-0.0.1~23/mkfs/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) +--- erofs-utils-0.0.1~23.orig/mkfs/erofs_config.c ++++ erofs-utils-0.0.1~23/mkfs/erofs_config.c +@@ -20,7 +20,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; + erofs_cfg.c_dbg_lvl = 0; +- erofs_cfg.c_version = PACKAGE_VERSION " " __DATE__ " " __TIME__; ++ erofs_cfg.c_version = PACKAGE_VERSION; } void mkfs_dump_config(void) diff --git a/no-static.diff b/no-static.diff deleted file mode 100644 index ff66dbe..0000000 --- a/no-static.diff +++ /dev/null @@ -1,22 +0,0 @@ -From: Jan Engelhardt -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 -