From patchwork Fri Mar 15 18:51:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 41096 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 D892FC54E58 for ; Fri, 15 Mar 2024 18:52:08 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web11.1273.1710528728353080296 for ; Fri, 15 Mar 2024 11:52:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ExdhWMgT; spf=pass (domain: gmail.com, ip: 209.85.214.180, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1dddb160a37so18036365ad.2 for ; Fri, 15 Mar 2024 11:52:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710528727; x=1711133527; 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=sGvKMikCTFszQoiD7IBpYD6s3ayssjkAnCNCpwK5mfY=; b=ExdhWMgTDbJe6NBy2iY8lKRW+sf1RjuJzmTG74L3kopjm14/hTSxZraY0k2CF+DtcG 0l+KY3fRisFFkWHPHSxzM6WQAPx4wXuTKipGOT4OlBg8G8oK2n3U3jD/fXcgssKrLlVB eE2KhKysoazctQAHDs2LIEH4uMiMDXUyR8evJkyyL24lpS6FuAOjqm0hE2kQLGzsKyuA HRtU7tjVIWqnOn0e/oXioAKYX9ioy1JDl/cfZRCuCggzrs1CzjajZlr0WWpngCd6gOmT 9P75tGuWmT5sHns70pVHlE07WTTJoa+hZKWQbgy4sOsX5E0/x2vqnX9FibzRW5MW+c/y rDdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710528727; x=1711133527; 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=sGvKMikCTFszQoiD7IBpYD6s3ayssjkAnCNCpwK5mfY=; b=mBlOSpJauXuKidXCUeAPOotbswe+NMPbTO1zL9MDZQhmDWsoIDWa6u/rTeeekZ/svv CYXT0T5EwR9CbszfJPFwnw9GeAvmZjfPeQ0lu/uXt/bFOL4+4WwKAgPvyXVtunKIH7/e wdy+kkvtplDUbubiBJ/O6munl0ERr0BgZUP8fDzyG1/ew0Qr66ej2k1rn0Cz829SzHSU ckAgnAh8la2PxRMpI2aaWWTum+9n7kzMzjk49wfICj18+EGAH/rMy38gYvw0Y8efJaJu aV3ytdMfb5MCo63d8BwWbR4Gz8ggWyesrrvn5iVDh3rDsOAdkIL5ClX7p3HEQxtIA6c6 TwDg== X-Gm-Message-State: AOJu0YzCK+gO9Ad3HzgD60vsLh/somSyjUjef8u1vltCd/MUyNYMRtX9 3M2G0TvvBJOGjsW98BUGJb5qj8b6hQ3V6cJz0G4yfh5PYIBanYCrMdyKOFPM X-Google-Smtp-Source: AGHT+IHwFwaz1MC6YP15IrLPoW0l3NlwITq4/EGpvh0Zmt/SIhRIsENo6JaBqBC8E/rqxl718HMAQQ== X-Received: by 2002:a17:903:40c3:b0:1dd:a134:5680 with SMTP id t3-20020a17090340c300b001dda1345680mr6046563pld.69.1710528727448; Fri, 15 Mar 2024 11:52:07 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::c6db]) by smtp.gmail.com with ESMTPSA id o6-20020a170902d4c600b001dbcfb4766csm4202158plg.226.2024.03.15.11.52.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Mar 2024 11:52:07 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 1/2] dietsplash: Update and fix build with musl Date: Fri, 15 Mar 2024 11:51:59 -0700 Message-ID: <20240315185200.3967095-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.44.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 ; Fri, 15 Mar 2024 18:52:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109345 Signed-off-by: Khem Raj --- ...me-API-for-non-glibc-library-e.g.-mu.patch | 28 +++++++++++++++++++ .../dietsplash/dietsplash_git.bb | 7 +++-- 2 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-graphics/dietsplash/dietsplash/0001-Mimic-GNU-basename-API-for-non-glibc-library-e.g.-mu.patch diff --git a/meta-oe/recipes-graphics/dietsplash/dietsplash/0001-Mimic-GNU-basename-API-for-non-glibc-library-e.g.-mu.patch b/meta-oe/recipes-graphics/dietsplash/dietsplash/0001-Mimic-GNU-basename-API-for-non-glibc-library-e.g.-mu.patch new file mode 100644 index 0000000000..aa8406e315 --- /dev/null +++ b/meta-oe/recipes-graphics/dietsplash/dietsplash/0001-Mimic-GNU-basename-API-for-non-glibc-library-e.g.-mu.patch @@ -0,0 +1,28 @@ +From 272491297564513c4ce49a11bc1ecc523a3afd63 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 15 Mar 2024 11:05:54 -0700 +Subject: [PATCH] Mimic GNU basename() API for non-glibc library e.g. musl + +Upstream-Status: Submitted [https://github.com/lucasdemarchi/dietsplash/pull/7] +Signed-off-by: Khem Raj +--- + src/util.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/util.h b/src/util.h +index 1f4c3ef..a3ab54a 100644 +--- a/src/util.h ++++ b/src/util.h +@@ -60,6 +60,9 @@ + */ + #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + _array_size_chk(arr)) + ++#if !defined(__GLIBC__) ++#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) ++#endif + + #define DIE_PREFIX "[" PACKAGE_NAME "] ERR: " + #define LOG_SUFFIX "\n" +-- +2.44.0 + diff --git a/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb b/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb index bd94b9ad51..1ee2657bd0 100644 --- a/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb +++ b/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb @@ -4,12 +4,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" # Really, no depends besides a C library -PV = "0.3" +PV = "0.3+git" -SRCREV = "ef2e1a390e768e21e6a6268977580ee129a96633" +SRCREV = "8bed71d860bbb0c8792fa2a1179c9beeae84d577" SRC_URI = "git://github.com/lucasdemarchi/dietsplash.git;branch=master;protocol=https \ file://0001-configure.ac-Do-not-demand-linker-hash-style.patch \ - " + file://0001-Mimic-GNU-basename-API-for-non-glibc-library-e.g.-mu.patch \ +" inherit autotools From patchwork Fri Mar 15 18:52:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 41097 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 C17DFC54E67 for ; Fri, 15 Mar 2024 18:52:18 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web11.1274.1710528730105916183 for ; Fri, 15 Mar 2024 11:52:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=VJ0I7e+u; spf=pass (domain: gmail.com, ip: 209.85.214.169, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1d944e8f367so19167885ad.0 for ; Fri, 15 Mar 2024 11:52:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710528729; x=1711133529; 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=hfARUWO5Ntor6uHndembmdJMlH6cVM7oNYNOx1zOXIE=; b=VJ0I7e+uGSwUTPo6IC//6emSaSzReVFmWVDH0OhYrPWqIpICIh9RN6+omWKyfFUVub /yVzjsG0OVlwM5xuGdMT6bIc7m0kqfR4Emb9hOvEgNdAAf94ACpK+Jvr+3oFp8p04cJe if4ngM7Pt6ETeVpsaRtg4HvhsJ1ttHywZp/Awry/LvaGtIyWTMRwqdm9edn96W0cQtSO P3TmM1NWTKJPCn2FLo5fkm/MGj2lzMzk2bLA6IVI3K6/qOsmmtryMQxjSuw/WgOZeLQu ODiIqKKWx3ke56EbPZjng5zjsh9Z+FuuE1p8gZnF68GWQ4ww4kPxXBSu9bzthD6K5Wq4 9LYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710528729; x=1711133529; 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=hfARUWO5Ntor6uHndembmdJMlH6cVM7oNYNOx1zOXIE=; b=P6kStGcfq0L/9ADMFKcAxAxSCAqj5r+h49CMEQ5F4dCjC0r3v1v4oS4ZDzpCXFtGTB DRNwF8p+KTT2mvWibJ3jfFspNksmJzRCw6rgCjFfNXypOv1IHeXMKbTTCIly8UTMI3Dp luNI+tWdCaGlegrVwzi6srbnTD7Qy2VpIl5FlydlIMBMmm+D1130utGJyuhTb57YylPq FkZuGLMtDBI4tm6Q+fPxf+DvVbhpYrilZrveNfj7j1yjKJPaPsAUwHYqkiL9o7ZXOcyU d/U+Mph9x+o1QcsgdJmgjMeUHlrRouZqYATITKWDgS2dSfv98ZQRcnzCK545xOMycwTc eCOA== X-Gm-Message-State: AOJu0YxsqOt+UN6VHwxCbJ8Wx6MNhG43UsUVhjCkRG+XExQHtzS3JasY Yyb56Cs7v1n3PYLBbjok5F0WeLzoIcEroa6Muds9zFYAESuk0yGd0SyFWGr2 X-Google-Smtp-Source: AGHT+IHSj+7h9tlW5n6oNP1Cg4mgk+9a8pQyERo9mpPKV9pWtGSnElGAZJOnptIrVZBE7RcHJ6q02w== X-Received: by 2002:a17:902:fc4c:b0:1de:ddc6:27a4 with SMTP id me12-20020a170902fc4c00b001deddc627a4mr6589533plb.0.1710528729160; Fri, 15 Mar 2024 11:52:09 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::c6db]) by smtp.gmail.com with ESMTPSA id o6-20020a170902d4c600b001dbcfb4766csm4202158plg.226.2024.03.15.11.52.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Mar 2024 11:52:08 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 2/2] frr: Upgrade to latest on 9.1 stable Date: Fri, 15 Mar 2024 11:52:00 -0700 Message-ID: <20240315185200.3967095-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240315185200.3967095-1-raj.khem@gmail.com> References: <20240315185200.3967095-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 ; Fri, 15 Mar 2024 18:52:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109346 Fix build with latest musl Signed-off-by: Khem Raj --- ...me-API-for-non-glibc-library-e.g.-mu.patch | 35 +++++++++++++++++++ .../recipes-protocols/frr/frr_9.1.bb | 3 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-protocols/frr/frr/0001-Mimic-GNU-basename-API-for-non-glibc-library-e.g.-mu.patch diff --git a/meta-networking/recipes-protocols/frr/frr/0001-Mimic-GNU-basename-API-for-non-glibc-library-e.g.-mu.patch b/meta-networking/recipes-protocols/frr/frr/0001-Mimic-GNU-basename-API-for-non-glibc-library-e.g.-mu.patch new file mode 100644 index 0000000000..215d6b4137 --- /dev/null +++ b/meta-networking/recipes-protocols/frr/frr/0001-Mimic-GNU-basename-API-for-non-glibc-library-e.g.-mu.patch @@ -0,0 +1,35 @@ +From 73c21bafc7065f0ab1d40fee2c6ce0c140d1b859 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 15 Mar 2024 11:31:02 -0700 +Subject: [PATCH] Mimic GNU basename() API for non-glibc library e.g. musl + +musl only provides POSIX version of basename and it has also removed +providing it via string.h header [1] which now results in compile errors +with newer compilers e.g. clang-18 + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Upstream-Status: Submitted [https://github.com/FRRouting/frr/pull/15561] +Signed-off-by: Khem Raj +--- + lib/zebra.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/lib/zebra.h b/lib/zebra.h +index 15a54f6cdf..cc40b48339 100644 +--- a/lib/zebra.h ++++ b/lib/zebra.h +@@ -226,6 +226,10 @@ struct in_pktinfo { + + #define strmatch(a,b) (!strcmp((a), (b))) + ++#if !defined(__GLIBC__) ++#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) ++#endif ++ + #if BYTE_ORDER == LITTLE_ENDIAN + #define htonll(x) (((uint64_t)htonl((x)&0xFFFFFFFF) << 32) | htonl((x) >> 32)) + #define ntohll(x) (((uint64_t)ntohl((x)&0xFFFFFFFF) << 32) | ntohl((x) >> 32)) +-- +2.44.0 + diff --git a/meta-networking/recipes-protocols/frr/frr_9.1.bb b/meta-networking/recipes-protocols/frr/frr_9.1.bb index 8ea917afaa..4510c27060 100644 --- a/meta-networking/recipes-protocols/frr/frr_9.1.bb +++ b/meta-networking/recipes-protocols/frr/frr_9.1.bb @@ -12,9 +12,10 @@ LIC_FILES_CHKSUM = "file://doc/licenses/GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/9.1 \ file://frr.pam \ + file://0001-Mimic-GNU-basename-API-for-non-glibc-library-e.g.-mu.patch \ " -SRCREV = "312faf8008bb4f3b9e84b8e2758cd2cbdf5742b5" +SRCREV = "ca2d6f0f1e000951224a18973cc1827f7f5215b5" UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P\d+(\.\d+)+)$"