From patchwork Sat Aug 24 22:45:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 48173 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A21F9C5472C for ; Sat, 24 Aug 2024 22:45:58 +0000 (UTC) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mx.groups.io with SMTP id smtpd.web10.22629.1724539549388920002 for ; Sat, 24 Aug 2024 15:45:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=MBweGEzq; spf=pass (domain: gmail.com, ip: 209.85.210.175, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-71434174201so2633709b3a.0 for ; Sat, 24 Aug 2024 15:45:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724539548; x=1725144348; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=T5DiUY7hP5h3OlZzphYwZYLfpmBIBdCkLoaE8qL8Fbo=; b=MBweGEzqpbZ+MkqekfoyNtmMrPgPQkGk9CYXIoaJvIijMs7IHEVYdYnxF6hiz78jGQ 9la26a27SthTVaWd0K1I7tucedY3MAK9in0sadIurszj7FrSFTBpWDaoTeJyXBHczmuC 56+VVPXDVpXSja+EEixZVCVvSqzN6XXPmjlD7pKE2C0v4Dz2M5RagC8yLNPdFGs7o0Zb oifwr8wS7VRSlmvheZSgNsMaNu02b8rrqPdVamHOArPySEgRe7O5eDbusp0nqI+kGiZA hdjnqGoHO/7cp4vYsvCdSXmdTMD8BV0XaTBa1I5csucb3yixmkJzTcVGIdmNjy0r2hNE mZpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724539548; x=1725144348; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=T5DiUY7hP5h3OlZzphYwZYLfpmBIBdCkLoaE8qL8Fbo=; b=Klt50twYuAJrZQkBFXkrQQ+zJNJyDa8pVd9NyrhtGDhU+GyI6f3WXk7ePdfFvYbRaV Aq/sQ1IrUGsn5Zo5lDV8PpZBDA7FHAaFrGF2uit01WfV2TYW8OUbBJIHQhfxDmLI6GXt TEykWxhDQkXeC2JwTwtgJ/s+k9iHLQQ/Sov8wI2YudXw4IXIFjAs1f+tsawCNOlLp1kn ZoGiJVtWB0YVYhFWzJoi0uZd1wynGn0z/QM8J1YpI3508Q4G4XcTvRiP6LB1kESsf0UP rJTNULV2M9F0Tv+Vwtj8gTkmtEyCAcEtAOjJrifRIVZZye7HPdvWNvLdU66/28K8cyNW hECA== X-Gm-Message-State: AOJu0YwU+BejEGtyWqhzuixx7jJtzm48vg1BR9xRm8dF2/wXOoPxbE3t z406p8dakss3jeOelPcTQ/zcVq/nPj/K9KTAelvJFeiysXjjrNrcaLW3sQ== X-Google-Smtp-Source: AGHT+IEUWdPMAU4siqiOLK75WT5Rwkg38Q2SgFf+k/BhKsslZ+tJEerV4J523k3tSaSl55ems8q5TQ== X-Received: by 2002:a05:6a00:1794:b0:70d:2a5d:867f with SMTP id d2e1a72fcca58-7144584edc7mr8434573b3a.21.1724539548269; Sat, 24 Aug 2024 15:45:48 -0700 (PDT) Received: from apollo.localdomain ([2601:646:9d80:4380::77e7]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-714343388a1sm4914817b3a.184.2024.08.24.15.45.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Aug 2024 15:45:47 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 1/4] raptor2: Do not use curl-config to detect curl Date: Sat, 24 Aug 2024 15:45:42 -0700 Message-ID: <20240824224545.1944956-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 24 Aug 2024 22:45:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/111922 it fails in cross build environment, use pkg-config instead Signed-off-by: Khem Raj --- .../raptor-2.0.16-dont_use_curl-config.patch | 73 +++++++++++++++++++ .../recipes-support/raptor2/raptor2_2.0.16.bb | 6 +- 2 files changed, 76 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-support/raptor2/raptor2/raptor-2.0.16-dont_use_curl-config.patch diff --git a/meta-oe/recipes-support/raptor2/raptor2/raptor-2.0.16-dont_use_curl-config.patch b/meta-oe/recipes-support/raptor2/raptor2/raptor-2.0.16-dont_use_curl-config.patch new file mode 100644 index 0000000000..b12beff6cb --- /dev/null +++ b/meta-oe/recipes-support/raptor2/raptor2/raptor-2.0.16-dont_use_curl-config.patch @@ -0,0 +1,73 @@ +Do not use curl-config + +Sourced from +https://bugs.gentoo.org/552474 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- a/configure.ac ++++ b/configure.ac +@@ -596,49 +596,12 @@ else + PKG_CHECK_MODULES([XSLT], [libxslt > $libxslt_min_version], [have_libxslt=1], [have_libxslt=0]) + fi + +-dnl curl +-AC_ARG_WITH(curl-config, [ --with-curl-config=PATH Location of libcurl curl-config []], curl_config="$withval", curl_config="") +- +-if test "X$curl_config" != "Xno" ; then +- if test "X$curl_config" != "X" ; then +- AC_MSG_CHECKING(for $curl_config) +- +- if test -f $curl_config ; then +- CURL_CONFIG=$curl_config +- AC_MSG_RESULT(yes) +- else +- AC_MSG_RESULT(no - searching PATH) +- fi +- fi +- if test "X$CURL_CONFIG" = "X" ; then +- AC_CHECK_PROGS(CURL_CONFIG, curl-config) +- fi +-fi +- + libcurl_source=no +-if test "X$CURL_CONFIG" != "X"; then +- LIBCURL_CFLAGS=`$CURL_CONFIG --cflags` +- LIBCURL_LIBS=`$CURL_CONFIG --libs` +- +- CPPFLAGS="$LIBCURL_CFLAGS $CPPFLAGS" +- LIBS="$LIBS $LIBCURL_LIBS" +- AC_CHECK_HEADER(curl/curl.h) +- AC_CHECK_FUNC(curl_easy_init, have_curl_easy_init=yes, have_curl_easy_init=no) +- +- AC_MSG_CHECKING(for libcurl via curl-config) +- if test $have_curl_easy_init = yes; then +- libcurl_source="curl-config" +- LIBCURL_VERSION=`$CURL_CONFIG --version | sed -e 's/^libcurl *//'` +- fi +- CPPFLAGS="$oCPPFLAGS" +- LIBS="$oLIBS" +-else +- PKG_CHECK_MODULES([LIBCURL],[libcurl],[ +- LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion` +- libcurl_source="pkg-config" +- ], [:]) +- AC_MSG_CHECKING(for libcurl via pkg-config) +-fi ++PKG_CHECK_MODULES([LIBCURL],[libcurl],[ ++ LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion` ++ libcurl_source="pkg-config" ++], [:]) ++AC_MSG_CHECKING(for libcurl via pkg-config) + + if test "$libcurl_source" = "no"; then + AC_MSG_RESULT(no - not found) +@@ -1033,7 +996,7 @@ need_libcurl=0 + need_libxml_www=0 + need_libfetch=0 + +-if test "X$CURL_CONFIG" != X; then ++if test "$libcurl_source" != "no"; then + CPPFLAGS="$CPPFLAGS $LIBCURL_CFLAGS" + LIBS="$LIBS $LIBCURL_LIBS" + AC_CHECK_HEADER(curl/curl.h) diff --git a/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb b/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb index 85012bcfb3..7014a28c02 100644 --- a/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb +++ b/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb @@ -7,18 +7,18 @@ LIC_FILES_CHKSUM = " \ file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ " -DEPENDS = "libxml2 libxslt curl yajl" +DEPENDS = "bison-native flex-native libxml2 libxslt curl yajl" SRC_URI = " \ http://download.librdf.org/source/${BPN}-${PV}.tar.gz \ file://0001-Remove-the-access-to-entities-checked-private-symbol.patch \ + file://raptor-2.0.16-dont_use_curl-config.patch \ " SRC_URI[sha256sum] = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680" -inherit autotools pkgconfig gtk-doc +inherit autotools pkgconfig gtk-doc perlnative EXTRA_OECONF = " \ --without-xml2-config \ - --without-curl-config \ --without-xslt-config \ " From patchwork Sat Aug 24 22:45:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 48174 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A34D9C5472E for ; Sat, 24 Aug 2024 22:45:58 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web11.22411.1724539550645797958 for ; Sat, 24 Aug 2024 15:45:50 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=NIztwCWU; spf=pass (domain: gmail.com, ip: 209.85.210.172, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-7142448aaf9so2138448b3a.1 for ; Sat, 24 Aug 2024 15:45:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724539550; x=1725144350; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FJ0Sj4tSJwbtP2maom/FO85lfuMAx0V4rbXXLTVn7F0=; b=NIztwCWUJSsH4cZ/fw0lWRqq53EM4qcCGDuReT27w0n5zxx/zKzD4E5ST9pUbUeyNa J3uAQLBM9J1+fosjKQn5KHPO8+hq8KlRgc6gZI18p24WIFKBirq9wOFeJ24c8S/uUW5+ f7SDwlJa1RzF2WSJSs9gFoYEkp1fNmsMJ0OxbIva/C3exTfPAHJZR3ChuUfoNgRg4GhB t69VOG29fFzYVeL1FSqHytbKPSAFq/MfXSJgCvZ1DiVQxP5CPkjZVMK6x0xEf3RlwWL5 5ei8PZMBtkc/eZm/9muhnW6iwkR+xsnQ1Mw2+imK8BMFG2rm6HJZfXKHJivqeAttQp+5 jl9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724539550; x=1725144350; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FJ0Sj4tSJwbtP2maom/FO85lfuMAx0V4rbXXLTVn7F0=; b=eB7l7qYmuUvtqasEtacuFXse5PeOMElOtRn2eoli3tQeX8eNgUYvWhV2D/7kw79YS3 dYRyihj8sikJLMYeFvwK+mGgjgTk7vwOGwBElzVdHyr/CmG7aN0iUx8Mb0FZ3QjTUxdP HTiW25ZYftJBVXzv5Qa5IRCy9An8wAiwp0dnZv/wzI44h+i5DmDjR5VGNHby/fJ/wbsh 2wo6XN9qKWRA7lDUEpGD8CssUpGKi7tqO1EU5LkwC6vsSBaNUaXyeBj3p6DssoyEp/8V 9MbL7dw3CzDW81d2BZRMBXIgrfSj4UTalXHMU+H2bkV9/BY/S82CtAn0p/9189dERn24 v47Q== X-Gm-Message-State: AOJu0Yzbiv52cz6xcnE7dtLAS18hX2CM7kWbX+qiz8uMNhNcTpi42acV 1fJ0aHzM9qCHk6j7U3scVplTrpNxppqxgRXlkvD54yUXLi1ZkTqeo5WAjA== X-Google-Smtp-Source: AGHT+IEOdavB7hTOtx5zos0N2+ZuQ1U6BSsz3RT3I2BHLUl9PJSVXd4cP20OVoWUdXE9LGOB+K5aJg== X-Received: by 2002:a05:6a00:8d46:b0:70e:cf99:adc7 with SMTP id d2e1a72fcca58-7143170e1d0mr16054145b3a.3.1724539549603; Sat, 24 Aug 2024 15:45:49 -0700 (PDT) Received: from apollo.localdomain ([2601:646:9d80:4380::77e7]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-714343388a1sm4914817b3a.184.2024.08.24.15.45.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Aug 2024 15:45:48 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-gnome][PATCH 2/4] libgsf: Fix build with libxml2 2.13+ Date: Sat, 24 Aug 2024 15:45:43 -0700 Message-ID: <20240824224545.1944956-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240824224545.1944956-1-raj.khem@gmail.com> References: <20240824224545.1944956-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 24 Aug 2024 22:45:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/111923 Signed-off-by: Khem Raj --- ...lation-attempt-fixes-for-libxml-2.13.patch | 105 ++++++++++++++++++ .../recipes-gnome/libgsf/libgsf_1.14.52.bb | 3 +- 2 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 meta-gnome/recipes-gnome/libgsf/libgsf/0001-Compilation-attempt-fixes-for-libxml-2.13.patch diff --git a/meta-gnome/recipes-gnome/libgsf/libgsf/0001-Compilation-attempt-fixes-for-libxml-2.13.patch b/meta-gnome/recipes-gnome/libgsf/libgsf/0001-Compilation-attempt-fixes-for-libxml-2.13.patch new file mode 100644 index 0000000000..08ff51205a --- /dev/null +++ b/meta-gnome/recipes-gnome/libgsf/libgsf/0001-Compilation-attempt-fixes-for-libxml-2.13.patch @@ -0,0 +1,105 @@ +From 4a84e9857d83f684bf53d616942a393ce558a328 Mon Sep 17 00:00:00 2001 +From: Morten Welinder +Date: Wed, 3 Jul 2024 19:18:15 -0400 +Subject: [PATCH] Compilation: attempt fixes for libxml 2.13 + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libgsf/-/commit/5d4bb55095d3d6ef793c1908a88504183e28644c] +Signed-off-by: Khem Raj +--- + configure.ac | 1 + + gsf/gsf-input-http.c | 19 +++++++++++++++++++ + 2 files changed, 20 insertions(+) + +diff --git a/configure.ac b/configure.ac +index fceb776..7c2f946 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -238,6 +238,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[(void)g_chown("/ + AC_MSG_RESULT(yes)], + [AC_MSG_RESULT(no)]) + AC_CHECK_FUNCS(g_date_time_new_from_iso8601 g_date_time_format_iso8601) ++AC_CHECK_FUNCS(xmlNanoHTTPOpen xmlNanoHTTPClose) + CFLAGS=$SAVE_CFLAGS + LIBS=$SAVE_LIBS + +diff --git a/gsf/gsf-input-http.c b/gsf/gsf-input-http.c +index bdde3c8..03f4045 100644 +--- a/gsf/gsf-input-http.c ++++ b/gsf/gsf-input-http.c +@@ -23,7 +23,10 @@ + #include + #include + ++#ifdef HAVE_XMLNANOHTTPOPEN ++// It's going away, so make it conditional + #include ++#endif + + struct _GsfInputHTTP { + GsfInput input; +@@ -74,7 +77,9 @@ gsf_input_http_finalize (GObject *obj_input) + input->content_type = NULL; + + if (input->ctx) { ++#ifdef HAVE_XMLNANOHTTPCLOSE + xmlNanoHTTPClose ((gpointer) input->ctx); ++#endif + input->ctx = NULL; + } + +@@ -215,6 +220,7 @@ gsf_input_http_get_content_type (GsfInputHTTP *input) + return content_type; + } + ++#ifdef HAVE_XMLNANOHTTPOPEN + static GsfInput * + make_local_copy (gpointer *ctx) + { +@@ -254,6 +260,7 @@ make_local_copy (gpointer *ctx) + + return copy; + } ++#endif + + /** + * gsf_input_http_new: +@@ -265,6 +272,7 @@ make_local_copy (gpointer *ctx) + GsfInput * + gsf_input_http_new (gchar const * url, GError **error G_GNUC_UNUSED) + { ++#ifdef HAVE_XMLNANOHTTPOPEN + GObject *obj; + GsfInput *input; + gpointer ctx; +@@ -293,6 +301,10 @@ gsf_input_http_new (gchar const * url, GError **error G_GNUC_UNUSED) + GSF_INPUT_HTTP (obj)->ctx = ctx; + + return GSF_INPUT (obj); ++#else ++ g_return_val_if_fail(url != NULL, NULL); ++ return NULL; ++#endif + } + + static GsfInput * +@@ -304,6 +316,7 @@ gsf_input_http_dup (GsfInput *src, GError **err) + static guint8 const * + gsf_input_http_read (GsfInput *input, size_t num_bytes, guint8 *buffer) + { ++#ifdef HAVE_XMLNANOHTTPOPEN + int nread; + size_t total_read; + gpointer ctx = GSF_INPUT_HTTP (input)->ctx; +@@ -324,6 +337,12 @@ gsf_input_http_read (GsfInput *input, size_t num_bytes, guint8 *buffer) + return NULL; + } + return buffer; ++#else ++ (void)input; ++ (void)num_bytes; ++ (void)buffer; ++ return NULL; ++#endif + } + + static gboolean diff --git a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb index 7e1842b1ac..97cbbe450c 100644 --- a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb +++ b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb @@ -10,7 +10,8 @@ GNOMEBASEBUILDCLASS = "autotools" inherit gnomebase gobject-introspection gettext gtk-doc SRC_URI[archive.sha256sum] = "9181c914b9fac0e05d6bcaa34c7b552fe5fc0961d3c9f8c01ccc381fb084bcf0" -SRC_URI += "file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch" +SRC_URI += "file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch \ + file://0001-Compilation-attempt-fixes-for-libxml-2.13.patch" PACKAGECONFIG ??= "" PACKAGECONFIG[gdk-pixbuf] = "--with-gdk-pixbuf,--without-gdk-pixbuf,gdk-pixbuf" From patchwork Sat Aug 24 22:45:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 48176 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB67CC52D6F for ; Sat, 24 Aug 2024 22:45:58 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web10.22630.1724539551935670718 for ; Sat, 24 Aug 2024 15:45:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=kwK7X4b4; spf=pass (domain: gmail.com, ip: 209.85.210.174, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-714287e4083so2804493b3a.2 for ; Sat, 24 Aug 2024 15:45:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724539551; x=1725144351; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rA5D6s5NC8KWD8wnGzdy+6jwj26QV7//tpl05VFTIdo=; b=kwK7X4b4PbtmnfAYAI+KBUEjw6oVvLuP/AXxCzOj8UMtNp7zmG6dwV8CbL2MNbn5S5 rIiFq4LvAjqhTFMCTsZaNYhq+ZrCypEprMSK/niwlSPeyYhXLKmjZ7FBlDIEEiUvEqCY aemdPDJTFWJsbJXAEEL/VDBaygl34vLrtDyD89cdC8bB43So7w/C9RRH3MTWaLWBPYwK 7CPIPSLOPpv4Qo4yKui7ta6+ujhz6OvMw9Jo4ijpssQvozVNYuI0jaIky4B1JsJXT/Sa 0ajlJIFe1EmS097UcMBfjtVF/Tv6g32Food/HwVz+odd10XkMMGlB6RnZRl1sx2K9F24 Sh/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724539551; x=1725144351; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rA5D6s5NC8KWD8wnGzdy+6jwj26QV7//tpl05VFTIdo=; b=mvPFR2nHm9bMhLvIODy1cVYY1IaV2H20vFmxdmlxH2LeaF1vQYZYWTXPrryufB3zra CAat3BT+1ZwhlS36qJ4tc9/PywN5dYprGMyeud5TD9jNDrEw/mSWEcDiJLO2FE2+9gTA QjljDyQu6LIpE6/QgtXWzTJxhY5tGOGbAXz5bkOkP8fNVV8JDY25hbNCQ9StrQxmJAhH J1qeTVkoo9EdjneLBXBtYYPsmQnh1S2tZIg38EV3fmA9PZ8Qx39nO83dH24HiD8eEbLO 0vNZ7NuDj1Za9vtSFN7w/l34oZd8ZAfqxteJNg6ZtkWc2ZL4t3b2NZyuXE6IsmM6H9c6 RCqg== X-Gm-Message-State: AOJu0YwL0vO6lh9Qk9YHY2oJ4Vmbz02I8xoGbci0lvAQrITUtDofqmn8 1AxWhrpb+xhI76I509qOpcRy4ecq2VkBOkmCt/2JIjhnqaQHKnvTD8a7yw== X-Google-Smtp-Source: AGHT+IGUD9IPU9Pb48a5dScZVEdl6heELt2LGCV3LNP9cs5l/p+NBrToEEucjhoyoxYqj+5F317eEg== X-Received: by 2002:a05:6a21:4610:b0:1c4:ba7c:741c with SMTP id adf61e73a8af0-1cc8b4affb6mr6710150637.21.1724539550868; Sat, 24 Aug 2024 15:45:50 -0700 (PDT) Received: from apollo.localdomain ([2601:646:9d80:4380::77e7]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-714343388a1sm4914817b3a.184.2024.08.24.15.45.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Aug 2024 15:45:50 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 3/4] libspatialite: Upgrade to 5.1 Date: Sat, 24 Aug 2024 15:45:44 -0700 Message-ID: <20240824224545.1944956-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240824224545.1944956-1-raj.khem@gmail.com> References: <20240824224545.1944956-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 24 Aug 2024 22:45:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/111924 - Drop the libtool patch its already fixed in this version - Add a patch to support libxml2 2.13+ Signed-off-by: Khem Raj --- ...oHTTPCleanup-with-LIBXML_HTTP_ENABLE.patch | 29 +++++++++++++++++++ .../libspatialite/libspatialite_macros.patch | 14 --------- .../libspatialite_pkgconfig.patch | 12 ++++---- ...ialite_5.0.1.bb => libspatialite_5.1.0.bb} | 5 ++-- 4 files changed, 37 insertions(+), 23 deletions(-) create mode 100644 meta-oe/recipes-navigation/libspatialite/libspatialite/0001-wfs-Cover-xmlNanoHTTPCleanup-with-LIBXML_HTTP_ENABLE.patch delete mode 100644 meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch rename meta-oe/recipes-navigation/libspatialite/{libspatialite_5.0.1.bb => libspatialite_5.1.0.bb} (82%) diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite/0001-wfs-Cover-xmlNanoHTTPCleanup-with-LIBXML_HTTP_ENABLE.patch b/meta-oe/recipes-navigation/libspatialite/libspatialite/0001-wfs-Cover-xmlNanoHTTPCleanup-with-LIBXML_HTTP_ENABLE.patch new file mode 100644 index 0000000000..daef7fab49 --- /dev/null +++ b/meta-oe/recipes-navigation/libspatialite/libspatialite/0001-wfs-Cover-xmlNanoHTTPCleanup-with-LIBXML_HTTP_ENABLE.patch @@ -0,0 +1,29 @@ +From 406e841b3e011e1090f23dba12b12cdd9ec4707e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 24 Aug 2024 15:19:35 -0700 +Subject: [PATCH] wfs: Cover xmlNanoHTTPCleanup with LIBXML_HTTP_ENABLED + +libxml2 has deprecated internal http support [1] + +[1] https://www.gaia-gis.it/fossil/libspatialite/tktview?name=7c452740fe + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/wfs/wfs_in.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/wfs/wfs_in.c b/src/wfs/wfs_in.c +index 1cfe39d..41ad2ab 100644 +--- a/src/wfs/wfs_in.c ++++ b/src/wfs/wfs_in.c +@@ -4638,7 +4638,9 @@ SPATIALITE_DECLARE void + reset_wfs_http_connection (void) + { + /* Resets the libxml2 "nano HTTP": useful when changing the HTTP_PROXY settings */ ++#ifdef LIBXML_HTTP_ENABLED + xmlNanoHTTPCleanup (); ++#endif + } + + #else /* LIBXML2 isn't enabled */ diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch b/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch deleted file mode 100644 index 6f1c165f58..0000000000 --- a/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Pending - -diff -rupN --no-dereference libspatialite-5.0.1/configure.ac libspatialite-5.0.1-new/configure.ac ---- libspatialite-5.0.1/configure.ac 2021-03-08 08:57:18.748858216 +0100 -+++ libspatialite-5.0.1-new/configure.ac 2021-03-08 08:57:18.751858215 +0100 -@@ -96,7 +96,7 @@ AC_PROG_INSTALL - AC_PROG_LN_S - AC_PROG_MAKE_SET - AC_LIBTOOL_WIN32_DLL --AC_PROG_LIBTOOL -+LT_INIT - - # Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch b/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch index de6e50a58d..4b381eda88 100644 --- a/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch +++ b/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch @@ -1,13 +1,13 @@ Upstream-Status: Pending -diff -rupN libspatialite-5.0.1/spatialite.pc.in libspatialite-5.0.1-new/spatialite.pc.in ---- libspatialite-5.0.1/spatialite.pc.in 2021-02-07 16:53:46.000000000 +0100 -+++ libspatialite-5.0.1-new/spatialite.pc.in 2021-02-10 09:54:09.647552994 +0100 -@@ -8,5 +8,6 @@ includedir=@includedir@ +--- a/spatialite.pc.in ++++ b/spatialite.pc.in +@@ -8,5 +8,7 @@ includedir=@includedir@ Name: spatialite Description: Spatial SQL database engine based on SQLite Version: @VERSION@ --Libs: -L${libdir} -lspatialite @LIBS@ @LIBXML2_LIBS@ -lm -+Libs.private: -L${libdir} @LIBS@ @LIBXML2_LIBS@ -lm +-Libs: -L${libdir} -lspatialite @LIBS@ @LIBXML2_LIBS@ @SQLITE3_LIBS@ -lm ++Libs.private: -L${libdir} @LIBS@ @LIBXML2_LIBS@ @SQLITE3_LIBS@ -lm +Libs: -L${libdir} -lspatialite ++ Cflags: -I${includedir} diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite_5.0.1.bb b/meta-oe/recipes-navigation/libspatialite/libspatialite_5.1.0.bb similarity index 82% rename from meta-oe/recipes-navigation/libspatialite/libspatialite_5.0.1.bb rename to meta-oe/recipes-navigation/libspatialite/libspatialite_5.1.0.bb index f46b1083e1..0fe0bb1197 100644 --- a/meta-oe/recipes-navigation/libspatialite/libspatialite_5.0.1.bb +++ b/meta-oe/recipes-navigation/libspatialite/libspatialite_5.1.0.bb @@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0e92e1a36cc384b60f5b31dde0bdd39e" SRC_URI = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${PV}.tar.gz \ file://libspatialite_geos.patch \ - file://libspatialite_macros.patch \ file://libspatialite_pkgconfig.patch \ + file://0001-wfs-Cover-xmlNanoHTTPCleanup-with-LIBXML_HTTP_ENABLE.patch \ " - -SRC_URI[sha256sum] = "eecbc94311c78012d059ebc0fae86ea5ef6eecb13303e6e82b3753c1b3409e98" +SRC_URI[sha256sum] = "43be2dd349daffe016dd1400c5d11285828c22fea35ca5109f21f3ed50605080" inherit autotools-brokensep pkgconfig From patchwork Sat Aug 24 22:45:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 48175 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BBC8BC54731 for ; Sat, 24 Aug 2024 22:45:58 +0000 (UTC) Received: from mail-oa1-f51.google.com (mail-oa1-f51.google.com [209.85.160.51]) by mx.groups.io with SMTP id smtpd.web11.22412.1724539553432702015 for ; Sat, 24 Aug 2024 15:45:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=UvXzObxM; spf=pass (domain: gmail.com, ip: 209.85.160.51, mailfrom: raj.khem@gmail.com) Received: by mail-oa1-f51.google.com with SMTP id 586e51a60fabf-27020fca39aso2600723fac.0 for ; Sat, 24 Aug 2024 15:45:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724539552; x=1725144352; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fbywF+byI6SLBJ4wegLOiKSC5rY9Et7vYk6aHSI3lzk=; b=UvXzObxMuspDnKkZNCi/Yok7UJBF9fhMkZux2PPnkorcSnDChHDsnIpa4DKoAY1rPd 3rKS6wDkRhDflJSukywHTYhKBzDhiBk5fFDv+SQnmmgobIvSfJ8DxjfeOoBAxrsB7r+m o0iulOrrXxebEsebmUdvJsaCLJ4HxGZXHby+TJPTJfcN6eKPpu+13MaMnu/SzYoU86j7 U2fF/mYbqsQeF4pw3TOfwyN83uOE/nl9YPeTGpMZDyCoi272tt3ecOckgkn+DGuW5OPy DwfCoWTy5wY3r4kjpjt3UCbyOv8HgVadyAAGahgfTwwNozeLLOEzzgoflyaMjcjOmQSq 3Fmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724539552; x=1725144352; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fbywF+byI6SLBJ4wegLOiKSC5rY9Et7vYk6aHSI3lzk=; b=bVrLF4fdpQZGSj3ut7XxNZ24J9u75aCsv7Yd8Z2hhKzLFFHank1N1RUNXjCc+THLln dfWsoc1G2Eqneq9hjZMCRQSRX1j3/oESptkVGIECWVT0YwaOqq1pP04Il2nmUMlldu5D UETCqzgHzrTJjpJilyqbSN39Xh/yUeeGLA50EEmSg0KCKD0E5Y4DW6BsTeufdjWgnNUL GUwr5a8HnsN36SlkCe+bg3Y51NeeRozPzs8kdsFwlaa3zS2K7U3QdJk+LxFbo+dj7TF2 kMozRIBuRx+q14XYArNoIPYAahVe2Fs/gAJqcd3Dbd4npBVdAomIyLyOLvaR43mJd5AJ xc1g== X-Gm-Message-State: AOJu0Yz/4jOKa5ShY5GhZ75vhPWuJ1CsCWtN3uI7lHVJujXGbmlwgrKZ 4V73+tlranQY/7ACUo1eRRMX45QygQd3hU8w4oE/dihXGnli0td2HXSwcA== X-Google-Smtp-Source: AGHT+IH4O1HEZk4koNXGvcdWmhLiE7GOJPW9rOE0AhyQrWViZ+gJ7+tKr0inSiuNLdc/dqrsQU+umw== X-Received: by 2002:a05:6358:5328:b0:1ac:f5dc:5163 with SMTP id e5c5f4694b2df-1b5c3b5ab4emr697898055d.29.1724539552271; Sat, 24 Aug 2024 15:45:52 -0700 (PDT) Received: from apollo.localdomain ([2601:646:9d80:4380::77e7]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-714343388a1sm4914817b3a.184.2024.08.24.15.45.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Aug 2024 15:45:51 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 4/4] libblockdev: Fix build with latest e2fsprogs Date: Sat, 24 Aug 2024 15:45:45 -0700 Message-ID: <20240824224545.1944956-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240824224545.1944956-1-raj.khem@gmail.com> References: <20240824224545.1944956-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 24 Aug 2024 22:45:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/111925 Signed-off-by: Khem Raj --- ...0001-libext2fs-unused-parameters-fix.patch | 92 +++++++++++++++++++ .../libblockdev/libblockdev_3.1.1.bb | 1 + 2 files changed, 93 insertions(+) create mode 100644 meta-oe/recipes-extended/libblockdev/files/0001-libext2fs-unused-parameters-fix.patch diff --git a/meta-oe/recipes-extended/libblockdev/files/0001-libext2fs-unused-parameters-fix.patch b/meta-oe/recipes-extended/libblockdev/files/0001-libext2fs-unused-parameters-fix.patch new file mode 100644 index 0000000000..8129c1e2a7 --- /dev/null +++ b/meta-oe/recipes-extended/libblockdev/files/0001-libext2fs-unused-parameters-fix.patch @@ -0,0 +1,92 @@ +From 3aad8d471201da4125bd03d7a6921707461fe182 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny +Date: Fri, 7 Jun 2024 10:06:22 +0200 +Subject: [PATCH 1/3] fs: Ignore unused-parameter warning in the FS plugin + +There are some unused parameters in the libext2fs header which +together with Wall and Werror means the plugin compilation fails. +As a workaround we'll disable the unused-parameter warning for +now. + +Fixes: #1026 + +Taken from Fedora + +Upstream-Status: Pending +Signed-off-by: Khem Raj + +--- + src/plugins/fs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/fs/Makefile.am b/src/plugins/fs/Makefile.am +index 7d4849c0..00474d5a 100644 +--- a/src/plugins/fs/Makefile.am ++++ b/src/plugins/fs/Makefile.am +@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects + + lib_LTLIBRARIES = libbd_fs.la + +-libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror ++libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-unused-parameter + libbd_fs_la_LIBADD = ${builddir}/../../utils/libbd_utils.la $(GLIB_LIBS) $(GIO_LIBS) $(BLKID_LIBS) $(MOUNT_LIBS) $(UUID_LIBS) $(EXT2FS_LIBS) + libbd_fs_la_LDFLAGS = -L${srcdir}/../../utils/ -version-info 3:0:0 -Wl,--no-undefined -export-symbols-regex '^bd_.*' + libbd_fs_la_CPPFLAGS = -I${builddir}/../../../include/ -I${srcdir}/../ +-- +2.45.2 + + +From da5c14f3e2f83c8c40203897154ee2b788782792 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny +Date: Fri, 7 Jun 2024 15:21:09 +0200 +Subject: [PATCH 2/3] fs: Ignore shift-count-overflow warning in FS plugin + +The warning happens in the libext2fs header. +--- + src/plugins/fs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/fs/Makefile.am b/src/plugins/fs/Makefile.am +index 00474d5a..42e1c777 100644 +--- a/src/plugins/fs/Makefile.am ++++ b/src/plugins/fs/Makefile.am +@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects + + lib_LTLIBRARIES = libbd_fs.la + +-libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-unused-parameter ++libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-unused-parameter -Wno-shift-count-overflow + libbd_fs_la_LIBADD = ${builddir}/../../utils/libbd_utils.la $(GLIB_LIBS) $(GIO_LIBS) $(BLKID_LIBS) $(MOUNT_LIBS) $(UUID_LIBS) $(EXT2FS_LIBS) + libbd_fs_la_LDFLAGS = -L${srcdir}/../../utils/ -version-info 3:0:0 -Wl,--no-undefined -export-symbols-regex '^bd_.*' + libbd_fs_la_CPPFLAGS = -I${builddir}/../../../include/ -I${srcdir}/../ +-- +2.45.2 + + +From 90ceb4b52fbda34673fe5303da84b9a902187503 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny +Date: Wed, 12 Jun 2024 15:34:02 +0200 +Subject: [PATCH 3/3] fs: Fix ignoring errors from libext2fs + +Follow-up for #1028, we still want to show the warning and not +completely supress it. +--- + src/plugins/fs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/fs/Makefile.am b/src/plugins/fs/Makefile.am +index 42e1c777..1ee256f0 100644 +--- a/src/plugins/fs/Makefile.am ++++ b/src/plugins/fs/Makefile.am +@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects + + lib_LTLIBRARIES = libbd_fs.la + +-libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-unused-parameter -Wno-shift-count-overflow ++libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-error=unused-parameter -Wno-error=shift-count-overflow + libbd_fs_la_LIBADD = ${builddir}/../../utils/libbd_utils.la $(GLIB_LIBS) $(GIO_LIBS) $(BLKID_LIBS) $(MOUNT_LIBS) $(UUID_LIBS) $(EXT2FS_LIBS) + libbd_fs_la_LDFLAGS = -L${srcdir}/../../utils/ -version-info 3:0:0 -Wl,--no-undefined -export-symbols-regex '^bd_.*' + libbd_fs_la_CPPFLAGS = -I${builddir}/../../../include/ -I${srcdir}/../ +-- +2.45.2 + diff --git a/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb b/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb index fb778005ff..a42e09d336 100644 --- a/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb +++ b/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb @@ -14,6 +14,7 @@ DEPENDS = "autoconf-archive-native glib-2.0 kmod udev libnvme" SRC_URI = "git://github.com/storaged-project/libblockdev;branch=3.1.x-devel;protocol=https \ file://0001-fix-pythondir-for-multilib-when-cross-compiling.patch \ + file://0001-libext2fs-unused-parameters-fix.patch \ " SRCREV = "68aaff5556afe26be749c29a2b7cbd714dce3050" S = "${WORKDIR}/git"