All of lore.kernel.org
 help / color / mirror / Atom feed
From: luca.boccassi@gmail.com
To: openembedded-core@lists.openembedded.org
Subject: [PATCH] util-linux: split uuid in separate recipe to allow bootstrapping
Date: Thu,  5 Dec 2019 20:13:05 +0000	[thread overview]
Message-ID: <20191205201305.12854-1-luca.boccassi@gmail.com> (raw)

From: Luca Boccassi <luca.boccassi@microsoft.com>

In the next release util-linux will gain an (optional) build
dependency on libcryptsetup. But libcryptsetup build-depends on
util-linux for blkid (optional, can be disabled) and uuid (mandatory).
Split out util-linux-uuid in a different recipe to break the cycle.

https://github.com/karelzak/util-linux/pull/898

Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
---
util-linux 2.35 is not out yet, but I'd like to get the preparatory work
underway as I'm not sure if this is the best approach or if there are
alternatives. Suggestions and comments very welcome. Thanks!

 .../util-linux/util-linux-uuid_2.34.bb        | 35 +++++++++++++++++++
 meta/recipes-core/util-linux/util-linux.inc   |  6 ++++
 meta/recipes-extended/wget/wget.inc           |  2 +-
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-core/util-linux/util-linux-uuid_2.34.bb

diff --git a/meta/recipes-core/util-linux/util-linux-uuid_2.34.bb b/meta/recipes-core/util-linux/util-linux-uuid_2.34.bb
new file mode 100644
index 0000000000..f106c6a18c
--- /dev/null
+++ b/meta/recipes-core/util-linux/util-linux-uuid_2.34.bb
@@ -0,0 +1,35 @@
+SUMMARY = "Builds libuuid separately from util-linux for bootstrapping"
+HOMEPAGE = "http://userweb.kernel.org/~kzak/util-linux/"
+
+SECTION = "base"
+
+LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause"
+
+LIC_FILES_CHKSUM = "file://README.licensing;md5=972a134f1e14b2b060e365df2fab0099 \
+                    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \
+                    file://Documentation/licenses/COPYING.BSD-3-Clause;md5=58dcd8452651fc8b07d1f65ce07ca8af \
+                    file://Documentation/licenses/COPYING.BSD-4-Clause-UC;md5=263860f8968d8bafa5392cab74285262 \
+                    file://libuuid/COPYING;md5=6d2cafc999feb2c2de84d4d24b23290c \
+                    file://libmount/COPYING;md5=7c7e39fb7d70ffe5d693a643e29987c2 \
+                    file://libblkid/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04"
+
+MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${MAJOR_VERSION}.tar.xz \
+           "
+
+SRC_URI[md5sum] = "a78cbeaed9c39094b96a48ba8f891d50"
+SRC_URI[sha256sum] = "743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5"
+
+inherit autotools gettext pkgconfig
+
+S = "${WORKDIR}/util-linux-${PV}"
+EXTRA_OECONF += "--disable-all-programs --enable-libuuid"
+RPROVIDES_libuuid-dev = "util-linux-libuuid-dev"
+RPROVIDES_libuuid = "util-linux-libuuid"
+
+do_install_append() {
+	rmdir ${D}${bindir} ${D}${sbindir}
+	rm -rf ${D}${datadir}
+}
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 1fa82363b1..ef6f95776a 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -288,6 +288,12 @@ ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1"
 ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3"
 ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1"
 
+# split uuid out to allow in the near future a build-dependency on packages depending on it
+RPROVIDES_remove_class-target_${PN}-dev = "util-linux-libuuid-dev"
+PACKAGES_remove_class-target = "libuuid1 util-linux-libuuid1"
+DEPENDS_append_class-target = " util-linux-uuid"
+EXTRA_OECONF_remove_class-target = "--enable-libuuid"
+EXTRA_OECONF_append_class-target = " --disable-libuuid"
 
 BBCLASSEXTEND = "native nativesdk"
 
diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
index 2338328216..7b7a3fae7a 100644
--- a/meta/recipes-extended/wget/wget.inc
+++ b/meta/recipes-extended/wget/wget.inc
@@ -32,7 +32,7 @@ PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls"
 PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
 PACKAGECONFIG[iri] = "--enable-iri,--disable-iri,libidn2"
 PACKAGECONFIG[libpsl] = "--with-libpsl,--without-libpsl,libpsl"
-PACKAGECONFIG[libuuid] = "--with-libuuid,--without-libuuid,util-linux"
+PACKAGECONFIG[libuuid] = "--with-libuuid,--without-libuuid,util-linux-uuid"
 PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl"
 PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre"
 PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
-- 
2.20.1



             reply	other threads:[~2019-12-05 20:13 UTC|newest]

