From patchwork Wed Jul 10 07:10:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 46131 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 D0FF1C41513 for ; Wed, 10 Jul 2024 07:10:27 +0000 (UTC) Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by mx.groups.io with SMTP id smtpd.web11.8366.1720595419830736647 for ; Wed, 10 Jul 2024 00:10:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=eLUIPOWo; spf=pass (domain: gmail.com, ip: 209.85.208.52, mailfrom: martin.jansa@gmail.com) Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-5957040e32aso1019262a12.2 for ; Wed, 10 Jul 2024 00:10:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720595418; x=1721200218; 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=uoJLUHdg3/QM3IL+b/E/ARdBncDyNqRBq1Ht9hnVRcA=; b=eLUIPOWouFPRNO+wvnB3B65RHItpzr2hyG8cHBnYihdC7YYl+Nbe62nXCME8eDOthT 81jH7sBWAt3cxGd+6ufIJPQX5ldBi4QPNK3FHbUYex5E6/VSVQYT8DyrT0O7hfnc0s0D PpXF1pLIh00LDtkM2GnWKOmO2BftNO9xaJlzRvl4aWJxBF50ZvQzLHV4qQeRYGd5B4Pe 8I1UWAt7L/NQb9I4vCRwoJ4mS1v643rYciqN5G8pBgb+/2wwA6U9S0Ue17dQhTCcFOTH t5V9Ccfds+ecR70DXFUIksXeOhG2E6tweNO2sC/a1VsyJbLE5/NodFsc9kvFz3PcXzYo 8W9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720595418; x=1721200218; 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=uoJLUHdg3/QM3IL+b/E/ARdBncDyNqRBq1Ht9hnVRcA=; b=CJZnhiAXDYWEAk2epF8OrZr22bC7OpGzXy21JY9hKRe0UmTsJvFd2HEGb+Aaek/sgK SiudYubVeKYkaXr6pnG2fC6fkLZWY2bId7/bmbg5adMF8eWDGd0Erw37zFG2vL9pyA1P x+hr9pAA+Lm1Q4WOx1NfHG+zKDe5rCF4cW/SeFA6521FkUfW5M2b/phPW1WBegsw+OH1 ABI88tX3RmvEmlW858DHGN7oyUGwuvOWQGOW4MdFgA0Qu+wJs3Q9p3F7cG/rUbM+N3zF Dcq8AXpcGRmk3zoThJkLH8ZgoAIhxYZ9ZCtylZ9DuWxBvY+iXp2HEfcCL67cbKtRoKdk S9Aw== X-Gm-Message-State: AOJu0YyKVGHwEEEPbrR4OJ+KJyvNo+wNCC3c6gI0lQj96PnBMtaLy9Kd 4lz/EPAJ+4pCVeBDTojhAcIeG2BHj7BFIvDcN8bzHAlwSOT+Zk97WZ74BQ== X-Google-Smtp-Source: AGHT+IH2mw+0i+dYZQRN7yLmenBm6CW0wTdjq187uDSF8wr45iW+TZkE+/OvE39DZ+n/KiicUYrnXw== X-Received: by 2002:a05:6402:134f:b0:58d:77e0:5c29 with SMTP id 4fb4d7f45d1cf-594bb181cb8mr3599000a12.10.1720595417901; Wed, 10 Jul 2024 00:10:17 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-594bc7c8a39sm1908519a12.55.2024.07.10.00.10.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jul 2024 00:10:17 -0700 (PDT) From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: Martin Jansa , Khem Raj Subject: [meta-oe][scarthgap][PATCH 1/2] giflib: fix build with gold and avoid imagemagick-native dependency Date: Wed, 10 Jul 2024 09:10:15 +0200 Message-ID: <20240710071016.64569-1-martin.jansa@gmail.com> X-Mailer: git-send-email 2.45.2 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 ; Wed, 10 Jul 2024 07:10:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/111291 * avoid imagemagick-native like upstream did in: https://sourceforge.net/p/giflib/code/ci/d54b45b0240d455bbaedee4be5203d2703e59967/ Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- ...x_to_convert_binary_used_in_Makefile.patch | 42 ------------------- ...Makefile-fix-typo-in-soname-argument.patch | 34 +++++++++++++++ .../recipes-devtools/giflib/giflib_5.2.2.bb | 8 ++-- 3 files changed, 39 insertions(+), 45 deletions(-) delete mode 100644 meta-oe/recipes-devtools/giflib/files/add_suffix_to_convert_binary_used_in_Makefile.patch create mode 100644 meta-oe/recipes-devtools/giflib/giflib/0001-Makefile-fix-typo-in-soname-argument.patch diff --git a/meta-oe/recipes-devtools/giflib/files/add_suffix_to_convert_binary_used_in_Makefile.patch b/meta-oe/recipes-devtools/giflib/files/add_suffix_to_convert_binary_used_in_Makefile.patch deleted file mode 100644 index a01b28ac6d..0000000000 --- a/meta-oe/recipes-devtools/giflib/files/add_suffix_to_convert_binary_used_in_Makefile.patch +++ /dev/null @@ -1,42 +0,0 @@ -Subject: Modify binary name "convert" to "convert.im7" - -The change is needed to resolve the below compilation error -after giflib version upgrade. Log data follows: -| DEBUG: Executing shell function do_compile -| NOTE: make -j 8 -| make -C doc -| make[1]: Entering directory '../giflib/5.2.2/giflib-5.2.2/doc' -| convert ../pic/gifgrid.gif -resize 50x50 giflib-logo.gif -| make[1]: convert: No such file or directory -| make[1]: *** [Makefile:46: giflib-logo.gif] Error 127 -| make[1]: Leaving directory '../giflib/5.2.2/giflib-5.2.2/doc' -| make: *** [Makefile:93: all] Error 2 -| ERROR: oe_runmake failed - -Added dependency on ImageMagick which includes "convert" utility, -to ensure availability of required tool during compilation process. - -This patch updates the binary name used in Makefile from -"convert" to "convert.im7" for resizing the logo image used in HTML -documentation as Imagemagick installs binary in this format. - -Below commits justify the cause of adding the suffix to binaries -provided by ImageMagic package: -https://git.openembedded.org/meta-openembedded/commit/meta-oe/recipes-support/imagemagick?id=dcbb49f707e7ad9bf755dd3275ffc442154b8144 -https://git.openembedded.org/meta-openembedded/commit/meta-oe/recipes-support/imagemagick?id=6e0c24e9b3f9d430dec57f61f8c12c74bca5375d - -Signed-off-by: Bhabu Bindu -Upstream-Status: Inappropriate [OE specific] - -=================================================================== ---- a/doc/Makefile -+++ b/doc/Makefile -@@ -43,7 +43,7 @@ - - # Logo image file for HTML docs - giflib-logo.gif: ../pic/gifgrid.gif -- convert $^ -resize 50x50 $@ -+ convert.im7 $^ -resize 50x50 $@ - - # Philosophical choice: the website gets the internal manual pages - allhtml: $(XMLALL:.xml=.html) giflib-logo.gif diff --git a/meta-oe/recipes-devtools/giflib/giflib/0001-Makefile-fix-typo-in-soname-argument.patch b/meta-oe/recipes-devtools/giflib/giflib/0001-Makefile-fix-typo-in-soname-argument.patch new file mode 100644 index 0000000000..dc87ed60b9 --- /dev/null +++ b/meta-oe/recipes-devtools/giflib/giflib/0001-Makefile-fix-typo-in-soname-argument.patch @@ -0,0 +1,34 @@ +From 7f0cd4b6b56183b0afbefd01425e5ebd2b8733b4 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Mon, 8 Jul 2024 13:18:11 +0200 +Subject: [PATCH] Makefile: fix typo in soname argument + +* introduced in: + https://sourceforge.net/p/giflib/code/ci/b65c7ac2905c0842e7977a7b51d83af4486ca7b8/ + there is no LIBUTILMAJOR variable only LIBUTILSOMAJOR leading to: + + ld: fatal error: -soname: must take a non-empty argument + collect2: error: ld returned 1 exit status + + with some linkers like GOLD + +Signed-off-by: Martin Jansa +--- +Upstream-Status: Submitted [https://sourceforge.net/p/giflib/code/merge-requests/17/] + + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 87966a9..41b149e 100644 +--- a/Makefile ++++ b/Makefile +@@ -109,7 +109,7 @@ $(LIBUTILSO): $(UOBJECTS) $(UHEADERS) + ifeq ($(UNAME), Darwin) + $(CC) $(CFLAGS) -dynamiclib -current_version $(LIBVER) $(OBJECTS) -o $(LIBUTILSO) + else +- $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBUTILMAJOR) -o $(LIBUTILSO) $(UOBJECTS) ++ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBUTILSOMAJOR) -o $(LIBUTILSO) $(UOBJECTS) + endif + + libutil.a: $(UOBJECTS) $(UHEADERS) diff --git a/meta-oe/recipes-devtools/giflib/giflib_5.2.2.bb b/meta-oe/recipes-devtools/giflib/giflib_5.2.2.bb index 7d8a175fe3..aa47f93095 100644 --- a/meta-oe/recipes-devtools/giflib/giflib_5.2.2.bb +++ b/meta-oe/recipes-devtools/giflib/giflib_5.2.2.bb @@ -5,14 +5,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ae11c61b04b2917be39b11f78d71519a" CVE_PRODUCT = "giflib_project:giflib" -DEPENDS = "xmlto-native imagemagick-native" +DEPENDS = "xmlto-native" SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/${BP}.tar.gz \ - file://add_suffix_to_convert_binary_used_in_Makefile.patch" + https://sourceforge.net/p/giflib/code/ci/d54b45b0240d455bbaedee4be5203d2703e59967/tree/doc/giflib-logo.gif?format=raw;subdir=${BP}/doc;name=logo;downloadfilename=giflib-logo.gif \ + file://0001-Makefile-fix-typo-in-soname-argument.patch \ +" +SRC_URI[logo.sha256sum] = "1a54383986adad1521d00e003b4c482c27e8bc60690be944a1f3319c75abc2c9" SRC_URI[sha256sum] = "be7ffbd057cadebe2aa144542fd90c6838c6a083b5e8a9048b8ee3b66b29d5fb" - do_install() { # using autotools's default will end up in /usr/local oe_runmake DESTDIR=${D} PREFIX=${prefix} LIBDIR=${libdir} install From patchwork Wed Jul 10 07:10:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 46130 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 D00A3C3DA42 for ; Wed, 10 Jul 2024 07:10:27 +0000 (UTC) Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by mx.groups.io with SMTP id smtpd.web10.8367.1720595421440272813 for ; Wed, 10 Jul 2024 00:10:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bIXd6Ls/; spf=pass (domain: gmail.com, ip: 209.85.218.44, mailfrom: martin.jansa@gmail.com) Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-a7523f0870cso739165266b.3 for ; Wed, 10 Jul 2024 00:10:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720595420; x=1721200220; 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=VWE7T6kJfsakA6tUiE7vxUE2VfIcDA62WqVzhmrgOGk=; b=bIXd6Ls/1BgJLr1O+QKdnV868eSdz72W22ZT0jw168fJn5Ck4huu6+bCp3epPDbOSu nipP9UALqfrBep19lUrf1658gc2JKT6eX/40Ft4BPtpFAuQoezOQ7JbFPNiOitGrgGhp Dol8c1AgCEPIhuxkQFf/PwlcgjCrit+kZiHZP5Qdbwz+yGfe27lC+WilziqKbwZ48gba j4oR7V7ULGyqBC4JnWZALYIQvSEi8CDmiPpo0EDlRJ+rHz/g6+OdbN/C7pSz2/WZDou0 1wrkRie8tRl/t1cBCSo8JDNrkmtmaHIppsgqyyd+sLiY8dGjkNzc9QitiqAQKRWa8/s7 Hxzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720595420; x=1721200220; 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=VWE7T6kJfsakA6tUiE7vxUE2VfIcDA62WqVzhmrgOGk=; b=QdmAbUDajEHZea0NzBFo5/DeamKtr0ZehO69+qCkWYjZUVUgUbdtU4Nae4WJBtIBaS pm8zYGaDVCM7lbdcDJlUAc2uFfU8hnf8h3sDyBsSv/jUOhDHn5XpD+9rHvBJiEvgpF8r qgyjjmzO7SLo8++jjHBZYSgc2s2MDBWfxy7KsV5R+s1dOFrwDioH8LafYWcUe9ssKSrG OPlI43yflyQ+eX3nP8TetVc5/5BbJM01h0swIr5O84itTE9D7C/fRcDmyOmf4R61LPYv QEOocuf8JdIZ+ZUTNBXBVPQIG1WM5jm/y+fKhZC/Qjupwg9+tUEhI+faByEBIJBJsxPM 1lKw== X-Gm-Message-State: AOJu0YxJKFDXLOHDK1HHp4lhpsJukD4T/0yMrb2/7rx7t+DdY47FVhXf LqODswiNLTc272iz9ZXdvZolOGkZWzI8gTFVCXdo64I7IrZqjZNbXPBRWw== X-Google-Smtp-Source: AGHT+IEuWa85/1iNeMpZQ7hN3djmvf+POEAMD0+zqB6QzsZPkOBZKeH7ff9qBZjKH4kJwUD74cUjfQ== X-Received: by 2002:a17:906:384b:b0:a77:b664:c078 with SMTP id a640c23a62f3a-a780b6b1935mr299818166b.27.1720595419793; Wed, 10 Jul 2024 00:10:19 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a730394sm136412766b.95.2024.07.10.00.10.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jul 2024 00:10:19 -0700 (PDT) From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: Martin Jansa , Khem Raj Subject: [meta-oe][scarthgap][PATCH 2/2] bolt: package systemd_system_unitdir correctly Date: Wed, 10 Jul 2024 09:10:16 +0200 Message-ID: <20240710071016.64569-2-martin.jansa@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240710071016.64569-1-martin.jansa@gmail.com> References: <20240710071016.64569-1-martin.jansa@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 ; Wed, 10 Jul 2024 07:10:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/111292 * ${libdir}/systemd doesn't work on multilib builds, where libdir might be something else than ${nonarch_base_libdir} fixes: ERROR: QA Issue: lib32-bolt: Files/directories were installed but not shipped in any package: /usr/lib/systemd /usr/lib/systemd/system /usr/lib/systemd/system/bolt.service Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- meta-oe/recipes-bsp/bolt/bolt_0.9.6.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-bsp/bolt/bolt_0.9.6.bb b/meta-oe/recipes-bsp/bolt/bolt_0.9.6.bb index 4688ae860b..c278a0982a 100644 --- a/meta-oe/recipes-bsp/bolt/bolt_0.9.6.bb +++ b/meta-oe/recipes-bsp/bolt/bolt_0.9.6.bb @@ -18,5 +18,5 @@ inherit cmake pkgconfig meson features_check FILES:${PN} += "${datadir}/dbus-1/* \ ${datadir}/polkit-1/* \ - ${libdir}/systemd/* \ - " + ${systemd_system_unitdir} \ +"