diff --git a/_service b/_service index aae5dc9..085ea5a 100644 --- a/_service +++ b/_service @@ -2,9 +2,9 @@ https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/ git - mkfs-dev - c38695e5e036a5ab6c7847c1b6d78cdf1a118585 - 0.0.1~@TAG_OFFSET@ + erofs-utils_20190803 + 589ab3accd0908f4664c839c6a3a320fa56346ec + 0.1+20190803 *.tar diff --git a/erofs-utils-0.0.1~23.tar.xz b/erofs-utils-0.0.1~23.tar.xz deleted file mode 100644 index 0d0342f..0000000 --- a/erofs-utils-0.0.1~23.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5e8fcc55b3148b8bd6d9758e529417b08264c896a4b67dd6858974a0534a7f26 -size 28364 diff --git a/erofs-utils-0.1+20190803.tar.xz b/erofs-utils-0.1+20190803.tar.xz new file mode 100644 index 0000000..10b84ca --- /dev/null +++ b/erofs-utils-0.1+20190803.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:662c87787c7775bcf3fcd0a67df0e05d48ee1af67f526f4c6790e9f725291bcf +size 29004 diff --git a/erofs-utils.changes b/erofs-utils.changes index bb2c550..8fe3bf6 100644 --- a/erofs-utils.changes +++ b/erofs-utils.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Aug 23 04:45:53 UTC 2019 - Jan Engelhardt + +- Update to new upstream release 20190803 + * The mkfs utility was rewritten +- Drop no-date.diff (no longer needed) + ------------------------------------------------------------------- Thu Mar 14 19:34:57 UTC 2019 - Jan Engelhardt diff --git a/erofs-utils.spec b/erofs-utils.spec index 9ff0456..ae2fc15 100644 --- a/erofs-utils.spec +++ b/erofs-utils.spec @@ -17,23 +17,20 @@ Name: erofs-utils -Version: 0.0.1~23 +Version: 0.1+20190803 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/ +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: 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 -Provides: bundled(lz4) = 1.8.3 +BuildRequires: liblz4-devel >= 1.9 %description mkfs.erofs is a user-space tool to create erofs filesystem images. It @@ -47,17 +44,11 @@ uncompressed: file should be inlined or not properly. %prep -%setup -qa2 -%patch -P 1 -p1 +%autosetup -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-include="$PWD/lz4-1.8.3/lib" \ - --with-lz4-lib="$PWD/lz4-1.8.3/lib" --bindir="%_sbindir" +%configure --bindir="%_sbindir" make %{?_smp_mflags} %install diff --git a/lz4-1.8.3.tar.gz b/lz4-1.8.3.tar.gz deleted file mode 100644 index 4cb82ff..0000000 --- a/lz4-1.8.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33af5936ac06536805f9745e0b6d61da606a1f8b4cc5c04dd3cbaca3b9b4fc43 -size 327897 diff --git a/no-date.diff b/no-date.diff deleted file mode 100644 index 5523b8f..0000000 --- a/no-date.diff +++ /dev/null @@ -1,20 +0,0 @@ -From: Jan Engelhardt -Date: 2018-11-20 00:09:16.003548811 +0100 - ---- - mkfs/erofs_config.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: erofs-utils-0.0.1~23/mkfs/erofs_config.c -=================================================================== ---- 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 = PACKAGE_VERSION " " __DATE__ " " __TIME__; -+ erofs_cfg.c_version = PACKAGE_VERSION; - } - - void mkfs_dump_config(void)