From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp2.axis.com (smtp2.axis.com [195.60.68.18]) by mail.openembedded.org (Postfix) with ESMTP id AB28D7FE32 for ; Wed, 22 Jan 2020 01:09:16 +0000 (UTC) IronPort-SDR: WKm23pivll1E6aq4IKQoO3f+DaUhGv+qWf0QtVI0Kxx9g6QZmFyf+gg8kCGfNniFuKRNhwoHPa S1S/EmVR9MtQlrCU/XTtPEev+zRxrerDx+cQmFrhYG6yoj5IyIEzD1E6nPhol5mswESztjKdHh VLEcBkQlXX0LvebFDnmjnanFLn0jQ8R1VLs3qBdUZqGqSLbt9PlYaeHCZLGbU62LxcotAlInJ0 VYYLvCH/0WtauCy5BORBNWbAKd/OEBQ+ZjKvjAfQFeLUHn5xFdmezEJS3a+wJVcRrmlfrR/UKe EAU= X-IronPort-AV: E=Sophos;i="5.70,347,1574118000"; d="scan'208";a="4512707" From: Peter Kjellerstedt To: Pierre-Jean Texier Thread-Topic: [OE-core] [PATCH] util-linux: upgrade 2.34 -> 2.35 Thread-Index: AQHV0IjDxtPfNIHv70SJ7rFonf4yWKf12bYQ Date: Wed, 22 Jan 2020 01:09:16 +0000 Message-ID: <704f1c5c4ce4491ab0bb79ae92369cf7@XBOX03.axis.com> References: <1579631324-16775-1-git-send-email-pjtexier@koncepto.io> In-Reply-To: <1579631324-16775-1-git-send-email-pjtexier@koncepto.io> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.0.5.60] MIME-Version: 1.0 Cc: Patches and discussions about the oe-core layer Subject: Re: [PATCH] util-linux: upgrade 2.34 -> 2.35 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jan 2020 01:09:17 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable > -----Original Message----- > From: openembedded-core-bounces@lists.openembedded.org bounces@lists.openembedded.org> On Behalf Of Pierre-Jean Texier via > Openembedded-core > Sent: den 21 januari 2020 19:29 > To: openembedded-core@lists.openembedded.org > Subject: [OE-core] [PATCH] util-linux: upgrade 2.34 -> 2.35 >=20 > License-Update: add GPLv3 text >=20 > Drop upstreamed patch >=20 > See full changelog https://lore.kernel.org/util- > linux/20200121105711.zzeeolydlivqnik7@ws.net.home/T/#u >=20 > Signed-off-by: Pierre-Jean Texier > --- > meta/recipes-core/util-linux/util-linux.inc | 5 +-- > ...lsblk-force-to-print-PKNAME-for-partition.patch | 36 ----------------= - > ----- > .../{util-linux_2.34.bb =3D> util-linux_2.35.bb} | 5 ++- > 3 files changed, 5 insertions(+), 41 deletions(-) > delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-lsblk- > force-to-print-PKNAME-for-partition.patch > rename meta/recipes-core/util-linux/{util-linux_2.34.bb =3D> util- > linux_2.35.bb} (58%) >=20 > diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes- > core/util-linux/util-linux.inc > index 179cb3d..0f8a6c2 100644 > --- a/meta/recipes-core/util-linux/util-linux.inc > +++ b/meta/recipes-core/util-linux/util-linux.inc > @@ -6,11 +6,12 @@ disk partitioning, kernel message management, filesyste= m > creation, and system lo >=20 > SECTION =3D "base" >=20 > -LICENSE =3D "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause" > +LICENSE =3D "GPLv2+ & GPLv3+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause" This will not work. There are way too many dependencies on util-linux=20 throughout OE-Core to be able to work with all its packages being=20 marked as GPL-3.0. A quick check reveals that it is only hwclock that=20 is affected. You will need to modify the packaging so that only the=20 util-linux-hwclock package gets the GPL-3.0 stamp. //Peter > -LIC_FILES_CHKSUM =3D "file://README.licensing;md5=3D972a134f1e14b2b060e3= 65df2fab0099 \ > +LIC_FILES_CHKSUM =3D "file://README.licensing;md5=3D0fd5c050c6187d2bf0a4= 492b7f4e33da \ > file://COPYING;md5=3Db234ee4d69f5fce4486a80fdaf4a426= 3 \ > file://Documentation/licenses/COPYING.GPL-2.0-or-lat= er;md5=3Db234ee4d69f5fce4486a80fdaf4a4263 \ > + file://Documentation/licenses/COPYING.GPL-3.0-or-lat= er;md5=3D1ebbd3e34237af26da5dc08a4e440464 \ > file://Documentation/licenses/COPYING.LGPL-2.1-or-la= ter;md5=3D4fbd65380cdd255951079008b364516c \ > file://Documentation/licenses/COPYING.BSD-3-Clause;m= d5=3D58dcd8452651fc8b07d1f65ce07ca8af \ > file://Documentation/licenses/COPYING.BSD-4-Clause-U= C;md5=3D263860f8968d8bafa5392cab74285262 \ > diff --git a/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to- > print-PKNAME-for-partition.patch b/meta/recipes-core/util-linux/util- > linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch > deleted file mode 100644 > index 5d4c148..0000000 > --- a/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print- > PKNAME-for-partition.patch > +++ /dev/null > @@ -1,36 +0,0 @@ > -From e3bb9bfb76c17b1d05814436ced62c05c4011f48 Mon Sep 17 00:00:00 2001 > -From: Karel Zak > -Date: Thu, 27 Jun 2019 09:22:18 +0200 > -Subject: [PATCH] lsblk: force to print PKNAME for partition > - > -PKNAME (parent kernel device name) is based on printed tree according > -to parent -> child relationship. The tree is optional and not printed > -if partition specified (.e.g "lsblk -o+PKNAME /dev/sda1"), but old > -versions print the PKNAME also in this case. > - > -Upstream-Status: Backport [https://github.com/karelzak/util- > linux/commit/e3bb9bfb76c17b1d05814436ced62c05c4011f48] > - > -Addresses: https://github.com/karelzak/util-linux/issues/813 > -Signed-off-by: Karel Zak > -Signed-off-by: Liwei Song > ---- > - misc-utils/lsblk.c | 3 +++ > - 1 file changed, 3 insertions(+) > - > -diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c > -index e95af7af0256..3ce6da730264 100644 > ---- a/misc-utils/lsblk.c > -+++ b/misc-utils/lsblk.c > -@@ -1019,6 +1019,9 @@ static void device_to_scols( > - DBG(DEV, ul_debugobj(dev, "add '%s' to scols", dev->name)); > - ON_DBG(DEV, if (ul_path_isopen_dirfd(dev->sysfs)) > ul_debugobj(dev, " %s ---> is open!", dev->name)); > - > -+ if (!parent && dev->wholedisk) > -+ parent =3D dev->wholedisk; > -+ > - /* Do not print device more than one in --list mode */ > - if (!(lsblk->flags & LSBLK_TREE) && dev->is_printed) > - return; > --- > -2.17.1 > - > diff --git a/meta/recipes-core/util-linux/util-linux_2.34.bb > b/meta/recipes-core/util-linux/util-linux_2.35.bb > similarity index 58% > rename from meta/recipes-core/util-linux/util-linux_2.34.bb > rename to meta/recipes-core/util-linux/util-linux_2.35.bb > index e9c2d80..71f7cd1 100644 > --- a/meta/recipes-core/util-linux/util-linux_2.34.bb > +++ b/meta/recipes-core/util-linux/util-linux_2.35.bb > @@ -7,7 +7,6 @@ SRC_URI +=3D "file://configure-sbindir.patch \ > file://run-ptest \ > file://display_testname_for_subtest.patch \ > file://avoid_parallel_tests.patch \ > - file://0001-lsblk-force-to-print-PKNAME-for-partition.patch = \ > " > -SRC_URI[md5sum] =3D "a78cbeaed9c39094b96a48ba8f891d50" > -SRC_URI[sha256sum] =3D > "743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5" > +SRC_URI[md5sum] =3D "479488469f057ddeed0d3ca7d6ab5f16" > +SRC_URI[sha256sum] =3D > "b3081b560268c1ec3367e035234e91616fa7923a0afc2b1c80a2a6d8b9dfe2c9" > -- > 2.7.4