| Message ID | 1655280963-6605-2-git-send-email-wangmy@fujitsu.com |
|---|---|
| State | Accepted, archived |
| Commit | bb87788832ad64079609e4f554e4d55a14f0aa94 |
| Headers | show |
| Series | erofs-utils: upgrade 1.4 -> 1.5 | expand |
On Wed, 15 Jun 2022 at 10:16, wangmy <wangmy@fujitsu.com> wrote: > License-Update: changed from "GPL-2.0-or-later" to "GPL-2.0+" ... > -LICENSE = "GPL-2.0-or-later" > +LICENSE = "GPL-2.0+" > SECTION = "base" > -LIC_FILES_CHKSUM = "file://COPYING;md5=94fa01670a2a8f2d3ab2de15004e0848" > +LIC_FILES_CHKSUM = "file://COPYING;md5=73001d804ea1e3d84365f652242cca20" The license-update notice should be an explanation of what changed in the COPYING file, not just repeat the LICENSE change. Alex
I believe this is the change: it's actually about relicensing the library to be gpl or apache: https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/COPYING?id=49b344c5531a7819f282b0b1b6eb01682c0e41ae As we do not package the library separately, I think you should make a comment in the recipe that # liberofs also available under Apache 2.0 and make a similar note in the commit message. Alex On Wed, 15 Jun 2022 at 10:32, Alexander Kanavin <alex.kanavin@gmail.com> wrote: > > On Wed, 15 Jun 2022 at 10:16, wangmy <wangmy@fujitsu.com> wrote: > > License-Update: changed from "GPL-2.0-or-later" to "GPL-2.0+" > > ... > > > -LICENSE = "GPL-2.0-or-later" > > +LICENSE = "GPL-2.0+" > > SECTION = "base" > > -LIC_FILES_CHKSUM = "file://COPYING;md5=94fa01670a2a8f2d3ab2de15004e0848" > > +LIC_FILES_CHKSUM = "file://COPYING;md5=73001d804ea1e3d84365f652242cca20" > > The license-update notice should be an explanation of what changed in > the COPYING file, not just repeat the LICENSE change. > > Alex
diff --git a/meta/recipes-devtools/erofs-utils/erofs-utils/0001-fsck-main.c-add-missing-include.patch b/meta/recipes-devtools/erofs-utils/erofs-utils/0001-fsck-main.c-add-missing-include.patch deleted file mode 100644 index c3b3c0bd56..0000000000 --- a/meta/recipes-devtools/erofs-utils/erofs-utils/0001-fsck-main.c-add-missing-include.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 821778286843b8e88d0cd73a97d20b5a2fff8ea1 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Mon, 6 Dec 2021 20:12:54 +0100 -Subject: [PATCH] fsck/main.c: add missing include - -Otherwise musl C library builds fail with missing S_IFMT/S_IFDIR -definitions. - -Upstream-Status: Submitted [email to linux-erofs@lists.ozlabs.org,hsiangkao@linux.alibaba.com] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - fsck/main.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/fsck/main.c b/fsck/main.c -index aefa881..ad48e35 100644 ---- a/fsck/main.c -+++ b/fsck/main.c -@@ -6,6 +6,7 @@ - #include <stdlib.h> - #include <getopt.h> - #include <time.h> -+#include <sys/stat.h> - #include "erofs/print.h" - #include "erofs/io.h" - #include "erofs/decompress.h" diff --git a/meta/recipes-devtools/erofs-utils/erofs-utils_1.4.bb b/meta/recipes-devtools/erofs-utils/erofs-utils_1.5.bb similarity index 69% rename from meta/recipes-devtools/erofs-utils/erofs-utils_1.4.bb rename to meta/recipes-devtools/erofs-utils/erofs-utils_1.5.bb index e5e19e75b4..4231b3ca67 100644 --- a/meta/recipes-devtools/erofs-utils/erofs-utils_1.4.bb +++ b/meta/recipes-devtools/erofs-utils/erofs-utils_1.5.bb @@ -1,13 +1,11 @@ SUMMARY = "Tools for erofs filesystems" -LICENSE = "GPL-2.0-or-later" +LICENSE = "GPL-2.0+" SECTION = "base" -LIC_FILES_CHKSUM = "file://COPYING;md5=94fa01670a2a8f2d3ab2de15004e0848" +LIC_FILES_CHKSUM = "file://COPYING;md5=73001d804ea1e3d84365f652242cca20" HOMEPAGE = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/README" -SRCREV = "ee97fe5fb77c737df0f77d92ab0d92edd3a11be6" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git;branch=master \ - file://0001-fsck-main.c-add-missing-include.patch \ - " +SRCREV = "a2821a66b42aee5430bccee82c280e38d1e9ab29" +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git;branch=master" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(\d+(\.\d+)+))"
0001-fsck-main.c-add-missing-include.patch removed since it's included in 1.5. License-Update: changed from "GPL-2.0-or-later" to "GPL-2.0+" Changelog: ========== * This release includes the following updates: - (fsck.erofs) support filesystem extraction (Igor Ostapenko); - support ztailpacking inline feature for compressed files (Yue Hu); - (dump.erofs) support listing directories; - more liberofs APIs (including iterate APIs) (me, Kelvin Zhang); - use mtime to allow more control over the timestamps (David Anderson); - switch to GPL-2.0+ OR Apache-2.0 dual license for liberofs; - various bugfixes and cleanups; Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- ...0001-fsck-main.c-add-missing-include.patch | 26 ------------------- ...{erofs-utils_1.4.bb => erofs-utils_1.5.bb} | 10 +++---- 2 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 meta/recipes-devtools/erofs-utils/erofs-utils/0001-fsck-main.c-add-missing-include.patch rename meta/recipes-devtools/erofs-utils/{erofs-utils_1.4.bb => erofs-utils_1.5.bb} (69%)