Thread overview: 74+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-05 20:13 luca.boccassi [this message]
2019-12-05 23:29 ` [PATCH] util-linux: split uuid in separate recipe to allow bootstrapping Ross Burton
2019-12-09 16:24 ` [PATCH v2] " luca.boccassi
2020-11-23 13:28   ` [PATCH v3] " Luca Bocassi
2020-12-10 15:52     ` [OE-core] " Richard Purdie
2020-12-10 18:47       ` Luca Boccassi
2020-12-10 20:04         ` Richard Purdie
2020-12-11  9:51           ` Luca Boccassi
2020-12-11 16:54             ` Richard Purdie
2020-12-14 16:32               ` Luca Boccassi
2020-12-10 18:46     ` [PATCH v4] " Luca Bocassi
2021-01-19 20:52       ` Richard Purdie
2021-01-19 23:13         ` [OE-core] " Paul Eggleton
2021-01-19 23:23           ` Richard Purdie
2021-01-19 23:28             ` Paul Eggleton
2021-02-25 15:31               ` Luca Bocassi
2021-02-25 15:30       ` [PATCH v5] " Luca Bocassi
2021-02-26 19:02         ` [OE-core] " Khem Raj
2021-03-02 19:01           ` Luca Bocassi
2021-02-27 14:52         ` Alexandre Belloni
2021-02-27 15:08           ` Alexandre Belloni
2021-02-27 15:15             ` Alexandre Belloni
2021-03-02 17:31               ` Luca Bocassi
2021-03-02 18:49                 ` Alexandre Belloni
2021-03-03 22:30         ` Richard Purdie
2021-03-04 12:05           ` Luca Bocassi
2021-03-04 12:27       ` [PATCH v6] " Luca Bocassi
2021-03-05  0:13         ` Richard Purdie
2021-03-05 11:03           ` Luca Bocassi
2021-03-05 11:02       ` [PATCH v7] " Luca Bocassi
2021-03-08 19:29         ` Richard Purdie
2021-03-09 11:07           ` Luca Bocassi
2021-03-09 11:18           ` [OE-core] " Kory Maincent
2021-03-09 13:26             ` Luca Bocassi
2021-03-09 13:47               ` Kory Maincent
2021-03-09 13:48                 ` Richard Purdie
2021-03-09 13:56                   ` Luca Bocassi
2021-03-09 11:13       ` [PATCH v8] " Luca Bocassi
2021-03-09 13:56       ` [PATCH v9] " Luca Bocassi
2021-03-09 23:43         ` Richard Purdie
2021-03-10 18:28           ` Luca Bocassi
2021-03-11 10:15             ` Luca Bocassi
2021-03-11 10:31               ` Richard Purdie
2021-03-11 14:37                 ` Luca Bocassi
2021-03-11 14:38       ` [PATCH v10] " Luca Bocassi
2021-03-11 14:44         ` Richard Purdie
2021-03-11 15:10           ` Luca Bocassi
2021-03-11 15:09       ` [PATCH v11] " Luca Bocassi
2021-03-14 22:10         ` Richard Purdie
2021-03-15 10:44           ` Luca Bocassi
2021-03-15 10:49             ` Richard Purdie
2021-03-15 11:50               ` Luca Bocassi
2021-03-15 12:21                 ` Richard Purdie
2021-03-15 13:04                   ` Luca Bocassi
2021-03-15 13:55                   ` [OE-core] " Martin Jansa
2021-03-15 13:57                     ` Richard Purdie
     [not found]                     ` <166C88B2CBAB1BAF.20509@lists.openembedded.org>
2021-03-15 21:51                       ` Richard Purdie
2021-03-24 16:52                         ` Scott Branden
2021-03-24 17:03                           ` Luca Boccassi
2021-03-24 17:37                             ` Richard Purdie
2021-03-24 17:52                               ` Luca Bocassi
2021-03-25  9:17         ` Oleksiy Obitotskyy
2021-03-25  9:34           ` Richard Purdie
2021-03-25  9:48             ` Luca Bocassi
2021-03-25 14:22             ` Peter Kjellerstedt
2021-03-25 14:27               ` Richard Purdie
2021-03-25 15:45                 ` Luca Bocassi
2021-03-25 16:01                   ` Khem Raj
2021-03-25 16:19                 ` Peter Kjellerstedt
2021-03-25 16:51                   ` Richard Purdie
2021-03-26 18:06                     ` Peter Kjellerstedt
2021-03-26 18:12                       ` Richard Purdie
2021-03-26 18:22                         ` Andre McCurdy
2019-12-09 16:33 ` [PATCH] " Luca Boccassi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191205201305.12854-1-luca.boccassi@gmail.com \
    --to=luca.boccassi@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.