From 222447119aa0e63b0aeae20a8f02eea8fc40d3dd58f3f76073086b1568539e16 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 8 Nov 2019 08:14:45 +0000 Subject: [PATCH] - Update to release 1.0 OBS-URL: https://build.opensuse.org/package/show/filesystems/erofs-utils?expand=0&rev=13 --- _service | 6 ++-- erofs-utils-0.1+20190826.tar.xz | 3 -- erofs-utils-1.0.tar.xz | 3 ++ erofs-utils.changes | 17 ++++++++++ erofs-utils.spec | 3 +- long.patch | 56 --------------------------------- 6 files changed, 24 insertions(+), 64 deletions(-) delete mode 100644 erofs-utils-0.1+20190826.tar.xz create mode 100644 erofs-utils-1.0.tar.xz delete mode 100644 long.patch diff --git a/_service b/_service index 7cf4e37..161ba88 100644 --- a/_service +++ b/_service @@ -2,9 +2,9 @@ https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/ git - erofs-utils_20190826 - 589ab3accd0908f4664c839c6a3a320fa56346ec - 0.1+20190826 + v1.0 + v1.0 + 1.0 *.tar diff --git a/erofs-utils-0.1+20190826.tar.xz b/erofs-utils-0.1+20190826.tar.xz deleted file mode 100644 index 932d743..0000000 --- a/erofs-utils-0.1+20190826.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d1bf58a8da1c86d46e0122a40283cfd11c4010691990f5a4e971eb9604aa42c3 -size 29220 diff --git a/erofs-utils-1.0.tar.xz b/erofs-utils-1.0.tar.xz new file mode 100644 index 0000000..ff7e00a --- /dev/null +++ b/erofs-utils-1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d4b9d16f8c4b39ed0bcb09fd04306106f0ee04d926d39ae8e3ce4e291d5857f +size 37460 diff --git a/erofs-utils.changes b/erofs-utils.changes index af86e63..96cbfe6 100644 --- a/erofs-utils.changes +++ b/erofs-utils.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Fri Nov 8 08:00:40 UTC 2019 - Jan Engelhardt + +- Update to release 1.0 + * list available compressors for help command + * introduce long parameter option + * introduce shared xattr support + * introduce inline xattr support + * fix old kernel compatibility for non-lz4 compression + * introduce fixed UNIX timestamp + * complete extended inode support + * support 64-bit internal buffer cache + * keep up with in-kernel ondisk format naming + * resize image to the correct size + * complete special file support +- Drop long.patch (merged upstream) + ------------------------------------------------------------------- Sun Sep 8 14:26:05 UTC 2019 - Jan Engelhardt diff --git a/erofs-utils.spec b/erofs-utils.spec index b91b8e0..fd795e5 100644 --- a/erofs-utils.spec +++ b/erofs-utils.spec @@ -17,7 +17,7 @@ Name: erofs-utils -Version: 0.1+20190826 +Version: 1.0 Release: 0 Summary: Utilities for the Extendable Read-Only Filesystem (EROFS) License: GPL-2.0-or-later @@ -25,7 +25,6 @@ Group: System/Filesystems URL: https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/ Source: %name-%version.tar.xz -Patch1: long.patch BuildRequires: autoconf >= 2.69 BuildRequires: automake BuildRequires: libtool diff --git a/long.patch b/long.patch deleted file mode 100644 index a842372..0000000 --- a/long.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 5c314e288719b59fb8bad90fd1a75b8076baceee Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Sun, 8 Sep 2019 16:52:56 +0200 -Subject: [PATCH] build: cure compiler warnings - -On i586 I observe: - -In file included from inode.c:16: -inode.c: In function 'erofs_mkfs_build_tree': -../include/erofs/print.h:27:21: error: format '%lu' expects argument of type -'long unsigned int', but argument 7 has type 'erofs_nid_t' {aka 'long long unsigned int'} [-Werror=format=] - 27 | #define pr_fmt(fmt) "EROFS: " FUNC_LINE_FMT fmt "\n" -../include/erofs/print.h:43:4: note: in expansion of macro 'pr_fmt' - 43 | pr_fmt(fmt), \ -inode.c:792:3: note: in expansion of macro 'erofs_info' - 792 | erofs_info("add file %s/%s (nid %lu, type %d)", -inode.c:792:37: note: format string is defined here - 792 | erofs_info("add file %s/%s (nid %lu, type %d)", ---- - lib/compress.c | 4 ++-- - lib/inode.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/lib/compress.c b/lib/compress.c -index a977c87..cadf598 100644 ---- a/lib/compress.c -+++ b/lib/compress.c -@@ -457,8 +457,8 @@ int erofs_write_compressed_file(struct erofs_inode *inode) - ret = erofs_bh_balloon(bh, blknr_to_addr(compressed_blocks)); - DBG_BUGON(ret); - -- erofs_info("compressed %s (%lu bytes) into %u blocks", -- inode->i_srcpath, inode->i_size, compressed_blocks); -+ erofs_info("compressed %s (%llu bytes) into %u blocks", -+ inode->i_srcpath, (unsigned long long)inode->i_size, compressed_blocks); - - /* - * TODO: need to move erofs_bdrop to erofs_write_tail_end -diff --git a/lib/inode.c b/lib/inode.c -index 141a300..db9ad99 100644 ---- a/lib/inode.c -+++ b/lib/inode.c -@@ -789,8 +789,8 @@ fail: - - d->type = erofs_type_by_mode[d->inode->i_mode >> S_SHIFT]; - erofs_d_invalidate(d); -- erofs_info("add file %s/%s (nid %lu, type %d)", -- dir->i_srcpath, d->name, d->nid, d->type); -+ erofs_info("add file %s/%s (nid %llu, type %d)", -+ dir->i_srcpath, d->name, (unsigned long long)d->nid, d->type); - } - erofs_write_dir_file(dir); - erofs_write_tail_end(dir); --- -2.23.0 -