From patchwork Tue Aug 30 07:13:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12102 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 C413EECAAD8 for ; Tue, 30 Aug 2022 07:14:32 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web08.8718.1661843656593304005 for ; Tue, 30 Aug 2022 00:14:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=pqjuEDHE; spf=pass (domain: gmail.com, ip: 209.85.214.170, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f170.google.com with SMTP id x23so10250603pll.7 for ; Tue, 30 Aug 2022 00:14:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc; bh=5SyVCajcnz/viJe/a55fAXh0IRWv2nMTXJ2i/TLYhg4=; b=pqjuEDHEZ/PT3riNa6d53iP13PsY98fpYoi4LoNG9hmHg2MSWmJeghR8U33TdLYUG5 0t9DSqkAl/r7OHmxlgp+ocg5K6aKq3YMke8fdcvQkhoFYiSMmH6PEHERP6cVOJLZZLUT rQM/A66KCjTdtVuUDccY1hO1ruyOvte+4d+6Lb5e84+StL3nDr8w0YpsADsxdeg/QSvm tG5kLCNUh0YQbKI+wp0GlKLEdtKQtezYGwrjwVyp+dr2gYWxBTN9aGJasHKRG6C32oNG 81JJmruDBluCkZ+TQPbCIT3VUrEw/9LFWuYsXrTrjY+7WrQTVfiqlp3fiQ4BxaPasaxl D3Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=5SyVCajcnz/viJe/a55fAXh0IRWv2nMTXJ2i/TLYhg4=; b=nm/wCaTi7f8D+HLQjoyPsN1RYVQq+qMc+Er6T4CDb0W3GxLsBJ9aSi7hQ2zaN498Ce zFEYsMsTJPPcz2m8ktLXwm04ve02BaxNqDu/4dnwMFwQprV+YkrMFtAaJjNAxZRm1jFX MSxAOnzGZSeZTEDr9hbKOxSRH4Q3fpyTYwTCKvm/J7zrsMl5EHwA2NmIn8UE+0PLyCXS DFbsQMld9HWEcGXOWkKcvGPPrcg+CUYT1E7L3gV9jcRnEnI/tzquARuraia4aENwC04p /DG6/TX3n93hFzyS5WyL8/v8//2l12Mqt3fqyHnlrvjbsSlASuHkpH5H+HHhjC35MQ40 nC5Q== X-Gm-Message-State: ACgBeo2ML93oG6nDY3KHucBMWd3DkluxKB0YYqaqxt/1nDx7a4jZmbQC fwEUFJhki5ifRrGF51uUwZ2zj96+ugrTyA== X-Google-Smtp-Source: AA6agR7PPxt+ONyIBgn9DuPcNVT77+SCI6UEEV7UU4JWY8NRzL0bYzbL7zX5cnR0GgDmt4WGFfde8w== X-Received: by 2002:a17:902:ec88:b0:175:d8f:44b with SMTP id x8-20020a170902ec8800b001750d8f044bmr3275235plg.84.1661843655566; Tue, 30 Aug 2022 00:14:15 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id z24-20020aa79f98000000b00537f9e32b00sm6041616pfr.37.2022.08.30.00.14.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 00:14:15 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 01/21] gtk+: Fix function signature of create_menu() Date: Tue, 30 Aug 2022 00:13:53 -0700 Message-Id: <20220830071413.3887189-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.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 ; Tue, 30 Aug 2022 07:14:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98538 Signed-off-by: Khem Raj --- ...ix-signature-of-create_menu-function.patch | 50 +++++++++++++++++++ meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb | 1 + 2 files changed, 51 insertions(+) create mode 100644 meta-oe/recipes-gnome/gtk+/gtk+/0001-Fix-signature-of-create_menu-function.patch diff --git a/meta-oe/recipes-gnome/gtk+/gtk+/0001-Fix-signature-of-create_menu-function.patch b/meta-oe/recipes-gnome/gtk+/gtk+/0001-Fix-signature-of-create_menu-function.patch new file mode 100644 index 0000000000..6b5f928391 --- /dev/null +++ b/meta-oe/recipes-gnome/gtk+/gtk+/0001-Fix-signature-of-create_menu-function.patch @@ -0,0 +1,50 @@ +From a703e2406fda3dc150574ae2f90cb5f4810d0601 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 29 Aug 2022 00:25:19 -0700 +Subject: [PATCH] Fix signature of create_menu() function + +Upstream-Status: Inappropriate [EOL] +Signed-off-by: Khem Raj +--- + tests/testmenubars.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tests/testmenubars.c b/tests/testmenubars.c +index 416a939..7f247f8 100644 +--- a/tests/testmenubars.c ++++ b/tests/testmenubars.c +@@ -21,7 +21,7 @@ + #include + + static GtkWidget * +-create_menu (depth) ++create_menu (int depth) + { + GtkWidget *menu; + GtkWidget *menuitem; +@@ -70,19 +70,19 @@ create_menubar (GtkPackDirection pack_dir, + menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_HOME, NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem); + gtk_label_set_angle (GTK_LABEL (GTK_BIN (menuitem)->child), angle); +- menu = create_menu (2, TRUE); ++ menu = create_menu (2); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu); + + menuitem = gtk_menu_item_new_with_label ("foo"); + gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem); + gtk_label_set_angle (GTK_LABEL (GTK_BIN (menuitem)->child), angle); +- menu = create_menu (2, TRUE); ++ menu = create_menu (2); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu); + + menuitem = gtk_menu_item_new_with_label ("bar"); + gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem); + gtk_label_set_angle (GTK_LABEL (GTK_BIN (menuitem)->child), angle); +- menu = create_menu (2, TRUE); ++ menu = create_menu (2); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu); + + return menubar; +-- +2.37.2 + diff --git a/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb b/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb index 082967e04c..5eac641cf3 100644 --- a/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb +++ b/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb @@ -10,6 +10,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \ file://doc-fixes.patch \ file://strict-prototypes.patch \ file://0001-Do-not-look-into-HOME-when-looking-for-gtk-modules.patch \ + file://0001-Fix-signature-of-create_menu-function.patch \ " SRC_URI[sha256sum] = "ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da" From patchwork Tue Aug 30 07:13:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12097 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 D218FC0502F for ; Tue, 30 Aug 2022 07:14:22 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web10.8673.1661843657362085351 for ; Tue, 30 Aug 2022 00:14:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Y9ofPpWx; spf=pass (domain: gmail.com, ip: 209.85.216.44, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f44.google.com with SMTP id t5so10310641pjs.0 for ; Tue, 30 Aug 2022 00:14:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=7fHkG1LNKFI6ZaoR/XTtmRDk10vQcG8/p6FFTM8pY+o=; b=Y9ofPpWxMV0L3SzNkqLj3bIpfSFJ5D1V6SYJmIoXm94+wUog88fb3V60UoEKffxgiF PGHUH8W2lj/FU3p80GAOrCKtggEH/OMzANxgjpd1rrJTQAHivEYGjJA+Ckcf9Kz5hdkG YrJe3nLE98See9gR5pqmgMxZRmDVauH+/qKl2NOn2BjR6lQ8rePoa940LwrzWnshyg0a 9TIariwcNjnTYWbMsA7VBNkVYaOZgbaTCDSuXUWOwUeXdQmPVMcuvQ0cSJOxS+k6wPAz DtAfjoyVpm3tFT7Ub1RJZqQCpfUS9bMqd8ic3NqbHqx/3gNvJBv4QbLnbVWGYd2C069U Iodg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=7fHkG1LNKFI6ZaoR/XTtmRDk10vQcG8/p6FFTM8pY+o=; b=f4TlfsNZnPy4Jke1yvlex1TAK9DzHkgjWGXnsUM9wnzZP0mN429JKlRGnii9nXyrDT sZuQC5jK5Hn+6ltkj1tzGFSOfGyhttE+M16nwAwRuAtYHwZw6A74T7HtgW824W0Wygcp qF12Ihn+n/+04vFLKv6A66Sg01n0wZeAtmsKeM1z/86vYBbrbYJx3LFMWjICOg5/20Nk Piw7Pj8iJ692tRhGCX1NYPNuYqnfBxHqHIFEv2hT4My/kYbYwQbEfLRJT0rLObGJNnLD KMtMekiphXf+KXWmMNge24yuMpwcbHD8jOgN/7Mr7MTpOEG22NxJ0c+A749mesKow1DP wHww== X-Gm-Message-State: ACgBeo2iF3VWCbt/Nq3nM3tPLSk9AniHrbSnXIk1ZHnpyn3NUTD4XZ2d FqBOg+mbGod+HRHcddYLRBRshGAsx0lUjg== X-Google-Smtp-Source: AA6agR73gBh+57IVpTCcZOluy3TJULn6javJouzpKV0ZkY/Rn84x0QYFN0B8NYEfsoY6ZtADdWXUwg== X-Received: by 2002:a17:903:185:b0:172:fb7a:d9c7 with SMTP id z5-20020a170903018500b00172fb7ad9c7mr19968328plg.103.1661843656486; Tue, 30 Aug 2022 00:14:16 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id z24-20020aa79f98000000b00537f9e32b00sm6041616pfr.37.2022.08.30.00.14.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 00:14:16 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 02/21] ippool: Fix build with clang15 Date: Tue, 30 Aug 2022 00:13:54 -0700 Message-Id: <20220830071413.3887189-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220830071413.3887189-1-raj.khem@gmail.com> References: <20220830071413.3887189-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 ; Tue, 30 Aug 2022 07:14:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98539 Signed-off-by: Khem Raj --- ...x-type-casting-issues-between-in_add.patch | 72 +++++++++++++++++++ ...r.c-Add-missing-prototype-for-ippool.patch | 22 ++++++ .../recipes-daemons/ippool/ippool_1.3.bb | 2 + 3 files changed, 96 insertions(+) create mode 100644 meta-networking/recipes-daemons/ippool/ippool/0001-pppd-ippool.c-Fix-type-casting-issues-between-in_add.patch create mode 100644 meta-networking/recipes-daemons/ippool/ippool/0002-ippool_rpc_server.c-Add-missing-prototype-for-ippool.patch diff --git a/meta-networking/recipes-daemons/ippool/ippool/0001-pppd-ippool.c-Fix-type-casting-issues-between-in_add.patch b/meta-networking/recipes-daemons/ippool/ippool/0001-pppd-ippool.c-Fix-type-casting-issues-between-in_add.patch new file mode 100644 index 0000000000..a98c179290 --- /dev/null +++ b/meta-networking/recipes-daemons/ippool/ippool/0001-pppd-ippool.c-Fix-type-casting-issues-between-in_add.patch @@ -0,0 +1,72 @@ +From da67444994bde603c7ff1483a6803bdab24e1f14 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 29 Aug 2022 09:36:55 -0700 +Subject: [PATCH 1/2] pppd/ippool.c: Fix type casting issues between in_addr + and ippool_api_ip_addr + +Also remove unused variabled + +Upstream-Status: Inappropriate [No upstream] +Signed-off-by: Khem Raj +--- + pppd/ippool.c | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +--- a/pppd/ippool.c ++++ b/pppd/ippool.c +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + #include + + #include +@@ -24,7 +25,6 @@ + + const char pppd_version[] = VERSION; + +-static int ippool_fd = -1; + static char *ippool_pool_name = NULL; + static char *ippool_pool_name2 = NULL; + static char *ippool_server = "localhost"; +@@ -64,9 +64,9 @@ static int ippool_addr_alloc(CLIENT *cl, + } + + *addr = clnt_res.addr.s_addr; +- ++ struct in_addr temp_addr = {*addr}; + if (ippool_debug) { +- dbglog("Allocated address %s from pool %s", inet_ntoa(clnt_res.addr.s_addr), pool_name); ++ dbglog("Allocated address %s from pool %s", inet_ntoa(temp_addr), pool_name); + } + out: + return result; +@@ -85,14 +85,16 @@ static void ippool_addr_free(CLIENT *cl, + } + if (clnt_res < 0) { + if (ippool_debug) { ++ struct in_addr temp_addr = {free_addr.s_addr}; + warn("IP address %s free to pool %s failed: %s", +- inet_ntoa(free_addr), pool_name, strerror(-clnt_res)); ++ inet_ntoa(temp_addr), pool_name, strerror(-clnt_res)); + } + goto out; + } + + if (ippool_debug) { +- dbglog("Freed address %s to pool %s", inet_ntoa(free_addr), pool_name); ++ struct in_addr temp_addr = {free_addr.s_addr}; ++ dbglog("Freed address %s to pool %s", inet_ntoa(temp_addr), pool_name); + } + out: + return; +@@ -138,8 +140,6 @@ static void ippool_choose_ip(u_int32_t * + { + ipcp_options *wo = &ipcp_wantoptions[0]; + ipcp_options *go = &ipcp_gotoptions[0]; +- ipcp_options *ao = &ipcp_allowoptions[0]; +- ipcp_options *ho = &ipcp_hisoptions[0]; + CLIENT *cl; + int result = 0; + diff --git a/meta-networking/recipes-daemons/ippool/ippool/0002-ippool_rpc_server.c-Add-missing-prototype-for-ippool.patch b/meta-networking/recipes-daemons/ippool/ippool/0002-ippool_rpc_server.c-Add-missing-prototype-for-ippool.patch new file mode 100644 index 0000000000..b8fdedf0c8 --- /dev/null +++ b/meta-networking/recipes-daemons/ippool/ippool/0002-ippool_rpc_server.c-Add-missing-prototype-for-ippool.patch @@ -0,0 +1,22 @@ +From f9ea91771f0d3c984e7d5fe9e15962db1ee686ad Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 29 Aug 2022 09:39:16 -0700 +Subject: [PATCH 2/2] ippool_rpc_server.c: Add missing prototype for + ippool_api_rpc_check_request + +Upstream-Status: Inappropriate [no upstream] +Signed-off-by: Khem Raj +--- + ippool_rpc_server.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/Makefile ++++ b/Makefile +@@ -123,6 +123,7 @@ $(IPPOOL_RPC_STEM)_server.c: $(IPPOOL_RP + -$(RM) $@ $@.tmp + rpcgen $(RPCGENFLAGS) -m -o $@.tmp $< + cat $@.tmp | sed -e 's/switch (rqstp->rq_proc) {/if (ippool_api_rpc_check_request(transp) < 0) return; switch (rqstp->rq_proc) {/' > $@ ++ sed -i '20i int ippool_api_rpc_check_request(SVCXPRT *xprt);' $@ + + $(IPPOOL_RPC_STEM)_client.c: $(IPPOOL_RPC_STEM).x + -$(RM) $@ diff --git a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb index b91ca53682..984acac76e 100644 --- a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb +++ b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb @@ -27,6 +27,8 @@ SRC_URI = "https://sourceforge.net/projects/openl2tp/files/${BPN}/${PV}/${BPN}-$ file://0002-link-with-libtirpc.patch \ file://0003-musl-fixes.patch \ file://strncpy-truncation.patch \ + file://0001-pppd-ippool.c-Fix-type-casting-issues-between-in_add.patch \ + file://0002-ippool_rpc_server.c-Add-missing-prototype-for-ippool.patch \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=4c59283b82fc2b166455e0fc23c71c6f" From patchwork Tue Aug 30 07:13:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12095 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 CFBD7C0502C for ; Tue, 30 Aug 2022 07:14:22 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web10.8673.1661843657362085351 for ; Tue, 30 Aug 2022 00:14:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=oAwwGroV; spf=pass (domain: gmail.com, ip: 209.85.216.44, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f44.google.com with SMTP id t5so10310677pjs.0 for ; Tue, 30 Aug 2022 00:14:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=SBaq2juDa+tPQE8yaG5JiXG+glI+mgIfeWZOgpLAeUA=; b=oAwwGroV4xAWkZjsFnXK3NBMTVLaBJUGHqw52zF+zoiDfExKqx0jRGK1C/oRnJFb6Q xpsN9z13A1AbLWAT4R1zypT6Tw5cOdr5VQjaqZzFwYT2vzEC5yejNQnVJA2t1UGkH8ZJ ZCgR59ZyO8mI8ZhzHqaWPnG9fd++8fTmseOPhd+tLw/tzC1ZQbjSBaC+r8iu931WLQs/ xlX9qE5HnvjDm+rYIryYGRDEnfFvWeVl1xQW8IqQhx6kYgKhlNVpdzqOWDRRmWDVXuPz PhlDR/BtxNbrxx2OcxjfBA6N9rAnyTNMSjVdepQaKWvyLCBbXVf6O3g5u/qvjyIIaAY3 ga4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=SBaq2juDa+tPQE8yaG5JiXG+glI+mgIfeWZOgpLAeUA=; b=oYZd2GjhozoxEZxbkfb35LC/XfdJj+O4r2/8ZfDdQZ+7QwJh38kOxQCck7hcj4HsCn MNHEBSQu7x+9cFIdivXYBK0mopeymgr1/sU7bv0tO+6Cl36qH2Fvt/h8cTeph9b/0Tgn asE1K6QtzYVUljww060DInhY592DM9kuandgVNZQ2tEQ1K/hDjJyMyTQrV9kI1Mo8Utw K2oFeh+sQOYjiROOp0YLIRFKJGsKHydtxzZYqJ9L3SBQKEDGY7mHwofVg674kAoW/ufb wgvRW77xj4BpX7Mm8EtkqNvl5OFPMrqFCxM5EUnv30Fitu1C8T/dBrV8ih6Z2ejgUQq4 lp1Q== X-Gm-Message-State: ACgBeo34qWHmKaz5oCnd8ldQXgU3HL5X86EBTWUTdfthYDTeXaVmLw/s Y1g/75ejIs5B8o2ZMP7RsyufaAn+aJQcTg== X-Google-Smtp-Source: AA6agR5ftQrlzTwdO1Gm9pH1vi5HKXahSSGogt7Kp4GB4vdRTq+2QZSrEnoDQI6L8sAykLSJmmJ59g== X-Received: by 2002:a17:903:32cc:b0:174:e627:4909 with SMTP id i12-20020a17090332cc00b00174e6274909mr6294308plr.67.1661843657467; Tue, 30 Aug 2022 00:14:17 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id z24-20020aa79f98000000b00537f9e32b00sm6041616pfr.37.2022.08.30.00.14.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 00:14:16 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 03/21] corosync: Upgrade to 3.1.6 Date: Tue, 30 Aug 2022 00:13:55 -0700 Message-Id: <20220830071413.3887189-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220830071413.3887189-1-raj.khem@gmail.com> References: <20220830071413.3887189-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 ; Tue, 30 Aug 2022 07:14:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98540 Changes - https://github.com/corosync/corosync/releases/tag/v3.1.6 Signed-off-by: Khem Raj --- .../corosync/{corosync_3.0.3.bb => corosync_3.1.6.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-networking/recipes-extended/corosync/{corosync_3.0.3.bb => corosync_3.1.6.bb} (96%) diff --git a/meta-networking/recipes-extended/corosync/corosync_3.0.3.bb b/meta-networking/recipes-extended/corosync/corosync_3.1.6.bb similarity index 96% rename from meta-networking/recipes-extended/corosync/corosync_3.0.3.bb rename to meta-networking/recipes-extended/corosync/corosync_3.1.6.bb index ec2a785277..8fca576614 100644 --- a/meta-networking/recipes-extended/corosync/corosync_3.0.3.bb +++ b/meta-networking/recipes-extended/corosync/corosync_3.1.6.bb @@ -10,7 +10,7 @@ inherit autotools pkgconfig systemd SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ file://corosync.conf \ " -SRC_URI[sha256sum] = "20eb903eb984f6a728282c199825e442e8bba869acefd22390076ef3a33a4ded" +SRC_URI[sha256sum] = "ca6ed32b4d7f33ed614afce8760fe58d0de92c68b575d4969ebacd892f3d1e27" UPSTREAM_CHECK_REGEX = "(?P\d+\.(?!99)\d+(\.\d+)+)" LICENSE = "BSD-3-Clause" From patchwork Tue Aug 30 07:13:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12109 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 EBB88C67868 for ; Tue, 30 Aug 2022 07:14:32 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web09.8756.1661843659252808778 for ; Tue, 30 Aug 2022 00:14:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=TeSNUDQY; spf=pass (domain: gmail.com, ip: 209.85.214.175, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f175.google.com with SMTP id p18so10243300plr.8 for ; Tue, 30 Aug 2022 00:14:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=OQpUaL/dAdoLgqXovHbgQqLY8UH5hoSMCmxRHbHrXTI=; b=TeSNUDQYU4o0u7TnJZBZLJQIqip5MGZnKLRBeuwOZl9FvJoXS9HmseTZk5z3wd2EeP dpiJKZqGv1tcRC63CgBd0NFqWioE4naQ9LBakeGxWzZA5jgEXoTVItdPRfhW2DcvD6VW e07wwlCWdsKSHjRlehlYu0pMd7wicanb1FRts1IZjdKOEicHX0L/wSvmm2DarA7Mg97U SKL47AIzSAovQoACUBKT1IhoYeIRXXLvnUX3dD9viRHB5qzczulKOsBPHCvrseaCAwkP VPFxIwkLUSeJ25h6mjnE06Nr+R0R6t/Vn8OBcrPHz3HqgwUOdYerZ3BzXRjXOR+3+rf0 irNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=OQpUaL/dAdoLgqXovHbgQqLY8UH5hoSMCmxRHbHrXTI=; b=cOwglGzDBDC5j/bY8UvT1CCe7p6RkmpK5j94qszoe78x4PzlKe+OJqGq1pSJUSFzPf 6q2QX5+PEK8+UOt67k3xbXPdRPtWDHM3UaBFLXfqzeMenRwqNOWVbKKwHTC/PWaODuwn vN/Tk0WIZBWSFzgfe1ceDqKCoUxkeedf/FR9UJoSUEpBVhkcDx8fJ97CmcnbeNBstwir ejXztIEu9tP3eGLIU6JARSfb732XL0irECI/kDJwH4naIlt4PKAU7PrmmtHHDeN/c4iU TfULTxOGw+oJELoO2HMbRF3g3EmuAgMbpZ57aQ+5ouc6V+OVKw/aKgZw5UE4fXAyTHlO 9sSg== X-Gm-Message-State: ACgBeo2IYgnT9qqVXopzK8bSRPQiJpGTIUCboh8GctGjmk8Fob1xOU75 6wt+4uy/LOw1e/lnvZ3gOwfggL8b/3Sjkg== X-Google-Smtp-Source: AA6agR5o3oEV78IJgXyWMGVd4zbNkaPjWNAfFOSTomX2b9XLl/aEtKT08QrPgilxmOXL2cqyWB0VvQ== X-Received: by 2002:a17:90b:3ec9:b0:1f5:62d5:4157 with SMTP id rm9-20020a17090b3ec900b001f562d54157mr21948889pjb.183.1661843658370; Tue, 30 Aug 2022 00:14:18 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id z24-20020aa79f98000000b00537f9e32b00sm6041616pfr.37.2022.08.30.00.14.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 00:14:17 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 04/21] dlm: Upgrade to 4.1.1 Date: Tue, 30 Aug 2022 00:13:56 -0700 Message-Id: <20220830071413.3887189-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220830071413.3887189-1-raj.khem@gmail.com> References: <20220830071413.3887189-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 ; Tue, 30 Aug 2022 07:14:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98541 Forward port patches and add a patch to fix compiler warnings Signed-off-by: Khem Raj --- ...error-since-xml2-config-should-not-b.patch | 13 +++++------ ...nclude-string.h-for-memset-prototype.patch | 23 +++++++++++++++++++ .../dlm/{dlm_4.0.9.bb => dlm_4.1.1.bb} | 4 ++-- 3 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 meta-networking/recipes-extended/dlm/dlm/0004-include-string.h-for-memset-prototype.patch rename meta-networking/recipes-extended/dlm/{dlm_4.0.9.bb => dlm_4.1.1.bb} (91%) diff --git a/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch b/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch index f56359a473..3d1551574e 100644 --- a/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch +++ b/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch @@ -1,4 +1,4 @@ -From ad207a6f83dac390b2d95e3a8262d27292921863 Mon Sep 17 00:00:00 2001 +From da08f5ec5e553bd43f92a0b0f7476179b0b74502 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Wed, 26 Jun 2019 11:49:33 +0800 Subject: [PATCH] dlm: fix compile error since xml2-config should not be used @@ -9,28 +9,27 @@ to find libxml2. Upstream-Status: Inappropriate [oe-specific] Signed-off-by: Changqing Li + --- fence/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fence/Makefile b/fence/Makefile -index b927879..6e16078 100644 +index 2b080468..ff2eda3f 100644 --- a/fence/Makefile +++ b/fence/Makefile -@@ -18,11 +18,11 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ +@@ -18,12 +18,12 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ -fstack-clash-protection -Wl,-z,now CFLAGS += -fPIE -DPIE -CFLAGS += `xml2-config --cflags` +CFLAGS += `pkg-config libxml-2.0 --cflags` CFLAGS += -I../include + CFLAGS += $(shell pkg-config --cflags pacemaker-fencing) - LDFLAGS += -Wl,-z,relro -pie + LDFLAGS += -Wl,-z,relro -Wl,-z,defs -pie -LDFLAGS += `xml2-config --libs` +LDFLAGS += `pkg-config libxml-2.0 --libs` LDFLAGS += -ldl all: $(BIN_TARGET) --- -2.7.4 - diff --git a/meta-networking/recipes-extended/dlm/dlm/0004-include-string.h-for-memset-prototype.patch b/meta-networking/recipes-extended/dlm/dlm/0004-include-string.h-for-memset-prototype.patch new file mode 100644 index 0000000000..257c5d02ff --- /dev/null +++ b/meta-networking/recipes-extended/dlm/dlm/0004-include-string.h-for-memset-prototype.patch @@ -0,0 +1,23 @@ +From 9652e6b3c43b4c051f2ff0e000d7ebf5fbab418e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 29 Aug 2022 10:54:51 -0700 +Subject: [PATCH] include string.h for memset prototype + +Upstream-Status: Submitted [https://pagure.io/dlm/pull-request/3] +Signed-off-by: Khem Raj +--- + dlm_controld/lib.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dlm_controld/lib.c b/dlm_controld/lib.c +index 8cbdd27f..a7502fcd 100644 +--- a/dlm_controld/lib.c ++++ b/dlm_controld/lib.c +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb b/meta-networking/recipes-extended/dlm/dlm_4.1.1.bb similarity index 91% rename from meta-networking/recipes-extended/dlm/dlm_4.0.9.bb rename to meta-networking/recipes-extended/dlm/dlm_4.1.1.bb index 3e699d2ff6..bb33890ec9 100644 --- a/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb +++ b/meta-networking/recipes-extended/dlm/dlm_4.1.1.bb @@ -9,10 +9,10 @@ SRC_URI = "https://pagure.io/dlm/archive/dlm-${PV}/dlm-dlm-${PV}.tar.gz \ file://0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch \ file://0001-Include-sys-sysmacros.h-for-major-minor-macros-in-gl.patch \ file://0001-make-Replace-cp-a-with-mode-preserving-options.patch \ + file://0004-include-string.h-for-memset-prototype.patch \ " -SRC_URI[md5sum] = "4c57a941a15547859cd38fd55f66388e" -SRC_URI[sha256sum] = "d59142e067cbd603aaf66151a04e9fa34330219680b8827c953d20821b951991" +SRC_URI[sha256sum] = "f12c0056b9196dfcecbec2fa8930feb87c605a86ef0f3d7bd6fb0b77cd7f45ca" UPSTREAM_CHECK_URI = "https://pagure.io/dlm/releases" UPSTREAM_CHECK_REGEX = "dlm-(?P\d+(\.\d+)+)" From patchwork Tue Aug 30 07:13:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12096 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 CF132C0502A for ; Tue, 30 Aug 2022 07:14:22 +0000 (UTC) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web10.8674.1661843660293711306 for ; Tue, 30 Aug 2022 00:14:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=kVrCe28F; spf=pass (domain: gmail.com, ip: 209.85.216.47, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f47.google.com with SMTP id o4so10264621pjp.4 for ; Tue, 30 Aug 2022 00:14:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=/6tLNCNIQ0GEinAX5bJUC9sgs2NxwLQ1CLRZYqbe7RI=; b=kVrCe28FFo1uQbIRVNKJuTLqvEDfsK3CLnbv9PgVJ4SWpxyXXthVDVlwaKzYAqJrFb EOXgzVZjm+VLQTjUbd/UfTIit5ibVcAXt4fevgdgMoDnLrR3jUWOhFw+3J+bQuoe7S2i m2a3FlenjtkkjYulFKPGCKYDr3hIOGVPCWBGANgn/Yl4ptPH+TeiWH/CLwF31Bg0VynB dz5LPo0pjUFxbhR7rXXrCfT9Z0ZkrzHSXkss07vdXN67M2tGv1HsEw2kZCg4eE97pvnP KfgLw/BZdBH2cOInLKn6DlorEbuXAayHArGi37HYg9ENPpKnhKSl69CcnUkOkPtWg1re 6yvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=/6tLNCNIQ0GEinAX5bJUC9sgs2NxwLQ1CLRZYqbe7RI=; b=YVKttDqD3jPTV6dgCsVPj1KCkFYGVoBedmlZYHhSn/W8OrZbR0n2lpX04ktQ0wyqcw vyKOtPFk/SZsSTInm+qIaNve5GXzxQnOJQGUErmox5QWzAKdu/A3ipU8od2RomrwwKvM 9uHyEyfH5A5oMHN9Hfq6nTQ06wJyCgutOkmWGEDyZP6Ovd6mQ3hZWFbp6qYEN4ccxAvH ZkBU/2RdpbAXiVXcKAbDizwtL9+rlmiAZM6RXENh0Av93QE8e7sc6aYVsqjsi3XgNM3a H4E8TM0uy9qL6fn7BG524ugwfakauszTof5gL2fx/t4EhC7EkPW4lc6kiuxigkg3Coyp KNiQ== X-Gm-Message-State: ACgBeo2MvIzG9uDQ/H5uqlX2cZtir8SJx2t075nbUyjgQA6LF8efuxYK lBkuWNVMDqKOhowl49CSwT9OryLRMyFETA== X-Google-Smtp-Source: AA6agR4vPTu8TuZ4tMqd3ODQ0i51SoS00uv8joAGH24GeAHabNJ4Z5dw9AGmuwtmxzy3PcwQcAfMHg== X-Received: by 2002:a17:90a:e515:b0:1fd:6e58:40 with SMTP id t21-20020a17090ae51500b001fd6e580040mr19973294pjy.46.1661843659373; Tue, 30 Aug 2022 00:14:19 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id z24-20020aa79f98000000b00537f9e32b00sm6041616pfr.37.2022.08.30.00.14.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 00:14:18 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 05/21] dante: Upgrade to 1.4.3 Date: Tue, 30 Aug 2022 00:13:57 -0700 Message-Id: <20220830071413.3887189-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220830071413.3887189-1-raj.khem@gmail.com> References: <20220830071413.3887189-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 ; Tue, 30 Aug 2022 07:14:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98542 License-Update: Dates and address changed Link with libtirpc for bindresvport() implementation Drop krb5 packageconfig, its gone from this version Signed-off-by: Khem Raj --- .../dante/{dante_1.4.1.bb => dante_1.4.3.bb} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename meta-networking/recipes-protocols/dante/{dante_1.4.1.bb => dante_1.4.3.bb} (82%) diff --git a/meta-networking/recipes-protocols/dante/dante_1.4.1.bb b/meta-networking/recipes-protocols/dante/dante_1.4.3.bb similarity index 82% rename from meta-networking/recipes-protocols/dante/dante_1.4.1.bb rename to meta-networking/recipes-protocols/dante/dante_1.4.3.bb index 48f9708560..746c08be6e 100644 --- a/meta-networking/recipes-protocols/dante/dante_1.4.1.bb +++ b/meta-networking/recipes-protocols/dante/dante_1.4.3.bb @@ -9,12 +9,11 @@ what could be described as a non-transparent Layer 4 router." HOMEPAGE = "http://www.inet.no/dante/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=221118dda731fe93a85d0ed973467249" +LIC_FILES_CHKSUM = "file://LICENSE;md5=edd508404db7339042dfc861a3a690ad" SRC_URI = "https://www.inet.no/dante/files/dante-${PV}.tar.gz \ " -SRC_URI[md5sum] = "68c2ce12119e12cea11a90c7a80efa8f" -SRC_URI[sha256sum] = "b6d232bd6fefc87d14bf97e447e4fcdeef4b28b16b048d804b50b48f261c4f53" +SRC_URI[sha256sum] = "418a065fe1a4b8ace8fbf77c2da269a98f376e7115902e76cda7e741e4846a5d" # without --without-gssapi, config.log will contain reference to /usr/lib # as a consequence of GSSAPI path being set to /usr by default. @@ -23,16 +22,17 @@ SRC_URI[sha256sum] = "b6d232bd6fefc87d14bf97e447e4fcdeef4b28b16b048d804b50b48f26 # --enable-release build prerelease as full release EXTRA_OECONF += "--without-gssapi --sbindir=${bindir}" -DEPENDS += "flex-native bison-native libpam" - +DEPENDS += "flex-native bison-native libpam libtirpc" inherit autotools-brokensep features_check +CFLAGS += "-I${STAGING_INCDIR}/tirpc" +LIBS += "-ltirpc" + REQUIRED_DISTRO_FEATURES = "pam" EXTRA_AUTORECONF = "-I ${S}" PACKAGECONFIG[libwrap] = ",--disable-libwrap,tcp-wrappers,libwrap" -PACKAGECONFIG[krb5] = ",--without-krb5,krb5" PACKAGECONFIG ??= "" From patchwork Tue Aug 30 07:13:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12094 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 C1356ECAAA1 for ; Tue, 30 Aug 2022 07:14:22 +0000 (UTC) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mx.groups.io with SMTP id smtpd.web11.8826.1661843661083690107 for ; Tue, 30 Aug 2022 00:14:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Pl3CgD3P; spf=pass (domain: gmail.com, ip: 209.85.216.43, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f43.google.com with SMTP id z3-20020a17090abd8300b001fd803e34f1so8398563pjr.1 for ; Tue, 30 Aug 2022 00:14:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=/5pLb5rjCRj6TV+L9THFBb8NyTIG/iEI0nVOijKztDE=; b=Pl3CgD3Pzqwi8kbO54nS4nvkP3L8Gv49p7M0rxS5KwiTRa/PMp9m4TUHC+yAtdi+pv f04Vp//AVqPW3CpO3sDhxJW/7NyJdMGk2eBmrQkfiOfp1o4Cel10B9buDOFESEeDOK3H vvw0I8nQ0wYAxJ3Q6OLRoL0RwOPnyifPxq9Z4YpgYc6IBW5sd9+oGhyezIGnRBRknfl8 YWNicM8XK5FEkFtMZZ3GjUhFrMY0ShJQ0hX6XKCCLoHlGWfkNE+O1nZePMYHJDmJ8jr7 Cmhptv5j8qyr5PSJ1BnDpnQ2s7t6/AxtJbt2lcg9tPsoXTcziUXABfmi4FcV+5adQU9y bnMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=/5pLb5rjCRj6TV+L9THFBb8NyTIG/iEI0nVOijKztDE=; b=M31+Ot7lanWBXQDQe8hh+HLdNAiOtH+9yfJ8cGoUbwsugKvtYKPmNXI+2nT5j7ESqc /uQGJD9EtvOhGLBsIxVKQ1JJEJXC8IAOQt8Oj22Lao+6uu02K/0/Pdt+8AXbux1PzBHJ DRGAVf7PjVHCCOGxrcU/9usku3OZ/0ivNs03h+lPNafLJxkCSxoQvXjqikWG0sOy6Q/e kDKeqKvKoOk9xaqOG+wd2jrQ6GyNOLPIo9Y9mJY7N/Jba5xHTE7UmEMfEdHuQA3D8bue 2AzB3jGwavtEMZqpS5zN7ZhmcKMvbx3KdkowaY8vT7sxrRoglqPkHj3v9TwShQxRv6zm i3Kw== X-Gm-Message-State: ACgBeo0kj6N1QuTEmq/eor9aWpi1Yb8zLveOYPiBa+IAXTUD7yAJ+VWf htolQjKR26MLxqo7m/kMeDBilx4kr0waEA== X-Google-Smtp-Source: AA6agR5Ja/k9RJ6ElDiCCDWJshdEIo4iBgiN3G30vEH4Y7NS0annMOv+yIEgvMBWjtT3BUIQ8voEog== X-Received: by 2002:a17:90b:17d0:b0:1fb:5bbc:917c with SMTP id me16-20020a17090b17d000b001fb5bbc917cmr22561111pjb.109.1661843660267; Tue, 30 Aug 2022 00:14:20 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id z24-20020aa79f98000000b00537f9e32b00sm6041616pfr.37.2022.08.30.00.14.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 00:14:19 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 06/21] ez-ipupdate: Fix build with clang Date: Tue, 30 Aug 2022 00:13:58 -0700 Message-Id: <20220830071413.3887189-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220830071413.3887189-1-raj.khem@gmail.com> References: <20220830071413.3887189-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 ; Tue, 30 Aug 2022 07:14:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98543 Signed-off-by: Khem Raj --- .../ez-ipupdate/ez-ipupdate_3.0.11b7.bb | 11 ++--- ...nclude-time.h-for-time-API-prototype.patch | 44 +++++++++++++++++++ 2 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 meta-networking/recipes-connectivity/ez-ipupdate/files/0001-ez-ipupdate-Include-time.h-for-time-API-prototype.patch diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb b/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb index 8648f2e0e6..42ecf9bac4 100644 --- a/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb +++ b/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb @@ -5,11 +5,12 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=7783169b4be06b54e86730eb01bc3a31" SRC_URI = "http://sourceforge.net/projects/ez-ipupdate/files/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ - file://Makefile.am.patch \ - file://cache_file.c.patch \ - file://conf_file.c.patch \ - file://wformat.patch \ - " + file://Makefile.am.patch \ + file://cache_file.c.patch \ + file://conf_file.c.patch \ + file://wformat.patch \ + file://0001-ez-ipupdate-Include-time.h-for-time-API-prototype.patch \ + " SRC_URI[md5sum] = "525be4550b4461fdf105aed8e753b020" SRC_URI[sha256sum] = "a15ec0dc0b78ec7578360987c68e43a67bc8d3591cbf528a323588830ae22c20" diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/files/0001-ez-ipupdate-Include-time.h-for-time-API-prototype.patch b/meta-networking/recipes-connectivity/ez-ipupdate/files/0001-ez-ipupdate-Include-time.h-for-time-API-prototype.patch new file mode 100644 index 0000000000..b2a2ebdae3 --- /dev/null +++ b/meta-networking/recipes-connectivity/ez-ipupdate/files/0001-ez-ipupdate-Include-time.h-for-time-API-prototype.patch @@ -0,0 +1,44 @@ +From 6c8fe883df993b9e7987c8f1c849962f8007a373 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 29 Aug 2022 12:50:37 -0700 +Subject: [PATCH] ez-ipupdate: Include time.h for time() API prototype + +Fix printf format specifiers for snprintf + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + ez-ipupdate.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/ez-ipupdate.c b/ez-ipupdate.c +index 15a4c13..5cbe7f3 100644 +--- a/ez-ipupdate.c ++++ b/ez-ipupdate.c +@@ -38,6 +38,8 @@ + # include + #endif + ++#include ++ + // you man very well need to edit this, don't worry though, email is only sent + // if bad things happend and it has to exit when in daemon mode. + #define SEND_EMAIL_CMD "mail" +@@ -2483,7 +2485,7 @@ int DHS_update_entry(void) + p += strlen(p); + limit = BUFFER_SIZE - 1 - strlen(buf); + +- snprintf(buf, BUFFER_SIZE, "Content-length: %d\015\012", strlen(putbuf)); ++ snprintf(buf, BUFFER_SIZE, "Content-length: %lu\015\012", strlen(putbuf)); + output(buf); + snprintf(buf, BUFFER_SIZE, "\015\012"); + output(buf); +@@ -2620,7 +2622,7 @@ int DHS_update_entry(void) + p += strlen(p); + limit = BUFFER_SIZE - 1 - strlen(buf); + +- snprintf(buf, BUFFER_SIZE, "Content-length: %d\015\012", strlen(putbuf)); ++ snprintf(buf, BUFFER_SIZE, "Content-length: %lu\015\012", strlen(putbuf)); + output(buf); + snprintf(buf, BUFFER_SIZE, "\015\012"); + output(buf); From patchwork Tue Aug 30 07:13:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12093 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 C316FECAAD8 for ; Tue, 30 Aug 2022 07:14:22 +0000 (UTC) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mx.groups.io with SMTP id smtpd.web12.8929.1661843662143043760 for ; Tue, 30 Aug 2022 00:14:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=DDisXRW1; spf=pass (domain: gmail.com, ip: 209.85.216.54, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f54.google.com with SMTP id h11-20020a17090a470b00b001fbc5ba5224so10966688pjg.2 for ; Tue, 30 Aug 2022 00:14:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=rgtxxncdoo+Iq0vhiosS8njOWy5h8UTL5q4rqDc2jhI=; b=DDisXRW1q174O+6CMTX1kahx0zu94ozTmR2euYegFpjbkSOjcAdxcysTm8nYjNLo5A xQQVSg9b7H63cw/ZWfCAtMaDJCYG0JNC5hdGS0K3xfRn4g21AxkT22kPhiGYDo/ngQ2M xWHCf+/oPHfTNRF8kFwBLRn++wVe13DMIx1uzkYV5rWHO0tqMp1etSa5jaQxEv6sIT4v nLpVk06UpT7QEK8x8375BWluecuJ7Nd3mlevKU5xO1yAkOZ2m6UpnC0QgHjpzrJfKBtv 88CrOHqbbQM0yyxtYr8cWWSfaZtLBZsG1yJZt1HykATOU80Zc3lYiOsrCeN88IMNWpvz xy5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=rgtxxncdoo+Iq0vhiosS8njOWy5h8UTL5q4rqDc2jhI=; b=AYfoToEXR3KmJYLCwSomcDJvnM9WCEELEYqdXqX5eWW61zCGkywyFv3VhL6lfHohO3 Y4wDvRGru7pPKlnsT8iFjMrSdLPm9yO6aFZvLJV5uYIF1X4inVUShppTkd3KnUYhgKIS mWeVFD4Wh3MMRhcafWoiwyTs7mLF//uDDwbSgvSCbG6MqLRuoM8QigcwyN9FaDXw0Zmi QIingxvTkYxJE+X8LRuGXje/12rA9lczwxtXz3SZWirR7nUf5omEo+TGUrzTFhE/7H0W QsIBiXtVAObKAPLsuSP9J5Xnfj6UHBxM/3ihTOETaiQjUPoVxDJxi+EyEeOQUo9bApsf i2dA== X-Gm-Message-State: ACgBeo1w0ri8OhsTVKtMEKl+Uz7HZN8fmYJcGSk/RTcO+Uu2K3xZh1Hn 97swzn99BZAMZbXE6jLsg1aXev22QDPAxQ== X-Google-Smtp-Source: AA6agR41S3RLz2fNfmjeEoWxbnYOJXmNxy2hp6tJGv1mMa3Wk7l+wt2BRNzLpAWR4wnuel/9Ka772w== X-Received: by 2002:a17:90b:2242:b0:1fe:61c:3022 with SMTP id hk2-20020a17090b224200b001fe061c3022mr2448426pjb.197.1661843661293; Tue, 30 Aug 2022 00:14:21 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id z24-20020aa79f98000000b00537f9e32b00sm6041616pfr.37.2022.08.30.00.14.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 00:14:20 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 07/21] openflow: Include sys/stat.h for fchmod Date: Tue, 30 Aug 2022 00:13:59 -0700 Message-Id: <20220830071413.3887189-7-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220830071413.3887189-1-raj.khem@gmail.com> References: <20220830071413.3887189-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 ; Tue, 30 Aug 2022 07:14:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98544 Signed-off-by: Khem Raj --- ...t-util-Include-sys-stat.h-for-fchmod.patch | 23 +++++++++++++++++++ .../openflow/openflow_git.bb | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 meta-networking/recipes-protocols/openflow/openflow/0001-socket-util-Include-sys-stat.h-for-fchmod.patch diff --git a/meta-networking/recipes-protocols/openflow/openflow/0001-socket-util-Include-sys-stat.h-for-fchmod.patch b/meta-networking/recipes-protocols/openflow/openflow/0001-socket-util-Include-sys-stat.h-for-fchmod.patch new file mode 100644 index 0000000000..97e3422166 --- /dev/null +++ b/meta-networking/recipes-protocols/openflow/openflow/0001-socket-util-Include-sys-stat.h-for-fchmod.patch @@ -0,0 +1,23 @@ +From b875c6e264eaf7350ad4e4ebf427692d8fd3cd72 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 29 Aug 2022 12:58:53 -0700 +Subject: [PATCH] socket-util: Include sys/stat.h for fchmod + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + lib/socket-util.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/socket-util.c b/lib/socket-util.c +index c7b5d6d..5b3d602 100644 +--- a/lib/socket-util.c ++++ b/lib/socket-util.c +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + #include + #include + #include "fatal-signal.h" diff --git a/meta-networking/recipes-protocols/openflow/openflow_git.bb b/meta-networking/recipes-protocols/openflow/openflow_git.bb index b6cef0730a..1ac5dd4105 100644 --- a/meta-networking/recipes-protocols/openflow/openflow_git.bb +++ b/meta-networking/recipes-protocols/openflow/openflow_git.bb @@ -3,8 +3,8 @@ include ${BPN}.inc SRCREV = "c84f33f09d5dbcfc9b489f64cb30475bf36f653a" PV = "1.0+git${SRCPV}" -SRC_URI += "\ - file://0001-Check-and-use-strlcpy-from-libc-before-defining-own.patch \ +SRC_URI += "file://0001-Check-and-use-strlcpy-from-libc-before-defining-own.patch \ file://0002-lib-netdev-Adjust-header-include-sequence.patch \ file://0001-generate-not-static-get_dh-functions.patch \ + file://0001-socket-util-Include-sys-stat.h-for-fchmod.patch \ " From patchwork Tue Aug 30 07:14:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12106 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 EA2E9C64991 for ; Tue, 30 Aug 2022 07:14:32 +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.web12.8930.1661843663057816727 for ; Tue, 30 Aug 2022 00:14:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=KfCAyPrd; 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 y141so10493118pfb.7 for ; Tue, 30 Aug 2022 00:14:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=12unwtpObbrX3K2L3Pw9clfIe8xLzA+fOGp8jF417AU=; b=KfCAyPrd/pL3ip5XwQEVqaVEEAig8xOSJhlHa1JX4+7Kyxwd2IK9nEzUmi2hJUti9S 30dzGCe+dS/21n/9uHEWwD+OQoJincXQ0jfmfd2Ds9zZy86tZ7TPSL1hNwomSJQ3TLmI ktbVke7QdYdDTPaNpfS39Rf41XTiYy/vEUDTSiLxhHfWHPrBhz8128d5GxQ/+a93O5vr qQx8qynyALGqzI3y/bym2F9eD7nlizK4zYDm0H2Q3tSc7BmppPCzHt0sg2BBrjz22rdM umyOlN22G0Yydxz7+lJHsHANwv70so0sbeMXKNu6OWjgBxx5+wrMqZrKjAT5HNmh23EZ jk+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=12unwtpObbrX3K2L3Pw9clfIe8xLzA+fOGp8jF417AU=; b=0npMAkcOdyQahL/zdvT/OwS/Y8VD/aeBcua0L/BBG/AIJhhzHcnIuslv0nvYUZJPzo Xxh9eu0j6sas+fV8bN3UuNzkIUvKTVRq5e6WFZfvpq3WsSD/yoZZEm+WVH1HQQ675KS/ HJS1j/Qbiwsp1rkwJbgdDQEsxL5PJjrTKTH13FKEKamV/RgATksfnvzwrgKE+mn6f8Nw M5UEv7u1ZUzGsDFOccK2vfOycJaynhZKdVZ8fjuwXh3lrbfGBe0RPfKSV85Iyeh3WZ7f ja5ifFmwlGKxSQkE+F8wLn2PLRKBS6wlzXcm+whtRmr12T5/NvGZ2JmgnmrlYzA2XAnS Xk1w== X-Gm-Message-State: ACgBeo3zVbKHlqsYVSYDczZmdzCxhvAu2j/4X0iW0NvIXU/7/oByPJlQ Iz8eqRL7OohFqSmELbL96ngM9NFhDKetKA== X-Google-Smtp-Source: AA6agR5liehpyAg7VPcBWd6pLW5e7brVbhKYCpXKluOUaPiMYek4MLfkPTOkT/3aD+/1WRoWOYuyNA== X-Received: by 2002:a65:6d0f:0:b0:42b:42f8:efe0 with SMTP id bf15-20020a656d0f000000b0042b42f8efe0mr17469739pgb.197.1661843662197; Tue, 30 Aug 2022 00:14:22 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id z24-20020aa79f98000000b00537f9e32b00sm6041616pfr.37.2022.08.30.00.14.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 00:14:21 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 08/21] nautilus: Backport a patch to fix build with clang-15 Date: Tue, 30 Aug 2022 00:14:00 -0700 Message-Id: <20220830071413.3887189-8-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220830071413.3887189-1-raj.khem@gmail.com> References: <20220830071413.3887189-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 ; Tue, 30 Aug 2022 07:14:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98545 Signed-off-by: Khem Raj --- ...r-prototype-for-functions-without-pa.patch | 94 +++++++++++++++++++ .../recipes-gnome/nautilus/nautilus_42.2.bb | 1 + 2 files changed, 95 insertions(+) create mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus/0001-Provide-parameter-prototype-for-functions-without-pa.patch diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Provide-parameter-prototype-for-functions-without-pa.patch b/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Provide-parameter-prototype-for-functions-without-pa.patch new file mode 100644 index 0000000000..6c743d8ce7 --- /dev/null +++ b/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Provide-parameter-prototype-for-functions-without-pa.patch @@ -0,0 +1,94 @@ +From 76f1625bae95212ec6d4bc1bd1c8ff1232150c48 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 29 Aug 2022 13:14:09 -0700 +Subject: [PATCH] Provide parameter prototype for functions without parameter + +Fixes build with clang-15 with -Wstrict-prototypes + +src/nautilus-toolbar.c:1205:22: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] +nautilus_toolbar_new () + ^ + void + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/nautilus/-/commit/95d35aedf68f0398a6ee9e0b0af9ce80528fdc22] +Signed-off-by: Khem Raj +--- + src/nautilus-file-undo-manager.c | 4 ++-- + src/nautilus-list-model.c | 2 +- + src/nautilus-starred-directory.c | 2 +- + src/nautilus-toolbar.c | 2 +- + src/nautilus-view-model.c | 2 +- + 5 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/nautilus-file-undo-manager.c b/src/nautilus-file-undo-manager.c +index 2a886176f..f2d1eebcf 100644 +--- a/src/nautilus-file-undo-manager.c ++++ b/src/nautilus-file-undo-manager.c +@@ -258,13 +258,13 @@ nautilus_file_undo_manager_get_state (void) + + + gboolean +-nautilus_file_undo_manager_is_operating () ++nautilus_file_undo_manager_is_operating (void) + { + return undo_singleton->is_operating; + } + + NautilusFileUndoManager * +-nautilus_file_undo_manager_get () ++nautilus_file_undo_manager_get (void) + { + return undo_singleton; + } +diff --git a/src/nautilus-list-model.c b/src/nautilus-list-model.c +index 7e2aeeeee..741007105 100644 +--- a/src/nautilus-list-model.c ++++ b/src/nautilus-list-model.c +@@ -1625,7 +1625,7 @@ nautilus_list_model_get_drag_view (NautilusListModel *model, + } + + GtkTargetList * +-nautilus_list_model_get_drag_target_list () ++nautilus_list_model_get_drag_target_list (void) + { + GtkTargetList *target_list; + +diff --git a/src/nautilus-starred-directory.c b/src/nautilus-starred-directory.c +index fd41418a4..07ed62693 100644 +--- a/src/nautilus-starred-directory.c ++++ b/src/nautilus-starred-directory.c +@@ -556,7 +556,7 @@ nautilus_starred_directory_class_init (NautilusFavoriteDirectoryClass *klass) + } + + NautilusFavoriteDirectory * +-nautilus_starred_directory_new () ++nautilus_starred_directory_new (void) + { + NautilusFavoriteDirectory *self; + +diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c +index 5fe4e63a4..15a696827 100644 +--- a/src/nautilus-toolbar.c ++++ b/src/nautilus-toolbar.c +@@ -1202,7 +1202,7 @@ nautilus_toolbar_class_init (NautilusToolbarClass *klass) + } + + GtkWidget * +-nautilus_toolbar_new () ++nautilus_toolbar_new (void) + { + return g_object_new (NAUTILUS_TYPE_TOOLBAR, + NULL); +diff --git a/src/nautilus-view-model.c b/src/nautilus-view-model.c +index 84c40302d..2935809ae 100644 +--- a/src/nautilus-view-model.c ++++ b/src/nautilus-view-model.c +@@ -190,7 +190,7 @@ compare_data_func (gconstpointer a, + } + + NautilusViewModel * +-nautilus_view_model_new () ++nautilus_view_model_new (void) + { + return g_object_new (NAUTILUS_TYPE_VIEW_MODEL, NULL); + } diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_42.2.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_42.2.bb index f9c2ed020b..a0f928ce25 100644 --- a/meta-gnome/recipes-gnome/nautilus/nautilus_42.2.bb +++ b/meta-gnome/recipes-gnome/nautilus/nautilus_42.2.bb @@ -21,6 +21,7 @@ inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check def gnome_verdir(v): return oe.utils.trim_version(v, 1) +SRC_URI += " file://0001-Provide-parameter-prototype-for-functions-without-pa.patch" SRC_URI[archive.sha256sum] = "99212d2eb75996f181728ad04a2e2d86f2577b064e68a34c8b81a7037df4ccb2" REQUIRED_DISTRO_FEATURES = "x11" From patchwork Tue Aug 30 07:14:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12108 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 EAFA6C6FA82 for ; Tue, 30 Aug 2022 07:14:32 +0000 (UTC) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mx.groups.io with SMTP id smtpd.web12.8931.1661843664327561696 for ; Tue, 30 Aug 2022 00:14:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=px5inUYq; spf=pass (domain: gmail.com, ip: 209.85.210.177, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f177.google.com with SMTP id x19so8620771pfr.1 for ; Tue, 30 Aug 2022 00:14:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=hPCgRGpowdNiuzPY7aoKT3MLMuFvxtU/0/G8pICaRmQ=; b=px5inUYqiIEJqzzhFdln1Z4wbTDCfNxfNwxS47vXFlpUkClF/nIGHaijfKlN3kWwwB W/21Mvvpc1tanbECx5vSNAqaS1DsOF05JkYd+hMNNKP33289noNt4ozsr/nSKgn76Kgg t2vJ/KMi4XmR7djFjg3b8KZF7drDFFrfrGWIPJtodwYNsxkpTZkab0G9ebiEC9hjLw9t UcsNmwJ80IMHE2Zgj/GeHsfUMk+So50l69fIeQbP/KizS4MDfrg4lnj2a+xzo/7ZKXtM Q7rRB5D1ddm/O7GcbTkFlDLWrmi7lM/Ng+zqYMJR7xf8H8qBuXp0B7QSh6D0wT5mLUzs O7iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=hPCgRGpowdNiuzPY7aoKT3MLMuFvxtU/0/G8pICaRmQ=; b=HHdNUBChYR+9QvQHwvkTX6FUmBxYjXRX/8CumtZIRefZnq/3z1uSkDMZ/8xbgf6Rgi fab2opr+i7YYYRPhCQK/JaYiRbLJSDvzRmURZocNsXcQ0uerStif2J45OwhHtYb5wYmw 8JhQW2HZCtBZXbO6EHm7WyTMPFg2VcT94LUvsVV+NaJIsDTFX14J6jxu/wf43oJk1Cv4 1QIEt7449cgrV2h3EvoKmmWs6Yu9DS4bzloyJdc0TrUS0WUUKztPp6jxzGZWDzHPnORN g2B8TtuSSLOVBzSLrJGEL0ow6a+dRzleOIxJ6n0gGfXJDs5o8nQQnZ7CRznUamz6r4VB S6SA== X-Gm-Message-State: ACgBeo3c515SHKNHti1YlVw5J2NUsL8J6RWKO7CqLw7ExFK0ISfoMdVi MY6TdfvaW4u/GIvEi8B6TVOI6d2l08K6AA== X-Google-Smtp-Source: AA6agR7WJykBvbDrsImvPvBE9U07Tldtcv0wi6TVS4zUdp+G2eD6bqVMhEpr79acz0LSo41/j80CRA== X-Received: by 2002:a05:6a00:2349:b0:536:bf09:9c0a with SMTP id j9-20020a056a00234900b00536bf099c0amr20191786pfj.32.1661843663127; Tue, 30 Aug 2022 00:14:23 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id z24-20020aa79f98000000b00537f9e32b00sm6041616pfr.37.2022.08.30.00.14.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 00:14:22 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 09/21] mctp: Update to latest tip of trunk Date: Tue, 30 Aug 2022 00:14:01 -0700 Message-Id: <20220830071413.3887189-9-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220830071413.3887189-1-raj.khem@gmail.com> References: <20220830071413.3887189-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 ; Tue, 30 Aug 2022 07:14:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98546 Signed-off-by: Khem Raj --- meta-networking/recipes-support/mctp/mctp_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/mctp/mctp_git.bb b/meta-networking/recipes-support/mctp/mctp_git.bb index 602724da34..516f3e2d9e 100644 --- a/meta-networking/recipes-support/mctp/mctp_git.bb +++ b/meta-networking/recipes-support/mctp/mctp_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4cc91856b08b094b4f406a29dc61db21" PV = "1.0+git${SRCPV}" -SRCREV = "669740432af525c19a6a41cec777406fbbc24836" +SRCREV = "ae3a9162d6c5df0fa50abc34fc951dfd0e3d23c5" SRC_URI = "git://github.com/CodeConstruct/mctp;branch=main;protocol=https" From patchwork Tue Aug 30 07:14:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12104 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 DD916C0502A for ; Tue, 30 Aug 2022 07:14:32 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web12.8932.1661843664966213618 for ; Tue, 30 Aug 2022 00:14:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Bt0MHtqM; spf=pass (domain: gmail.com, ip: 209.85.215.182, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f182.google.com with SMTP id v4so9876178pgi.10 for ; Tue, 30 Aug 2022 00:14:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=gUcmsT7l7rg2Nnwb9rJEPuNmiojtkcyeBtliB9F0iHI=; b=Bt0MHtqM4aHPc0KbLqeBQmMiZ9v/yQlGVI8ViIHVSchwfIClspmzoKVue6PYDtZ+7v ms2iVDsA2rE5+jBw6XQRyuvXfopI9Y63s6uGZpeB8Gp9QPjHTneb0qmXGLhgXcy1/fgX LnZEMUWuEZPXnFzUIEbHF9IxBb4YEwnbFHy/j4WFOifcJMSNfhTXAjcXUASXFmuk17lS 4PbG135nYAwfH+KfoNIwaDsCzcQmZcsBf8H5Ie4g0q0+seFrzOO2oWmRBBANAL/pSxtF ZLGUFGCC5zrz12s3QdA/4b/ePX5AjEwf4UO9tWPYKWmQfu51G2Olu+jFfknY5tIe4ZJZ xRRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=gUcmsT7l7rg2Nnwb9rJEPuNmiojtkcyeBtliB9F0iHI=; b=kBz1n269Qh5k0QC3K2Sz4vQfv/cGM+D4MaZJXCk6wihla8hinY3+CbqmOOOidvuSxA 3MwVzmwHR++Ocbv/oPWK8hyryYSKQsd5Vj+p0Vxl0f7UNkfjqaKcojRXUnNz8yN7qpee 1eaXvtbD3sG98cmRyF+odfERtsSE/TWkRu2ot83EHCKQ6/ay+8AI8nJI0EMRTSRDX8fq dZ91zU/usqZX83xyQeNS/9ei2miGJEB4SsfBcQZafX3A5YKGw6Npu3M91IukS5iN37M8 6oXmTkHD0cO8auTjxTu7LQgGEgnlNAAkeyF+ppNZuXiGBdiIpsdRNdtDa0CSSqQl1kgb lq9A== X-Gm-Message-State: ACgBeo1M87n8y79//zKBs7bz2JihFWZ0bSvcu34HueCLC5um9ujohFPa 8ud59LWfIr1A4lXrzKxpSAziU9tqf7+xnQ== X-Google-Smtp-Source: AA6agR4//FLCFSBnONUXqUJbeUvI3U5vib7xQGkBr2z68sGmoWwS5KNXYO7z/CcdnT4gsDs9T1GROw== X-Received: by 2002:a05:6a00:1650:b0:52f:20d6:e858 with SMTP id m16-20020a056a00165000b0052f20d6e858mr19976216pfc.36.1661843664083; Tue, 30 Aug 2022 00:14:24 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id z24-20020aa79f98000000b00537f9e32b00sm6041616pfr.37.2022.08.30.00.14.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 00:14:23 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 10/21] ypbind-mt: Upgrade to 2.7.2 Date: Tue, 30 Aug 2022 00:14:02 -0700 Message-Id: <20220830071413.3887189-10-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220830071413.3887189-1-raj.khem@gmail.com> References: <20220830071413.3887189-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 ; Tue, 30 Aug 2022 07:14:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98547 Disable on musl since its using some non-portable glibc only constructs Drop gettid patch its applied upstream Signed-off-by: Khem Raj --- ...-configure-time-check-for-gettid-API.patch | 45 ------------------- .../{ypbind-mt_2.6.bb => ypbind-mt_2.7.2.bb} | 8 ++-- 2 files changed, 4 insertions(+), 49 deletions(-) delete mode 100644 meta-networking/recipes-support/nis/ypbind-mt/0001-Add-configure-time-check-for-gettid-API.patch rename meta-networking/recipes-support/nis/{ypbind-mt_2.6.bb => ypbind-mt_2.7.2.bb} (90%) diff --git a/meta-networking/recipes-support/nis/ypbind-mt/0001-Add-configure-time-check-for-gettid-API.patch b/meta-networking/recipes-support/nis/ypbind-mt/0001-Add-configure-time-check-for-gettid-API.patch deleted file mode 100644 index 9484d0b007..0000000000 --- a/meta-networking/recipes-support/nis/ypbind-mt/0001-Add-configure-time-check-for-gettid-API.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 25d5daf30aa2dc451ba528712f668036d8506054 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 27 Jul 2019 07:50:26 -0700 -Subject: [PATCH] Add configure time check for gettid API - -glibc 2.30 has added this syscalls wrapper - -Signed-off-by: Khem Raj ---- - configure.ac | 1 + - src/log_msg.c | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 9e32a4a..6d1067b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -33,6 +33,7 @@ if test -n "$TIRPC_LIBS"; then - AC_DEFINE(HAVE_TIRPC, 1, [Define to 1 if TIRPC is available]) - fi - -+AC_CHECK_FUNCS(gettid) - dnl The difficult part: could we reconfigure NSS or must we use DNS ? - AC_CHECK_FUNCS(__nss_configure_lookup) - if eval "test \"`echo '$ac_cv_func___nss_configure_lookup'`\" != yes"; then -diff --git a/src/log_msg.c b/src/log_msg.c -index 49f0905..37da311 100644 ---- a/src/log_msg.c -+++ b/src/log_msg.c -@@ -26,6 +26,7 @@ - #include "log_msg.h" - - #include -+#if !HAVE_GETTID - #ifdef __NR_gettid - static pid_t - gettid (void) -@@ -39,6 +40,7 @@ gettid (void) - return getpid (); - } - #endif -+#endif - - int debug_flag = 0; - int logfile_flag = 0; diff --git a/meta-networking/recipes-support/nis/ypbind-mt_2.6.bb b/meta-networking/recipes-support/nis/ypbind-mt_2.7.2.bb similarity index 90% rename from meta-networking/recipes-support/nis/ypbind-mt_2.6.bb rename to meta-networking/recipes-support/nis/ypbind-mt_2.7.2.bb index 2c5e2bd939..a95062bc8b 100644 --- a/meta-networking/recipes-support/nis/ypbind-mt_2.6.bb +++ b/meta-networking/recipes-support/nis/ypbind-mt_2.7.2.bb @@ -29,13 +29,11 @@ RDEPENDS:${PN} += "yp-tools" PROVIDES += "ypbind" SRC_URI = "https://github.com/thkukuk/ypbind-mt/releases/download/v${PV}/${BPN}-${PV}.tar.xz \ + file://0001-dns_hosts-Fix-build-with-musl.patch \ file://ypbind.init \ file://ypbind.service \ - file://0001-dns_hosts-Fix-build-with-musl.patch \ - file://0001-Add-configure-time-check-for-gettid-API.patch \ " -SRC_URI[md5sum] = "7cf89641fdc128d0919207e4b7caaf1d" -SRC_URI[sha256sum] = "0696c0263c4fd48a4ff2ce6c109f05f37aab0f71646d81cb22c7c28591bf80eb" +SRC_URI[sha256sum] = "064f2f185673c5493df83f6400b799f3a359de56118b6ba37c4327111f2fcd8b" inherit systemd update-rc.d @@ -57,6 +55,8 @@ do_install:append () { install -m 0644 ${WORKDIR}/ypbind.service ${D}${systemd_unitdir}/system } +# uses glibc internal APIs e.g. _hostalias +COMPATIBLE_HOST:libc-musl = "null" RPROVIDES:${PN} += "${PN}-systemd" RREPLACES:${PN} += "${PN}-systemd" From patchwork Tue Aug 30 07:14:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12105 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 E0B27C65C0D for ; Tue, 30 Aug 2022 07:14:32 +0000 (UTC) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.web10.8677.1661843665690836866 for ; Tue, 30 Aug 2022 00:14:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Elbq227P; spf=pass (domain: gmail.com, ip: 209.85.214.181, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f181.google.com with SMTP id u22so10237144plq.12 for ; Tue, 30 Aug 2022 00:14:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=WanslvKRrjGdxgZaFHMOLlSr+6TULcxEGc7EN/htRA8=; b=Elbq227PzSkfo0dddka+F0hJBVQVW+9C5zZ0nXO2gbJjBt0PctXdkmAtxkionB8p/V 3RN8NuFYxO8yIs3QKTFpv26S90z5EFsbJq8Zu5OqWKk6JmSah8DTgD/64WHh0UQv18TU zuWwIekzG/k0OtKF/5E552GDq2tRcnj36gNb+2mYC6eVsNWDCWFDRN1XOxQaGnJAKhKi vHmmf/8AV06gU6wMySwFXuVoZCFgp9TRV/goDCXfurL2e19AeJZeR0U7W+GLwzrgfdn/ vUNxjlGcsaholqJtIfn1djwVHEZ41H0/0r/mAG9LgUs4zGVSKavOHLdR2JZYitvlzNy1 yTmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=WanslvKRrjGdxgZaFHMOLlSr+6TULcxEGc7EN/htRA8=; b=WQcQ20t2ZznJe2sykO7rP4Xwq7CLTiB8ysecgQqmcyxqPWVgp6nP1lNLyAHHrDAojQ yeE9eRG20M1vT773yvOLB10PuOQVcYnRWLCjWwyC18x0C9R6NE4DB54EZ131WinvBsI+ qpg2DSepbgqQYoBjHnGi7rcnTHXFoVBqewIb2YyoD7JaJTIUmK2TLUKxuGGiqhuDshfV NGRQpOmGNQzGpUggN3el57wZsMvZ+Y5bwsL/F0r9fsXAcM4y/TctJYXWUoVSLbWtM1Xg y2HwVN1sTGhAHkaK4rjrz/UdoDAo/Cb5t+/QepFPNh7VcIV2UfIGWOp2GFoWc3+/9QWQ FZrA== X-Gm-Message-State: ACgBeo2y/5SdsOppF7FsaKcDsJzQYBd7FzRFA+76qxLRMB1awr+3l2+T 2dT8jmfJByirBL3UYPa+K+X2dmEqAf2t1g== X-Google-Smtp-Source: AA6agR5zEiF11xnBNtUXNuRZ50bMjcpbXhSJV1iLLCDt5wmbYG4QppmoVFo9/JfnJHFpS4noaG18vg== X-Received: by 2002:a17:90b:388e:b0:1f5:40d4:828d with SMTP id mu14-20020a17090b388e00b001f540d4828dmr22738916pjb.31.1661843664945; Tue, 30 Aug 2022 00:14:24 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id z24-20020aa79f98000000b00537f9e32b00sm6041616pfr.37.2022.08.30.00.14.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 00:14:24 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 11/21] packagegroup-meta-networking: Remove ypbind-mt on musl Date: Tue, 30 Aug 2022 00:14:03 -0700 Message-Id: <20220830071413.3887189-11-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220830071413.3887189-1-raj.khem@gmail.com> References: <20220830071413.3887189-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 ; Tue, 30 Aug 2022 07:14:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98548 It does not build Signed-off-by: Khem Raj --- .../recipes-core/packagegroups/packagegroup-meta-networking.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb index d5a2dfad63..11437e2238 100644 --- a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb +++ b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb @@ -259,6 +259,7 @@ RDEPENDS:packagegroup-meta-networking-support = "\ ettercap \ " RDEPENDS:packagegroup-meta-networking-support:remove:mipsarch = "memcached" +RDEPENDS:packagegroup-meta-networking-support:remove:libc-musl = "ypbind-mt" EXCLUDE_FROM_WORLD = "1" # Empty packages, only devel headers and libs From patchwork Tue Aug 30 07:14:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12103 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 DFFB5C54EE9 for ; Tue, 30 Aug 2022 07:14:32 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web10.8678.1661843666714321084 for ; Tue, 30 Aug 2022 00:14:26 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=HptGnhjE; spf=pass (domain: gmail.com, ip: 209.85.214.176, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f176.google.com with SMTP id jm11so10228721plb.13 for ; Tue, 30 Aug 2022 00:14:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=gMD+TKpJiIfT1RZWaPH6+zUFDUtg8akPy9ikp6tsXWk=; b=HptGnhjEFbUaD9nDt5LpQYc0gkWTIzUCFqjXC9diuYEI+dGWdz77VVAp7GIIW3HsYq 4Zp+8SiHS57QtK9Xw5VHAtvNz1SOu4hhKSECjkJdf12Tw15CCS/nGCuPD5XpRZUVu3BU xV8A0oNudAyXmBZYuilXOZ2jrVgC5h9mHMI2wWLYFAOEdSXtKg4Enkli9/LGHMNQGXlT hSLCCVH4D1MDH2iu3SC2+/xshv920JEF/K5ylUXMUIbvArYnEMzd7+bDZObxAyuWCRXy 3pm+L3KPam16rVKamY9NYO5Jrah69clxAAt/5AWtP4lzugm7OSNRHujSV6PEe2F7eUWI 5u1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=gMD+TKpJiIfT1RZWaPH6+zUFDUtg8akPy9ikp6tsXWk=; b=t0cFmdiqy6SGHChzJZ5rc9YM1jydWerEwFPG5gHPE2Npov/vcZBFXI73KJ6Fad+GKN ZtSZi9NV3LQYAeEj21oJrSVu0PYMqvznFkLnNyaq18aU3mY9EOfdMZJp0RTo3dPVLz0Q PkoQn0VHNVTh3zFIzoiAP+PYyMvO9ysJr8c2b2gwIqwPIBdecfqrKlyU9n805v9zwlOo DhK8w7jD/vjzeGEPcG1quIKbzB94rLpdYPvD9XR3FVKPHwNK6eQhs7Jdp1YzYghoawVW eCxFnxw2Tr7qRmxQUpbghjR4awcj0qIMMxLaOtm4PBJUdsECxhgg/ISAY4xrRjOv2mu1 2/+A== X-Gm-Message-State: ACgBeo3g2NKlVSzuI/Jw/fjzrpzWwtL7GekBfo4A/wG7Un6jeadh3q/O VF2BCT0NVxC/RVRYHoblMuTeSU1so+a4yA== X-Google-Smtp-Source: AA6agR5IpYKxRD+PlbyeotyAt7Jr+vngPkksUmm1QlO9rSM9ZKF0AqZTPU6w7lThS0cjCmIJLgXoQg== X-Received: by 2002:a17:90b:3b46:b0:1fb:57fc:d0bc with SMTP id ot6-20020a17090b3b4600b001fb57fcd0bcmr22869845pjb.71.1661843665906; Tue, 30 Aug 2022 00:14:25 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id z24-20020aa79f98000000b00537f9e32b00sm6041616pfr.37.2022.08.30.00.14.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 00:14:25 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 12/21] fping: Fix build with musl Date: Tue, 30 Aug 2022 00:14:04 -0700 Message-Id: <20220830071413.3887189-12-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220830071413.3887189-1-raj.khem@gmail.com> References: <20220830071413.3887189-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 ; Tue, 30 Aug 2022 07:14:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98549 Signed-off-by: Khem Raj --- ...lize-msghdr-struct-in-a-portable-way.patch | 42 +++++++++++++++++++ .../recipes-support/fping/fping_5.1.bb | 4 +- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-support/fping/fping/0001-fping-Initialize-msghdr-struct-in-a-portable-way.patch diff --git a/meta-networking/recipes-support/fping/fping/0001-fping-Initialize-msghdr-struct-in-a-portable-way.patch b/meta-networking/recipes-support/fping/fping/0001-fping-Initialize-msghdr-struct-in-a-portable-way.patch new file mode 100644 index 0000000000..2a5b3e6193 --- /dev/null +++ b/meta-networking/recipes-support/fping/fping/0001-fping-Initialize-msghdr-struct-in-a-portable-way.patch @@ -0,0 +1,42 @@ +From c3f476a763412be51b4df0e748af04d4150a2c71 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 29 Aug 2022 15:41:51 -0700 +Subject: [PATCH] fping: Initialize msghdr struct in a portable way + +Initializing the structure assuming glibc layout results in +compile errors on musl, therefore do partial intialization and then +assigning the members individually. + +Upstream-status: Submitted [https://github.com/schweikert/fping/pull/263] +Signed-off-by: Khem Raj +--- + src/fping.c | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +diff --git a/src/fping.c b/src/fping.c +index e26b216..81a61d9 100644 +--- a/src/fping.c ++++ b/src/fping.c +@@ -1951,15 +1951,13 @@ int receive_packet(int64_t wait_time, + reply_buf, + reply_buf_len + }; +- struct msghdr recv_msghdr = { +- reply_src_addr, +- reply_src_addr_len, +- &msg_iov, +- 1, +- &msg_control, +- sizeof(msg_control), +- 0 +- }; ++ struct msghdr recv_msghdr = {0}; ++ recv_msghdr.msg_name = reply_src_addr; ++ recv_msghdr.msg_namelen = reply_src_addr_len; ++ recv_msghdr.msg_iov = &msg_iov; ++ recv_msghdr.msg_iovlen = 1; ++ recv_msghdr.msg_control = &msg_control; ++ recv_msghdr.msg_controllen = sizeof(msg_control); + #if HAVE_SO_TIMESTAMPNS + struct cmsghdr* cmsg; + #endif diff --git a/meta-networking/recipes-support/fping/fping_5.1.bb b/meta-networking/recipes-support/fping/fping_5.1.bb index f2dd897561..0682eafa09 100644 --- a/meta-networking/recipes-support/fping/fping_5.1.bb +++ b/meta-networking/recipes-support/fping/fping_5.1.bb @@ -14,7 +14,9 @@ LICENSE = "fping" NO_GENERIC_LICENSE[fping] = "COPYING" LIC_FILES_CHKSUM = "file://COPYING;md5=c6170fbadddfcd74f011515291d96901" -SRC_URI = "http://www.fping.org/dist/fping-${PV}.tar.gz" +SRC_URI = "http://www.fping.org/dist/fping-${PV}.tar.gz \ + file://0001-fping-Initialize-msghdr-struct-in-a-portable-way.patch \ + " SRC_URI[sha256sum] = "1ee5268c063d76646af2b4426052e7d81a42b657e6a77d8e7d3d2e60fd7409fe" S = "${WORKDIR}/fping-${PV}" From patchwork Tue Aug 30 07:14:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12099 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 D10D1C0502F for ; Tue, 30 Aug 2022 07:14:32 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by mx.groups.io with SMTP id smtpd.web09.8758.1661843667798156048 for ; Tue, 30 Aug 2022 00:14:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=nwJxOczZ; spf=pass (domain: gmail.com, ip: 209.85.215.175, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f175.google.com with SMTP id x80so6311525pgx.0 for ; Tue, 30 Aug 2022 00:14:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=zaJ+FCFd79tbf1VXFOFJGJwWht1TG4tXBigmWx+1JgA=; b=nwJxOczZGt8eiqwO/I21et/iaBfi/F6u0vjBZBzKmvMpCbyrQrtNWyqNrd65pDk50N PY+qfngINio1jDcsvMUuk7lQA2oE7ZhXCGJ42i2itxLuSNhgkFD3f2cbySx75NVr+D6D 1R7BEjLPI5WtWHvRee4TWYNc18PkmBPg2NxD/YlKXvjAPM5zp+R5SzjQ9CXMiZz2T/az MmBC1ynY6Nu+SDWCHrAV0qy/yjIonmqbN9dBJfEBkNHB8KqvQKVxAhvfDNgQRiQJhOvn 4LFeH/1HziLliVa9nIQo0Mfrl4xbz5RFT+oWcXIlBbEFli2trqez3lTkAkwa8TPnF3ur y28g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=zaJ+FCFd79tbf1VXFOFJGJwWht1TG4tXBigmWx+1JgA=; b=PyWU916WBlaR/1SafBKy3bl/4wwStBsfO6rpdnKZja9Zmh3R6ZLLE9gT/AwMq/B9Ul TCS0ftLobtiyEJuSCLjVStPz+uuMkIqOE9jcKdZxZ2/6QaoijRTkC0uSMHYAwiiYLcsg LEVlwsE0w/h3j03y7pYb7VOGRVUvvFLlsRCF+ZW2xmwqWh6ZilwIpMDOVEyhZce9csIL V9sQl2uJx1WESXW6vkNixF3veVg7Y7Fm1XyqZIJ+p7gEy5ju4ASpQSt3W+e1Au8VZQiu mGbWWeIzjf36N96QDfO8Uu2FPrGm8nLlgsziq1+NVpzB8Q6iOC6DRh+6bFvxkAYogwVR 7ckg== X-Gm-Message-State: ACgBeo0kmWLiHgTHRqTMlJ9OhHmmYBQXMqQnL7RQUASWSVwwey/wriCg L+hcWwg4Uk0FLo8/HSIc9XUmyZfz68gEBA== X-Google-Smtp-Source: AA6agR5Xgx0KU+Yv7PWUyhikeiUl2NtHPz6xNmZ0+u8k+BfFjCDSEigEfx0iFoZw2W1IlvRqtwWZ6Q== X-Received: by 2002:a05:6a00:174b:b0:52f:c4d1:d130 with SMTP id j11-20020a056a00174b00b0052fc4d1d130mr19805796pfc.23.1661843666777; Tue, 30 Aug 2022 00:14:26 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id z24-20020aa79f98000000b00537f9e32b00sm6041616pfr.37.2022.08.30.00.14.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 00:14:26 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 13/21] iscsi-initiator-utils: Upgrade to 2.1.7 Date: Tue, 30 Aug 2022 00:14:05 -0700 Message-Id: <20220830071413.3887189-13-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220830071413.3887189-1-raj.khem@gmail.com> References: <20220830071413.3887189-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 ; Tue, 30 Aug 2022 07:14:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98550 Fix build on musl by using proper typecast for pthread_t Signed-off-by: Khem Raj --- .../0001-Makefile-Do-not-set-Werror.patch | 12 ++++----- ...uio-Use-pthread_t-for-INVALID_THREAD.patch | 27 +++++++++++++++++++ ....1.6.bb => iscsi-initiator-utils_2.1.7.bb} | 3 ++- 3 files changed, 34 insertions(+), 8 deletions(-) create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-iscsiuio-Use-pthread_t-for-INVALID_THREAD.patch rename meta-networking/recipes-daemons/iscsi-initiator-utils/{iscsi-initiator-utils_2.1.6.bb => iscsi-initiator-utils_2.1.7.bb} (97%) diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Makefile-Do-not-set-Werror.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Makefile-Do-not-set-Werror.patch index d5e0deb899..ab6ff6e131 100644 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Makefile-Do-not-set-Werror.patch +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Makefile-Do-not-set-Werror.patch @@ -1,4 +1,4 @@ -From 31d88f46bfc67de2659991674253a5d5dfb92afc Mon Sep 17 00:00:00 2001 +From 6afdfbdf1ecf3e7e9158734a3994a57ea151d680 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 12 Aug 2020 12:00:29 -0700 Subject: [PATCH] Makefile: Do not set -Werror @@ -9,16 +9,17 @@ warning as errors Upstream-Status: Inappropriate [OE-Specific] Signed-off-by: Khem Raj + --- usr/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/Makefile b/usr/Makefile -index 21bb154..0018605 100644 +index 3fc2248..2b5a234 100644 --- a/usr/Makefile +++ b/usr/Makefile -@@ -35,7 +35,7 @@ endif - PKG_CONFIG = /usr/bin/pkg-config +@@ -44,7 +44,7 @@ HOMEDIR ?= $(etcdir)/iscsi + PKG_CONFIG ?= /usr/bin/pkg-config CFLAGS ?= -O2 -g -WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common @@ -26,6 +27,3 @@ index 21bb154..0018605 100644 CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \ -I$(TOPDIR)/libopeniscsiusr CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) --- -2.28.0 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-iscsiuio-Use-pthread_t-for-INVALID_THREAD.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-iscsiuio-Use-pthread_t-for-INVALID_THREAD.patch new file mode 100644 index 0000000000..02669e9c80 --- /dev/null +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-iscsiuio-Use-pthread_t-for-INVALID_THREAD.patch @@ -0,0 +1,27 @@ +From ef54a6f4a81da8ab653d352bfbd3b2521ce9eb7c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 29 Aug 2022 15:55:32 -0700 +Subject: [PATCH] iscsiuio: Use pthread_t for INVALID_THREAD + +pthread_t is opaque, therefore avoid compiler errors on musl when +compiling since pthread_t is not a plain old data type, like glibc + +Upstream-Status: Submitted [https://github.com/open-iscsi/open-iscsi/pull/363] +Signed-off-by: Khem Raj +--- + iscsiuio/src/unix/options.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/iscsiuio/src/unix/options.h b/iscsiuio/src/unix/options.h +index 63b8635..873a98a 100644 +--- a/iscsiuio/src/unix/options.h ++++ b/iscsiuio/src/unix/options.h +@@ -86,7 +86,7 @@ + #define DEBUG_ON 0x2 + + #define INVALID_FD -1 +-#define INVALID_THREAD -1 ++#define INVALID_THREAD (pthread_t)-1 + #define INVALID_HOST_NO -1 + + struct options { diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.6.bb b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.7.bb similarity index 97% rename from meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.6.bb rename to meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.7.bb index 921f7d4883..63155b4811 100644 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.6.bb +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.7.bb @@ -12,7 +12,7 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d) LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV ?= "ee575fd19429ec6dc24b49f2ce3822b4a01f57de" +SRCREV = "7b53fcc502da8617110fd64d675b476772c28a6f" SRC_URI = "git://github.com/open-iscsi/open-iscsi;branch=master;protocol=https \ file://0001-Makefile-Do-not-set-Werror.patch \ @@ -22,6 +22,7 @@ SRC_URI = "git://github.com/open-iscsi/open-iscsi;branch=master;protocol=https \ file://iscsi-initiator.service \ file://iscsi-initiator-targets.service \ file://set_initiatorname \ + file://0002-iscsiuio-Use-pthread_t-for-INVALID_THREAD.patch \ " S = "${WORKDIR}/git" From patchwork Tue Aug 30 07:14:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12100 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 D0F84C0502E for ; Tue, 30 Aug 2022 07:14:32 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web08.8718.1661843656593304005 for ; Tue, 30 Aug 2022 00:14:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=TeO/piIK; spf=pass (domain: gmail.com, ip: 209.85.214.170, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f170.google.com with SMTP id x23so10251073pll.7 for ; Tue, 30 Aug 2022 00:14:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=SbHNwCetkPlIJnueW0qoMq5bVj0dniFBEX8zrLCtGnQ=; b=TeO/piIKEJOa/U0CY4NbpsoRqm96nfdSji/N77P66fjtK6FRsiQPawY46K5gtmnDA9 dtItVAvsdJfvTBOfenWKulQoQjzrzV91R7xWP1MpaKkX9fbDK2jwyDhMnoyEfv2ymVNz nd2Uai4LqJC8UrFTWZvd8tJakT/JA9pdt0hmUL03G0IiGWQco3aRzeBVIisF5SKxE++d koRK4YLoIpIiJ9b6fvkhg2gwIQM+sR+SLO+hRnvobzJBYZGuzlddr01KqloqnspynVf4 UohFYTewcgfr5HDD24sQgUbPcHfGnp//MCIZhMyyu91+lX6ZGI57i2qNK8BOquy0heNO TArA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=SbHNwCetkPlIJnueW0qoMq5bVj0dniFBEX8zrLCtGnQ=; b=XTXodWwiQMpdM2Mnd5Ucg7wySpn6x+JqfgPZEgt+7qWNCbQ1D2K/9DxZS2hiRzyX1v LidejzXo1iMkR/5ctKGgFBsAmEj+cuSVjl/Pt3pSIGY/9NagIcnD+s2UyiLk6SQAjvew 25ovqJE+YSAzalW3B8k0IdsJI2TpIhLCgKVvC6gDg2l/Re6fqspi5+/k0kpmx5/zD7SD 4IVKNYk54PrQ1A6480w2GLPqLOrjzePLyu+qeVUfY6/7MixwKeqWMS831GqTjrbua5m4 0OD0AdZSOCR7COGyyQXnnH5+2zyZuZIaPH4W0ogWg2zUADBvkjz+KHnNDGHtitLCTy7t 9jtw== X-Gm-Message-State: ACgBeo11jGpTg/RJTDNX4isu+sswC1c6u3AMpoMJ0mYTnnKCMtqlz2lz VB0Vlc5vJqEQergwlWVtsEcSs3xEWywNXA== X-Google-Smtp-Source: AA6agR4jJVXOdnSrmg8GbP+k7mUJPPSluu019yV2cVr6ysc4t87mRdIXZf4HuIZ7PfrxLX1v/vS+gQ== X-Received: by 2002:a17:902:cf43:b0:172:86f3:586a with SMTP id e3-20020a170902cf4300b0017286f3586amr19883525plg.71.1661843668000; Tue, 30 Aug 2022 00:14:28 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id z24-20020aa79f98000000b00537f9e32b00sm6041616pfr.37.2022.08.30.00.14.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 00:14:27 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 14/21] radvd: Fix build on musl Date: Tue, 30 Aug 2022 00:14:06 -0700 Message-Id: <20220830071413.3887189-14-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220830071413.3887189-1-raj.khem@gmail.com> References: <20220830071413.3887189-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 ; Tue, 30 Aug 2022 07:14:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98551 Backport a patch from upstream to fix musl builds Merged inc file into bb file, makes it easy to use devtool Signed-off-by: Khem Raj --- ...ude.h-change-in-46883f8a1a02fe42040d.patch | 32 +++++++++ .../recipes-daemons/radvd/radvd.inc | 67 ------------------ .../recipes-daemons/radvd/radvd_2.19.bb | 69 ++++++++++++++++++- 3 files changed, 99 insertions(+), 69 deletions(-) create mode 100644 meta-networking/recipes-daemons/radvd/files/0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch delete mode 100644 meta-networking/recipes-daemons/radvd/radvd.inc diff --git a/meta-networking/recipes-daemons/radvd/files/0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch b/meta-networking/recipes-daemons/radvd/files/0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch new file mode 100644 index 0000000000..57338d4713 --- /dev/null +++ b/meta-networking/recipes-daemons/radvd/files/0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch @@ -0,0 +1,32 @@ +From 15f439c555289f900eb33111b010bf1266f97edb Mon Sep 17 00:00:00 2001 +From: Jonathan Davies +Date: Thu, 25 Nov 2021 15:29:18 +0000 +Subject: [PATCH] Reverts the include.h change in + 46883f8a1a02fe42040dd8e48aec0ed871545d4d + +Closes: #158 + +Upstream-Status: Backport [https://github.com/radvd-project/radvd/commit/06689f8c06f44c7e87f7ff1d814428f88375b53f] +Signed-off-by: Jonathan Davies +Signed-off-by: Khem Raj +--- + includes.h | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/includes.h b/includes.h +index ef30b10..c528c86 100644 +--- a/includes.h ++++ b/includes.h +@@ -76,12 +76,7 @@ + #include + #endif + +-#if !defined(__GLIBC__) && defined(linux) +-#include +-#define IF_NAMESIZE IFNAMSIZ +-#else + #include +-#endif + + #ifdef HAVE_NET_IF_DL_H + #include diff --git a/meta-networking/recipes-daemons/radvd/radvd.inc b/meta-networking/recipes-daemons/radvd/radvd.inc deleted file mode 100644 index 2afaa48411..0000000000 --- a/meta-networking/recipes-daemons/radvd/radvd.inc +++ /dev/null @@ -1,67 +0,0 @@ -SUMMARY = "IPv6 router advertisement daemon" -DESCRIPTION = "radvd is the router advertisement daemon for IPv6. It \ -listens to router solicitations and sends router \ -advertisements as described in RFC 2461, Neighbor \ -Discovery for IP Version 6 (IPv6). With these \ -advertisements hosts can automatically configure their \ -addresses and some other parameters. They also can \ -choose a default router based on these advertisements." -HOMEPAGE = "http://www.litech.org/radvd/" -SECTION = "net" -DEPENDS = "flex-native bison-native libdaemon " - -# License is BSD-Style (with advertising clause) but also has an additional 0th clause -LICENSE = "radvd" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=73ebbf7182ae996e65e8fadc9a8c45db" - -SRC_URI = "http://v6web.litech.org/radvd/dist/radvd-${PV}.tar.gz \ - file://radvd.init \ - file://radvd.service \ - file://volatiles.03_radvd \ - file://radvd.default \ - file://radvd.conf" - -inherit autotools useradd pkgconfig systemd - -SYSTEMD_SERVICE:${PN} = "radvd.service" -SYSTEMD_AUTO_ENABLE = "disable" - -do_install:append () { - install -m 0755 -d ${D}${sysconfdir}/init.d \ - ${D}${sysconfdir}/default/volatiles \ - ${D}${docdir}/radvd - # Install init script and volatiles - install -m 0755 ${WORKDIR}/radvd.init ${D}${sysconfdir}/init.d/radvd - sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/radvd - sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/radvd - sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/radvd - sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/radvd - - install -m 0644 ${WORKDIR}/volatiles.03_radvd ${D}${sysconfdir}/default/volatiles/03_radvd - - # Install systemd service files - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/radvd.service ${D}${systemd_unitdir}/system - sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' \ - -e 's#@SBINDIR@#${sbindir}#g' \ - -e 's#@BASE_BINDIR@#${base_bindir}#g' ${D}${systemd_unitdir}/system/radvd.service - - # Install default environment file - install -m 0644 ${WORKDIR}/radvd.default ${D}${sysconfdir}/default/radvd - - # Documentation - for i in radvd.conf.example README; do \ - install -m 0644 ${S}/$i ${D}${docdir}/radvd; \ - done - - install -m 0644 ${WORKDIR}/radvd.conf ${D}${sysconfdir}/radvd.conf -} - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --home ${localstatedir}/run/radvd/ -M -g nogroup radvd" - -pkg_postinst:${PN} () { - if [ -z "$D" -a -x /etc/init.d/populate-volatile.sh ]; then - /etc/init.d/populate-volatile.sh update - fi -} diff --git a/meta-networking/recipes-daemons/radvd/radvd_2.19.bb b/meta-networking/recipes-daemons/radvd/radvd_2.19.bb index 553987e3d0..f9f810abdd 100644 --- a/meta-networking/recipes-daemons/radvd/radvd_2.19.bb +++ b/meta-networking/recipes-daemons/radvd/radvd_2.19.bb @@ -1,5 +1,70 @@ +SUMMARY = "IPv6 router advertisement daemon" +DESCRIPTION = "radvd is the router advertisement daemon for IPv6. It \ +listens to router solicitations and sends router \ +advertisements as described in RFC 2461, Neighbor \ +Discovery for IP Version 6 (IPv6). With these \ +advertisements hosts can automatically configure their \ +addresses and some other parameters. They also can \ +choose a default router based on these advertisements." +HOMEPAGE = "http://www.litech.org/radvd/" +SECTION = "net" +DEPENDS = "flex-native bison-native libdaemon " -require radvd.inc +# License is BSD-Style (with advertising clause) but also has an additional 0th clause +LICENSE = "radvd" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=73ebbf7182ae996e65e8fadc9a8c45db" -SRC_URI[md5sum] = "e9c425ac48ecb96ea5ea2912c78969f9" +SRC_URI = "http://v6web.litech.org/radvd/dist/radvd-${PV}.tar.gz \ + file://radvd.init \ + file://radvd.service \ + file://volatiles.03_radvd \ + file://radvd.default \ + file://radvd.conf \ + file://0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch \ + " SRC_URI[sha256sum] = "c36470706fec3a9e6bed394ffea08acaff5dac647848d26b96bb9b9c65d58da0" + +inherit autotools useradd pkgconfig systemd + +SYSTEMD_SERVICE:${PN} = "radvd.service" +SYSTEMD_AUTO_ENABLE = "disable" + +do_install:append () { + install -m 0755 -d ${D}${sysconfdir}/init.d \ + ${D}${sysconfdir}/default/volatiles \ + ${D}${docdir}/radvd + # Install init script and volatiles + install -m 0755 ${WORKDIR}/radvd.init ${D}${sysconfdir}/init.d/radvd + sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/radvd + sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/radvd + sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/radvd + sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/radvd + + install -m 0644 ${WORKDIR}/volatiles.03_radvd ${D}${sysconfdir}/default/volatiles/03_radvd + + # Install systemd service files + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/radvd.service ${D}${systemd_unitdir}/system + sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' \ + -e 's#@SBINDIR@#${sbindir}#g' \ + -e 's#@BASE_BINDIR@#${base_bindir}#g' ${D}${systemd_unitdir}/system/radvd.service + + # Install default environment file + install -m 0644 ${WORKDIR}/radvd.default ${D}${sysconfdir}/default/radvd + + # Documentation + for i in radvd.conf.example README; do \ + install -m 0644 ${S}/$i ${D}${docdir}/radvd; \ + done + + install -m 0644 ${WORKDIR}/radvd.conf ${D}${sysconfdir}/radvd.conf +} + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --home ${localstatedir}/run/radvd/ -M -g nogroup radvd" + +pkg_postinst:${PN} () { + if [ -z "$D" -a -x /etc/init.d/populate-volatile.sh ]; then + /etc/init.d/populate-volatile.sh update + fi +} From patchwork Tue Aug 30 07:14:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12101 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 C4A0BC0502C for ; Tue, 30 Aug 2022 07:14:32 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web09.8759.1661843669936443384 for ; Tue, 30 Aug 2022 00:14:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=n4IR2Yyf; spf=pass (domain: gmail.com, ip: 209.85.210.170, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f170.google.com with SMTP id 76so10498755pfy.3 for ; Tue, 30 Aug 2022 00:14:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=vL6Phr2xG7yPq2zVj6Jd+5t1UBzmfz9BViPRvSkbp3w=; b=n4IR2Yyfc33Xcp3AJdsIGv1ryL4vRq1RxEfL7DHxv+5Z4qsCyrxS64ER7fBC7ZXaw4 BKhBhov7DJYylB8ljGoRcJI3DYmHEeGBXGu0iV/OYAtRd7TUUpQITHmuWnRsUaQaB0vh X+pWw+Yp25ztqjEw/IX4u0HUKWkosrKh/iKeDEdiJu+udr0klaJ4JB1ffWOMjWHd3PXn IQr7d+pqEgYFSkTTUUeQh+QtTbNulJQp7NNswJVpT3tvPWZLaO6zrhUCKgzNnZ4i/X3u FxRJjzIHzGPonb2tl4jbfTT1mAJ4mC0mjMmuy3VW0XgQCDYXpxX7Pt2apfE/kiY0cmkK vV9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=vL6Phr2xG7yPq2zVj6Jd+5t1UBzmfz9BViPRvSkbp3w=; b=C2x1lF3aCQUfC3V72i8Rf/MuqB9LlwyGKgQPfyZcGz/Y9P/nYw9bIWa5OMbR/budKH Gh++NOlhcu3OsHFyO0X9b4Ktz1s1hBCyCbIXH87JfI0PC8AlRgkpLs0s4Ca0mdFX86+t e5SC5fiU3WJkOMwwYO+E8jGVOSrfbrpzvZtN6Xed3/97MAcqZshaDpFxNryL7pGTt7i5 HTZcS+qMvfVwVkV2FgM/+YYpFcMAFsZvl4VPtYEhwTvxnsa6lOLUZrqMzaHak5OvLBeL Fa7VFgxiThLnMEdFy+dQ67O2KfvUpRisGkdFcv92jm3RmA5qfLAtRMF5qod7IhupnTjH vu2w== X-Gm-Message-State: ACgBeo077Cxfx5dC0rbINRA/uvhIR2WcVBcEgpkF+Plo2b/On6Q/2mKu h2Yoi3BJAhbTHlQZ5pvCPl369Zw4uRDIPg== X-Google-Smtp-Source: AA6agR53f/g/KNKF+QpRMfFOQoRGcFH187mMoSfj6wW50JSX/hD6r8eovNJJvRbE/NTA+uT0yYroGA== X-Received: by 2002:a63:4a47:0:b0:42b:e4a4:3aec with SMTP id j7-20020a634a47000000b0042be4a43aecmr9111737pgl.512.1661843669074; Tue, 30 Aug 2022 00:14:29 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id z24-20020aa79f98000000b00537f9e32b00sm6041616pfr.37.2022.08.30.00.14.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 00:14:28 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 15/21] linux-atm: Include missing string.h Date: Tue, 30 Aug 2022 00:14:07 -0700 Message-Id: <20220830071413.3887189-15-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220830071413.3887189-1-raj.khem@gmail.com> References: <20220830071413.3887189-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 ; Tue, 30 Aug 2022 07:14:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98552 Signed-off-by: Khem Raj --- ...-from-memcpy-and-strcpy-function-pro.patch | 87 +++++++++++++++++++ .../linux-atm/linux-atm_2.5.2.bb | 3 +- 2 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-support/linux-atm/linux-atm/0001-include-string-h-from-memcpy-and-strcpy-function-pro.patch diff --git a/meta-networking/recipes-support/linux-atm/linux-atm/0001-include-string-h-from-memcpy-and-strcpy-function-pro.patch b/meta-networking/recipes-support/linux-atm/linux-atm/0001-include-string-h-from-memcpy-and-strcpy-function-pro.patch new file mode 100644 index 0000000000..81c5efd173 --- /dev/null +++ b/meta-networking/recipes-support/linux-atm/linux-atm/0001-include-string-h-from-memcpy-and-strcpy-function-pro.patch @@ -0,0 +1,87 @@ +From 5217cb7c829cf87771096c4ce41fd4648dca47cb Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 29 Aug 2022 16:36:21 -0700 +Subject: [PATCH] include string,h from memcpy and strcpy function prototype + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/led/address.c | 1 + + src/led/display.c | 1 + + src/lib/unix.c | 1 + + src/maint/hediag.c | 1 + + src/sigd/kernel.c | 1 + + src/sigd/policy.c | 1 + + 6 files changed, 6 insertions(+) + +diff --git a/src/led/address.c b/src/led/address.c +index 574e881..b5c5fbb 100644 +--- a/src/led/address.c ++++ b/src/led/address.c +@@ -31,6 +31,7 @@ + #endif + + #include ++#include + #include + #include + +diff --git a/src/led/display.c b/src/led/display.c +index d78a15d..b835e89 100644 +--- a/src/led/display.c ++++ b/src/led/display.c +@@ -5,6 +5,7 @@ + #if HAVE_CONFIG_H + #include + #endif ++#include + + #include + #include +diff --git a/src/lib/unix.c b/src/lib/unix.c +index 34aa465..d5bef54 100644 +--- a/src/lib/unix.c ++++ b/src/lib/unix.c +@@ -8,6 +8,7 @@ + + #include + #include ++#include + #include + #include + #include +diff --git a/src/maint/hediag.c b/src/maint/hediag.c +index 8a4312a..a4f792f 100644 +--- a/src/maint/hediag.c ++++ b/src/maint/hediag.c +@@ -1,5 +1,6 @@ + #include + #include ++#include + #include + #include + #include +diff --git a/src/sigd/kernel.c b/src/sigd/kernel.c +index 9ee74b1..2491626 100644 +--- a/src/sigd/kernel.c ++++ b/src/sigd/kernel.c +@@ -8,6 +8,7 @@ + + #include + #include ++#include + #include + #include + +diff --git a/src/sigd/policy.c b/src/sigd/policy.c +index 2cfb42d..87223a7 100644 +--- a/src/sigd/policy.c ++++ b/src/sigd/policy.c +@@ -6,6 +6,7 @@ + #include + #endif + ++#include + #include + #include + diff --git a/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb b/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb index bb79b78568..70125102cd 100644 --- a/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb +++ b/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb @@ -14,7 +14,8 @@ SRC_URI = "http://nchc.dl.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BPN}-${P file://0001-IFNAMSIZ-is-defined-in-net-if.h.patch \ file://0001-saaldump-atmdump-Include-linux-sockios.h-for-SIOCGST.patch \ file://0001-make-Add-PREFIX-knob.patch \ -" + file://0001-include-string-h-from-memcpy-and-strcpy-function-pro.patch \ + " SRC_URI:append:libc-musl = " file://musl-no-on_exit.patch" From patchwork Tue Aug 30 07:14:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12098 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 C7A48C3DA6B for ; Tue, 30 Aug 2022 07:14:32 +0000 (UTC) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mx.groups.io with SMTP id smtpd.web10.8679.1661843670884521705 for ; Tue, 30 Aug 2022 00:14:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=i7UV5VSl; spf=pass (domain: gmail.com, ip: 209.85.210.177, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f177.google.com with SMTP id p185so10469932pfb.13 for ; Tue, 30 Aug 2022 00:14:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=fP2WAuzLy4jGATYaCBQROgk+fhCjp2T6XHdrx91PS1Y=; b=i7UV5VSlh69amMSTK5p8I3oyYkmOvFa3qXgXThp1hcXjauORVklGfUl/pkScs2a4Uv oB8Ts2jqZpyebdwGg3r3wLQYopCFkX7rfmNuKIwS7+G5aeJhmVvpK/T+9M4oBWc0+lsL 2kb4M8Xlo++eLtj+MiWRpQ2uhIP6GrIpi6H9+gYmEO8mdFvo9ET0y1P/0qaflkDXrwE/ jsGw1OgrLNg5qIaB3qXoPXbdqb2PMTCW6vJkJD/ebFL0jSrPFP4VZCvTMYHEkD2PtLzU 3Oj7ZSTpLP5Mad1a/uNPmHGGRzdPajP+PHcF7shVfXLaigfy4QYIPTxnAnAY9SR4Qt4+ pTVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=fP2WAuzLy4jGATYaCBQROgk+fhCjp2T6XHdrx91PS1Y=; b=Jee1XDN7v4CHoQO3XKJNhQ6hOqwtXTdwK7b8qwQe1uRPisQiM6lT2TKmeK26PKMeTy XSkftD/0R0AgCGgBKFSW8JhTFfSFp6hRRZo1EUrpp9WYfAdrcZ0ctlWhuTIKrg8nCqYy SwA+Sm3f5ifTDD3RUtT4e//NN9K7InLk5rRRhd9pLuCR0CAHPEbo3tSoYiXGx1TfketF ZpQwrhaXpe4jNdZ00DcLcgqVCPChykpQKhw3XoSsrsNwkpQMpnbi/wKaVCBpJrigsQzZ 5fAKdiNJBe3olv509bxx72JLJo1eJ2KOQTVKTP9tKd4dGOvWTX3APbjYaTHrUzl5ZbNz 644w== X-Gm-Message-State: ACgBeo1c9G9Ml9wU4OCZYXS70bysjPW8wIDsF7dxTLoj+Xs32TgiRJSe f24C7BWgu2HgzMfQIvN7ae7wa/l5Oth47A== X-Google-Smtp-Source: AA6agR7lJcmp/iq7O2YThqtH5s/Vt2souXkoDvyoVE6vAwCxauMD51RViQb9X+3WbylA4KdTU3cCBw== X-Received: by 2002:a63:54a:0:b0:42b:22fa:bc4c with SMTP id 71-20020a63054a000000b0042b22fabc4cmr17254094pgf.434.1661843670012; Tue, 30 Aug 2022 00:14:30 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id z24-20020aa79f98000000b00537f9e32b00sm6041616pfr.37.2022.08.30.00.14.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 00:14:29 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 16/21] memcached: Upgrade to 1.6.17 Date: Tue, 30 Aug 2022 00:14:08 -0700 Message-Id: <20220830071413.3887189-16-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220830071413.3887189-1-raj.khem@gmail.com> References: <20220830071413.3887189-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 ; Tue, 30 Aug 2022 07:14:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98553 Fix build with clang while here Signed-off-by: Khem Raj --- .../0001-Fix-function-protypes.patch | 110 ++++++++++++++++++ ...emcached_1.6.15.bb => memcached_1.6.17.bb} | 8 +- 2 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 meta-networking/recipes-support/memcached/memcached/0001-Fix-function-protypes.patch rename meta-networking/recipes-support/memcached/{memcached_1.6.15.bb => memcached_1.6.17.bb} (84%) diff --git a/meta-networking/recipes-support/memcached/memcached/0001-Fix-function-protypes.patch b/meta-networking/recipes-support/memcached/memcached/0001-Fix-function-protypes.patch new file mode 100644 index 0000000000..15ef54f80e --- /dev/null +++ b/meta-networking/recipes-support/memcached/memcached/0001-Fix-function-protypes.patch @@ -0,0 +1,110 @@ +From 6021d3d60e64d9174f41515d2d962df9b5d7645e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 29 Aug 2022 17:15:28 -0700 +Subject: [PATCH] Fix function protypes + +clang-15+ has started diagnosing them as errors + +thread.c:925:18: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] +| void STATS_UNLOCK() { +| ^ +| void + +Upstream-Status: Submitted [https://github.com/memcached/memcached/pull/928] +Signed-off-by: Khem Raj +--- + assoc.c | 4 ++-- + memcached.c | 4 ++-- + slabs.c | 2 +- + testapp.c | 2 +- + thread.c | 4 ++-- + 5 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/assoc.c b/assoc.c +index bc68695..01063a9 100644 +--- a/assoc.c ++++ b/assoc.c +@@ -261,7 +261,7 @@ static void *assoc_maintenance_thread(void *arg) { + + static pthread_t maintenance_tid; + +-int start_assoc_maintenance_thread() { ++int start_assoc_maintenance_thread(void) { + int ret; + char *env = getenv("MEMCACHED_HASH_BULK_MOVE"); + if (env != NULL) { +@@ -279,7 +279,7 @@ int start_assoc_maintenance_thread() { + return 0; + } + +-void stop_assoc_maintenance_thread() { ++void stop_assoc_maintenance_thread(void) { + mutex_lock(&maintenance_lock); + do_run_maintenance_thread = 0; + pthread_cond_signal(&maintenance_cond); +diff --git a/memcached.c b/memcached.c +index 7871fe8..4d3b54a 100644 +--- a/memcached.c ++++ b/memcached.c +@@ -84,7 +84,7 @@ static int try_read_command_udp(conn *c); + static enum try_read_result try_read_network(conn *c); + static enum try_read_result try_read_udp(conn *c); + +-static int start_conn_timeout_thread(); ++static int start_conn_timeout_thread(void); + + /* stats */ + static void stats_init(void); +@@ -374,7 +374,7 @@ static void *conn_timeout_thread(void *arg) { + return NULL; + } + +-static int start_conn_timeout_thread() { ++static int start_conn_timeout_thread(void) { + int ret; + + if (settings.idle_timeout == 0) +diff --git a/slabs.c b/slabs.c +index 3c78d8a..0dadd35 100644 +--- a/slabs.c ++++ b/slabs.c +@@ -638,7 +638,7 @@ static void *memory_allocate(size_t size) { + } + + /* Must only be used if all pages are item_size_max */ +-static void memory_release() { ++static void memory_release(void) { + void *p = NULL; + if (mem_base != NULL) + return; +diff --git a/testapp.c b/testapp.c +index 5face54..387a847 100644 +--- a/testapp.c ++++ b/testapp.c +@@ -80,7 +80,7 @@ static struct conn *con = NULL; + static bool allow_closed_read = false; + static bool enable_ssl = false; + +-static void close_conn() { ++static void close_conn(void) { + if (con == NULL) return; + #ifdef TLS + if (con->ssl) { +diff --git a/thread.c b/thread.c +index d5ed052..f5efdc3 100644 +--- a/thread.c ++++ b/thread.c +@@ -918,11 +918,11 @@ enum store_item_type store_item(item *item, int comm, conn* c) { + + /******************************* GLOBAL STATS ******************************/ + +-void STATS_LOCK() { ++void STATS_LOCK(void) { + pthread_mutex_lock(&stats_lock); + } + +-void STATS_UNLOCK() { ++void STATS_UNLOCK(void) { + pthread_mutex_unlock(&stats_lock); + } + diff --git a/meta-networking/recipes-support/memcached/memcached_1.6.15.bb b/meta-networking/recipes-support/memcached/memcached_1.6.17.bb similarity index 84% rename from meta-networking/recipes-support/memcached/memcached_1.6.15.bb rename to meta-networking/recipes-support/memcached/memcached_1.6.17.bb index b28bfe72b7..270ad5486d 100644 --- a/meta-networking/recipes-support/memcached/memcached_1.6.15.bb +++ b/meta-networking/recipes-support/memcached/memcached_1.6.17.bb @@ -12,7 +12,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=7e5ded7363d335e1bb18013ca08046ff" -inherit autotools +inherit autotools pkgconfig DEPENDS += "libevent" RDEPENDS:${PN} += "perl perl-module-posix perl-module-autoloader \ @@ -21,12 +21,16 @@ RDEPENDS:${PN} += "perl perl-module-posix perl-module-autoloader \ SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ file://memcached-add-hugetlbfs-check.patch \ + file://0001-Fix-function-protypes.patch \ " -SRC_URI[sha256sum] = "8d7abe3d649378edbba16f42ef1d66ca3f2ac075f2eb97145ce164388e6ed515" +SRC_URI[sha256sum] = "2055e373613d8fc21529aff9f0adce3e23b9ce01ba0478d30e7941d9f2bd1224" # set the same COMPATIBLE_HOST as libhugetlbfs COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*" +# assoc.c:83:9: error: variable 'depth' set but not used [-Werror,-Wunused-but-set-variable] +CFLAGS:append:toolchain-clang = " -Wno-error=unused-but-set-variable" + python __anonymous () { endianness = d.getVar('SITEINFO_ENDIANNESS') if endianness == 'le': From patchwork Tue Aug 30 07:14:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12110 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 0F8E7C6FA84 for ; Tue, 30 Aug 2022 07:14:33 +0000 (UTC) Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by mx.groups.io with SMTP id smtpd.web08.8722.1661843672489489805 for ; Tue, 30 Aug 2022 00:14:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=WuiNi95O; spf=pass (domain: gmail.com, ip: 209.85.215.178, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f178.google.com with SMTP id f4so9867393pgc.12 for ; Tue, 30 Aug 2022 00:14:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=AsSzRgRKtsgYzdXXvSYoXsP+vqOdrcBpjxY26ers9Rg=; b=WuiNi95OvJ3SYHr5prQlsC5cHXVsCfzEN46f11TY/mxbkY69G58TsKSOXu8a7Hy5Tw /ILBFcU2SUzTcft6y734TbnmGSR0e6GUU1TGfzNHr4/jVHQrQGso5HyfVVvVry4v5KU2 caur6AZqfGR8aLLHYhrtZpwkWPbE2qA9Z+5ONile+hgNKFSbCqMAZyAgJG8p5A1J8+9w atcgZnfF80dlXZSE+wKjOOF1WgNaPd5t5NZ4Upkbj5RZ3AKsriTZp4P6bXBBBpUYXMZ7 prTM0ZwKlTh2YpoBm2Kej0NFcFffT7kA/Jt1n04SGtFsXXJrTpTiWgddD4ILCmwfwb9U 5KsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=AsSzRgRKtsgYzdXXvSYoXsP+vqOdrcBpjxY26ers9Rg=; b=twIuAxDQSL+W6ujfwkQYcw5Aun3c7+U/goY9h0Q5FQKPpJQ3vMcoBzCOm1iB6f8/So LADEVey6ffRzi9iktIBC7XWBbDTpqX2J3Bq1slgN2fs2Gl/qkKI07HDj6SZKEc8qwtj5 4Hgltp/Bok0f61ARI3yWF8fK32mhblodLKYnB+77vmPIK5mG2CMJYwqdwv8PnBzscL69 48wsMFZKYN65KYgWPgVyIxqmrWOTMCBPFkk2mQFKwHJajLhm7o6AhXaSqxF6xIZoPL6e 2KSuSkbsxq64BShrbcESN+qIb7NfrsBjnYcXagcTumzPLeSRGYWySAf2HQbnh+Cy5Hgq zbjQ== X-Gm-Message-State: ACgBeo1x8/jW/REqDmgvkUYBFubwuA3rONhuzIeufi9E8UuY82Mn8FXn OJ/VgGKNdKZoQutp9zoI4kcMk5sqxAEIEQ== X-Google-Smtp-Source: AA6agR4R1mFTTGaiBUSAp2agE778i1JD6JcNenf+KbyyWJqDXtiOcSb7En2kVRmIKJyvvdo6Uqq/3Q== X-Received: by 2002:a63:de02:0:b0:428:9e02:5f3e with SMTP id f2-20020a63de02000000b004289e025f3emr17170358pgg.592.1661843670971; Tue, 30 Aug 2022 00:14:30 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id z24-20020aa79f98000000b00537f9e32b00sm6041616pfr.37.2022.08.30.00.14.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 00:14:30 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 17/21] openlldp: Upgrade to 1.1.0 Date: Tue, 30 Aug 2022 00:14:09 -0700 Message-Id: <20220830071413.3887189-17-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220830071413.3887189-1-raj.khem@gmail.com> References: <20220830071413.3887189-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 ; Tue, 30 Aug 2022 07:14:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98554 Drop already upstreamed patches Add fix for clang15 build Drop Wno-error Signed-off-by: Khem Raj --- .../files/0001-cmds-fix-enum-conversion.patch | 91 ---- ...002-lldp_head-rename-and-make-extern.patch | 500 ------------------ ...03-lldp-add-packed-struct-definition.patch | 49 -- ...string.h-for-mem-function-prototypes.patch | 23 + .../files/0004-lldptool-make-extern.patch | 41 -- ..._oui-match-encode-handler-prototypes.patch | 28 - ...ake-enum-a-type-rather-than-instance.patch | 33 -- ...07-lldp_8021qaz-extern-config-object.patch | 29 - ...tringops-fix-some-string-copy-errors.patch | 61 --- ...21qaz-mark-prio-map-functions-static.patch | 39 -- .../lldp_head-remove-all-references.patch | 331 ------------ .../{openlldp_1.0.1.bb => openlldp_1.1.0.bb} | 18 +- 12 files changed, 26 insertions(+), 1217 deletions(-) delete mode 100644 meta-networking/recipes-protocols/openlldp/files/0001-cmds-fix-enum-conversion.patch delete mode 100644 meta-networking/recipes-protocols/openlldp/files/0002-lldp_head-rename-and-make-extern.patch delete mode 100644 meta-networking/recipes-protocols/openlldp/files/0003-lldp-add-packed-struct-definition.patch create mode 100644 meta-networking/recipes-protocols/openlldp/files/0004-clif-Include-string.h-for-mem-function-prototypes.patch delete mode 100644 meta-networking/recipes-protocols/openlldp/files/0004-lldptool-make-extern.patch delete mode 100644 meta-networking/recipes-protocols/openlldp/files/0005-cisco_oui-match-encode-handler-prototypes.patch delete mode 100644 meta-networking/recipes-protocols/openlldp/files/0006-ecp22-make-enum-a-type-rather-than-instance.patch delete mode 100644 meta-networking/recipes-protocols/openlldp/files/0007-lldp_8021qaz-extern-config-object.patch delete mode 100644 meta-networking/recipes-protocols/openlldp/files/0008-stringops-fix-some-string-copy-errors.patch delete mode 100644 meta-networking/recipes-protocols/openlldp/files/0009-8021qaz-mark-prio-map-functions-static.patch delete mode 100644 meta-networking/recipes-protocols/openlldp/files/lldp_head-remove-all-references.patch rename meta-networking/recipes-protocols/openlldp/{openlldp_1.0.1.bb => openlldp_1.1.0.bb} (57%) diff --git a/meta-networking/recipes-protocols/openlldp/files/0001-cmds-fix-enum-conversion.patch b/meta-networking/recipes-protocols/openlldp/files/0001-cmds-fix-enum-conversion.patch deleted file mode 100644 index 680f6b67d7..0000000000 --- a/meta-networking/recipes-protocols/openlldp/files/0001-cmds-fix-enum-conversion.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 090854e09fe18ebf1ba428864895a690086f78ee Mon Sep 17 00:00:00 2001 -From: Aaron Conole -Date: Mon, 19 Aug 2019 11:41:13 -0400 -Subject: [PATCH 1/9] cmds: fix enum conversion - -Multiple modules use implicit conversion between enum types, but -this triggers warnings with some compilers. ex: - - qbg/vdp_cmds.c:110:39: error: implicit conversion from enumeration type - 'lldp_cmd' to different enumeration type 'cmd_status' - [-Werror,-Wenum-conversion] - cmd_status good_cmd = vdp_cmdok(cmd, cmd_gettlv); - -Reported-at: https://github.com/intel/openlldp/issues/53 -Signed-off-by: Aaron Conole ---- - lldp_evb22_cmds.c | 2 +- - lldp_evb_cmds.c | 2 +- - qbg/vdp22_cmds.c | 2 +- - qbg/vdp_cmds.c | 2 +- - vdptool.c | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/lldp_evb22_cmds.c b/lldp_evb22_cmds.c -index cebfeb2..51810bc 100644 ---- a/lldp_evb22_cmds.c -+++ b/lldp_evb22_cmds.c -@@ -225,7 +225,7 @@ int evb22_conf_enabletx(char *ifname, enum agent_type type) - TLVID(OUI_IEEE_8021Qbg22, LLDP_EVB22_SUBTYPE)); - } - --static int evb22_cmdok(struct cmd *cmd, cmd_status expected) -+static int evb22_cmdok(struct cmd *cmd, int expected) - { - if (cmd->cmd != expected) - return cmd_invalid; -diff --git a/lldp_evb_cmds.c b/lldp_evb_cmds.c -index eec4f33..e6af03b 100644 ---- a/lldp_evb_cmds.c -+++ b/lldp_evb_cmds.c -@@ -163,7 +163,7 @@ int evb_conf_enabletx(char *ifname, enum agent_type type) - return is_tlv_txenabled(ifname, type, TLVID_8021Qbg(LLDP_EVB_SUBTYPE)); - } - --static int evb_cmdok(struct cmd *cmd, cmd_status expected) -+static int evb_cmdok(struct cmd *cmd, int expected) - { - if (cmd->cmd != expected) - return cmd_invalid; -diff --git a/qbg/vdp22_cmds.c b/qbg/vdp22_cmds.c -index 479b1b0..2e1bbbd 100644 ---- a/qbg/vdp22_cmds.c -+++ b/qbg/vdp22_cmds.c -@@ -296,7 +296,7 @@ int vdp22_sendevent(struct vdpnl_vsi *p) - return 0; - } - --static int vdp22_cmdok(struct cmd *cmd, cmd_status expected) -+static int vdp22_cmdok(struct cmd *cmd, int expected) - { - if (cmd->cmd != expected) - return cmd_invalid; -diff --git a/qbg/vdp_cmds.c b/qbg/vdp_cmds.c -index 95bcfb1..50f2781 100644 ---- a/qbg/vdp_cmds.c -+++ b/qbg/vdp_cmds.c -@@ -85,7 +85,7 @@ static char *print_mode(char *s, size_t length, struct vsi_profile *p) - return s; - } - --static int vdp_cmdok(struct cmd *cmd, cmd_status expected) -+static int vdp_cmdok(struct cmd *cmd, int expected) - { - if (cmd->cmd != expected) - return cmd_invalid; -diff --git a/vdptool.c b/vdptool.c -index 9872348..8f36277 100644 ---- a/vdptool.c -+++ b/vdptool.c -@@ -141,7 +141,7 @@ static char *print_status(cmd_status status) - str = "TLV does not support agent type"; - break; - default: -- str = print_vdp_status(status); -+ str = print_vdp_status((enum vdp22_cmd_status)status); - break; - } - return str; --- -2.28.0 - diff --git a/meta-networking/recipes-protocols/openlldp/files/0002-lldp_head-rename-and-make-extern.patch b/meta-networking/recipes-protocols/openlldp/files/0002-lldp_head-rename-and-make-extern.patch deleted file mode 100644 index 8f65b799f0..0000000000 --- a/meta-networking/recipes-protocols/openlldp/files/0002-lldp_head-rename-and-make-extern.patch +++ /dev/null @@ -1,500 +0,0 @@ -From 07a83c583b9d508c7040dc6254a6a7113b2ce55f Mon Sep 17 00:00:00 2001 -From: Aaron Conole -Date: Mon, 3 Aug 2020 15:05:42 -0400 -Subject: [PATCH 2/9] lldp_head: rename and make extern - -Try to resolve this silly mod issue - -Signed-off-by: Aaron Conole ---- - config.c | 4 ++-- - event_iface.c | 4 ++-- - include/lldp_mod.h | 2 +- - lldp/agent.c | 2 +- - lldp/rx.c | 4 ++-- - lldp/tx.c | 4 ++-- - lldp_dcbx.c | 8 ++++---- - lldp_mand_cmds.c | 8 ++++---- - lldpad.c | 12 +++++++----- - lldptool.c | 14 ++++++++------ - lldptool_cmds.c | 2 +- - qbg/ecp22.c | 8 ++++---- - qbg/vdp.c | 4 ++-- - qbg/vdp22.c | 6 +++--- - qbg/vdp22_cmds.c | 2 +- - vdptool.c | 16 +++++++++------- - 16 files changed, 53 insertions(+), 47 deletions(-) - -diff --git a/config.c b/config.c -index be458fd..bc3fbae 100644 ---- a/config.c -+++ b/config.c -@@ -185,7 +185,7 @@ void scan_port(UNUSED void *eloop_data, UNUSED void *user_ctx) - LIST_FOREACH(agent, &port->agent_head, entry) { - LLDPAD_DBG("%s: calling ifdown for agent %p.\n", - __func__, agent); -- LIST_FOREACH(np, &lldp_head, lldp) { -+ LIST_FOREACH(np, &lldp_mod_head, lldp) { - ops = np->ops; - if (ops->lldp_mod_ifdown) - ops->lldp_mod_ifdown(ifname, agent); -@@ -394,7 +394,7 @@ void init_ports(void) - LIST_FOREACH(agent, &port->agent_head, entry) { - LLDPAD_DBG("%s: calling ifup for agent %p.\n", - __func__, agent); -- LIST_FOREACH(np, &lldp_head, lldp) { -+ LIST_FOREACH(np, &lldp_mod_head, lldp) { - if (np->ops->lldp_mod_ifup) - np->ops->lldp_mod_ifup(p->if_name, agent); - } -diff --git a/event_iface.c b/event_iface.c -index 43a95c7..1be2963 100644 ---- a/event_iface.c -+++ b/event_iface.c -@@ -216,7 +216,7 @@ int oper_add_device(char *device_name) - LIST_FOREACH(agent, &port->agent_head, entry) { - LLDPAD_DBG("%s: calling ifup for agent %p.\n", - __func__, agent); -- LIST_FOREACH(np, &lldp_head, lldp) { -+ LIST_FOREACH(np, &lldp_mod_head, lldp) { - if (np->ops->lldp_mod_ifup) - np->ops->lldp_mod_ifup(device_name, agent); - } -@@ -283,7 +283,7 @@ static void event_if_decode_nlmsg(int route_type, void *data, int len) - LIST_FOREACH(agent, &port->agent_head, entry) { - LLDPAD_DBG("%s: calling ifdown for agent %p.\n", - __func__, agent); -- LIST_FOREACH(np, &lldp_head, lldp) { -+ LIST_FOREACH(np, &lldp_mod_head, lldp) { - ops = np->ops; - if (ops->lldp_mod_ifdown) - ops->lldp_mod_ifdown(device_name, -diff --git a/include/lldp_mod.h b/include/lldp_mod.h -index 49a50e4..9733595 100644 ---- a/include/lldp_mod.h -+++ b/include/lldp_mod.h -@@ -96,7 +96,7 @@ struct lldp_module { - }; - - LIST_HEAD(lldp_head, lldp_module); --struct lldp_head lldp_head; -+extern struct lldp_head lldp_mod_head; - - static inline struct lldp_module *find_module_by_id(struct lldp_head *head, int id) - { -diff --git a/lldp/agent.c b/lldp/agent.c -index 333929a..aa4a8d1 100644 ---- a/lldp/agent.c -+++ b/lldp/agent.c -@@ -163,7 +163,7 @@ static void timer(UNUSED void *eloop_data, UNUSED void *user_ctx) - run_rx_sm(port, agent); - update_rx_timers(agent); - -- LIST_FOREACH(n, &lldp_head, lldp) { -+ LIST_FOREACH(n, &lldp_mod_head, lldp) { - if (n->ops && n->ops->timer) - n->ops->timer(port, agent); - } -diff --git a/lldp/rx.c b/lldp/rx.c -index 12d07bc..43aeeba 100644 ---- a/lldp/rx.c -+++ b/lldp/rx.c -@@ -359,7 +359,7 @@ void rxProcessFrame(struct port *port, struct lldp_agent *agent) - } - - /* rx per lldp module */ -- LIST_FOREACH(np, &lldp_head, lldp) { -+ LIST_FOREACH(np, &lldp_mod_head, lldp) { - if (!np->ops || !np->ops->lldp_mod_rchange) - continue; - -@@ -402,7 +402,7 @@ u8 mibDeleteObjects(struct port *port, struct lldp_agent *agent) - { - struct lldp_module *np; - -- LIST_FOREACH(np, &lldp_head, lldp) { -+ LIST_FOREACH(np, &lldp_mod_head, lldp) { - if (!np->ops || !np->ops->lldp_mod_mibdelete) - continue; - np->ops->lldp_mod_mibdelete(port, agent); -diff --git a/lldp/tx.c b/lldp/tx.c -index c3a5c62..0746e34 100644 ---- a/lldp/tx.c -+++ b/lldp/tx.c -@@ -71,7 +71,7 @@ bool mibConstrInfoLLDPDU(struct port *port, struct lldp_agent *agent) - fb_offset += sizeof(struct l2_ethhdr); - - /* Generic TLV Pack */ -- LIST_FOREACH(np, &lldp_head, lldp) { -+ LIST_FOREACH(np, &lldp_mod_head, lldp) { - if (!np->ops || !np->ops->lldp_mod_gettlv) - continue; - -@@ -206,7 +206,7 @@ bool mibConstrShutdownLLDPDU(struct port *port, struct lldp_agent *agent) - memcpy(agent->tx.frameout, (void *)ð, sizeof(struct l2_ethhdr)); - fb_offset += sizeof(struct l2_ethhdr); - -- np = find_module_by_id(&lldp_head, LLDP_MOD_MAND); -+ np = find_module_by_id(&lldp_mod_head, LLDP_MOD_MAND); - if (!np) - goto error; - if (!np->ops || !np->ops->lldp_mod_gettlv) -diff --git a/lldp_dcbx.c b/lldp_dcbx.c -index 7e53c0f..809086f 100644 ---- a/lldp_dcbx.c -+++ b/lldp_dcbx.c -@@ -129,7 +129,7 @@ struct dcbx_tlvs *dcbx_data(const char *ifname) - struct dcbd_user_data *dud; - struct dcbx_tlvs *tlv = NULL; - -- dud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_DCBX); -+ dud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_DCBX); - if (dud) { - LIST_FOREACH(tlv, &dud->head, entry) { - if (!strncmp(tlv->ifname, ifname, IFNAMSIZ)) -@@ -148,7 +148,7 @@ int dcbx_tlvs_rxed(const char *ifname, struct lldp_agent *agent) - if (agent->type != NEAREST_BRIDGE) - return 0; - -- dud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_DCBX); -+ dud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_DCBX); - if (dud) { - LIST_FOREACH(tlv, &dud->head, entry) { - if (!strncmp(tlv->ifname, ifname, IFNAMSIZ)) -@@ -172,7 +172,7 @@ int dcbx_check_active(const char *ifname) - struct dcbd_user_data *dud; - struct dcbx_tlvs *tlv = NULL; - -- dud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_DCBX); -+ dud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_DCBX); - if (dud) { - LIST_FOREACH(tlv, &dud->head, entry) { - if (!strncmp(tlv->ifname, ifname, IFNAMSIZ)) -@@ -507,7 +507,7 @@ void dcbx_ifup(char *ifname, struct lldp_agent *agent) - ifindex = get_ifidx(ifname); - port = port_find_by_ifindex(ifindex); - -- dud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_DCBX); -+ dud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_DCBX); - tlvs = dcbx_data(ifname); - - if (!port) -diff --git a/lldp_mand_cmds.c b/lldp_mand_cmds.c -index 8a88177..1c43bf4 100644 ---- a/lldp_mand_cmds.c -+++ b/lldp_mand_cmds.c -@@ -466,7 +466,7 @@ int handle_get_args(struct cmd *cmd, UNUSED char *arg, char *argvalue, - nbuf = obuf; - nbuf_len = obuf_len; - -- LIST_FOREACH(np, &lldp_head, lldp) { -+ LIST_FOREACH(np, &lldp_mod_head, lldp) { - if (!np->ops->get_arg_handler) - continue; - if (!(ah = np->ops->get_arg_handler())) -@@ -496,7 +496,7 @@ int handle_get_arg(struct cmd *cmd, char *arg, char *argvalue, - struct arg_handlers *ah; - int rval, status = cmd_not_applicable; - -- LIST_FOREACH(np, &lldp_head, lldp) { -+ LIST_FOREACH(np, &lldp_mod_head, lldp) { - if (!np->ops->get_arg_handler) - continue; - if (!(ah = np->ops->get_arg_handler())) -@@ -593,7 +593,7 @@ int handle_test_arg(struct cmd *cmd, char *arg, char *argvalue, - struct arg_handlers *ah; - int rval, status = cmd_not_applicable; - -- LIST_FOREACH(np, &lldp_head, lldp) { -+ LIST_FOREACH(np, &lldp_mod_head, lldp) { - if (!np->ops->get_arg_handler) - continue; - if (!(ah = np->ops->get_arg_handler())) -@@ -626,7 +626,7 @@ int handle_set_arg(struct cmd *cmd, char *arg, char *argvalue, - struct arg_handlers *ah; - int rval, status = cmd_not_applicable; - -- LIST_FOREACH(np, &lldp_head, lldp) { -+ LIST_FOREACH(np, &lldp_mod_head, lldp) { - if (!np->ops->get_arg_handler) - continue; - if (!(ah = np->ops->get_arg_handler())) -diff --git a/lldpad.c b/lldpad.c -index 01fb588..65e92c7 100644 ---- a/lldpad.c -+++ b/lldpad.c -@@ -80,6 +80,8 @@ struct lldp_module *(*register_tlv_table[])(void) = { - NULL, - }; - -+struct lldp_head lldp_mod_head; -+ - char *cfg_file_name = NULL; - bool daemonize = 0; - int loglvl = LOG_WARNING; -@@ -98,7 +100,7 @@ static void init_modules(void) - struct lldp_module *premod = NULL; - int i = 0; - -- LIST_INIT(&lldp_head); -+ LIST_INIT(&lldp_mod_head); - for (i = 0; register_tlv_table[i]; i++) { - module = register_tlv_table[i](); - if (!module) -@@ -106,7 +108,7 @@ static void init_modules(void) - if (premod) - LIST_INSERT_AFTER(premod, module, lldp); - else -- LIST_INSERT_HEAD(&lldp_head, module, lldp); -+ LIST_INSERT_HEAD(&lldp_mod_head, module, lldp); - premod = module; - } - } -@@ -115,9 +117,9 @@ void deinit_modules(void) - { - struct lldp_module *module; - -- while (lldp_head.lh_first != NULL) { -- module = lldp_head.lh_first; -- LIST_REMOVE(lldp_head.lh_first, lldp); -+ while (lldp_mod_head.lh_first != NULL) { -+ module = lldp_mod_head.lh_first; -+ LIST_REMOVE(lldp_mod_head.lh_first, lldp); - module->ops->lldp_mod_unregister(module); - } - } -diff --git a/lldptool.c b/lldptool.c -index 2b14f61..664a248 100644 ---- a/lldptool.c -+++ b/lldptool.c -@@ -64,6 +64,8 @@ - #include "lldp_util.h" - #include "lldpad_status.h" - -+struct lldp_head lldp_mod_head; -+ - static int show_raw; - - static const char *cli_version = -@@ -199,7 +201,7 @@ static void init_modules(void) - if (premod) - LIST_INSERT_AFTER(premod, module, lldp); - else -- LIST_INSERT_HEAD(&lldp_head, module, lldp); -+ LIST_INSERT_HEAD(&lldp_mod_head, module, lldp); - premod = module; - } - } -@@ -208,9 +210,9 @@ void deinit_modules(void) - { - struct lldp_module *module; - -- while (lldp_head.lh_first != NULL) { -- module = lldp_head.lh_first; -- LIST_REMOVE(lldp_head.lh_first, lldp); -+ while (lldp_mod_head.lh_first != NULL) { -+ module = lldp_mod_head.lh_first; -+ LIST_REMOVE(lldp_mod_head.lh_first, lldp); - module->ops->lldp_mod_unregister(module); - } - } -@@ -346,7 +348,7 @@ cli_cmd_help(UNUSED struct clif *clif, UNUSED int argc, UNUSED char *argv[], - printf("%s\n%s\n%s", commands_usage, commands_options, commands_help); - - printf("\nTLV identifiers:\n"); -- LIST_FOREACH(np, &lldp_head, lldp) -+ LIST_FOREACH(np, &lldp_mod_head, lldp) - if (np->ops->print_help) - np->ops->print_help(); - return 0; -@@ -406,7 +408,7 @@ u32 lookup_tlvid(char *tlvid_str) - struct lldp_module *np; - u32 tlvid = INVALID_TLVID; - -- LIST_FOREACH(np, &lldp_head, lldp) { -+ LIST_FOREACH(np, &lldp_mod_head, lldp) { - if (np->ops->lookup_tlv_name) { - tlvid = np->ops->lookup_tlv_name(tlvid_str); - if (tlvid != INVALID_TLVID) -diff --git a/lldptool_cmds.c b/lldptool_cmds.c -index daef8c8..70b7b0d 100644 ---- a/lldptool_cmds.c -+++ b/lldptool_cmds.c -@@ -464,7 +464,7 @@ static void print_tlvs(struct cmd *cmd, char *ibuf) - offset += 8; - - printed = 0; -- LIST_FOREACH(np, &lldp_head, lldp) { -+ LIST_FOREACH(np, &lldp_mod_head, lldp) { - if (np->ops->print_tlv(tlvid, tlv_len, ibuf+offset)) { - printed = 1; - break; -diff --git a/qbg/ecp22.c b/qbg/ecp22.c -index 6561d14..825392b 100644 ---- a/qbg/ecp22.c -+++ b/qbg/ecp22.c -@@ -774,7 +774,7 @@ void ecp22_start(char *ifname) - struct ecp22 *ecp; - - LLDPAD_DBG("%s:%s start ecp\n", __func__, ifname); -- eud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_ECP22); -+ eud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_ECP22); - if (!eud) { - LLDPAD_DBG("%s:%s no ECP module\n", __func__, ifname); - return; -@@ -837,7 +837,7 @@ void ecp22_stop(char *ifname) - struct ecp22 *ecp; - - LLDPAD_DBG("%s:%s stop ecp\n", __func__, ifname); -- eud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_ECP22); -+ eud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_ECP22); - ecp = find_ecpdata(ifname, eud); - if (ecp) - ecp22_remove(ecp); -@@ -852,7 +852,7 @@ static int ecp22_data_from_evb(char *ifname, struct evb22_to_ecp22 *ptr) - struct ecp22_user_data *eud; - struct ecp22 *ecp; - -- eud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_ECP22); -+ eud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_ECP22); - ecp = find_ecpdata(ifname, eud); - if (ecp) { - ecp->max_rte = ptr->max_rte; -@@ -930,7 +930,7 @@ static int ecp22_req2send(char *ifname, unsigned short subtype, - - LLDPAD_DBG("%s:%s subtype:%d\n", __func__, ifname, subtype); - -- eud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_ECP22); -+ eud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_ECP22); - ecp = find_ecpdata(ifname, eud); - if (!ecp) { - rc = -ENODEV; -diff --git a/qbg/vdp.c b/qbg/vdp.c -index d131560..c26bbd6 100644 ---- a/qbg/vdp.c -+++ b/qbg/vdp.c -@@ -188,7 +188,7 @@ struct vdp_data *vdp_data(char *ifname) - struct vdp_user_data *ud; - struct vdp_data *vd = NULL; - -- ud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_VDP02); -+ ud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_VDP02); - if (ud) { - LIST_FOREACH(vd, &ud->head, entry) { - if (!strncmp(ifname, vd->ifname, IFNAMSIZ)) -@@ -1624,7 +1624,7 @@ void vdp_ifup(char *ifname, struct lldp_agent *agent) - - LIST_INIT(&vd->profile_head); - -- ud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_VDP02); -+ ud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_VDP02); - LIST_INSERT_HEAD(&ud->head, vd, entry); - - out_start_again: -diff --git a/qbg/vdp22.c b/qbg/vdp22.c -index cf02310..81ea3a8 100644 ---- a/qbg/vdp22.c -+++ b/qbg/vdp22.c -@@ -694,7 +694,7 @@ static struct vdp22 *vdp22_findif(const char *ifname, - struct vdp22 *vdp = 0; - - if (!ud) { -- ud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_VDP22); -+ ud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_VDP22); - if (!ud) - LLDPAD_DBG("%s:%s no VDP22 module\n", __func__, - ifname); -@@ -794,7 +794,7 @@ void vdp22_stop(char *ifname) - struct vsi22 *vsi; - - LLDPAD_DBG("%s:%s stop vdp\n", __func__, ifname); -- vud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_VDP22); -+ vud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_VDP22); - if (!vud) { - LLDPAD_ERR("%s:%s no VDP22 module\n", __func__, ifname); - return; -@@ -874,7 +874,7 @@ void vdp22_start(const char *ifname, int role) - struct vsi22 *vsi; - - LLDPAD_DBG("%s:%s start vdp\n", __func__, ifname); -- vud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_VDP22); -+ vud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_VDP22); - if (!vud) { - LLDPAD_ERR("%s:%s no VDP22 module\n", __func__, ifname); - return; -diff --git a/qbg/vdp22_cmds.c b/qbg/vdp22_cmds.c -index 2e1bbbd..a8025ee 100644 ---- a/qbg/vdp22_cmds.c -+++ b/qbg/vdp22_cmds.c -@@ -57,7 +57,7 @@ static struct lldp_module *get_my_module(int thisid) - { - struct lldp_module *np = NULL; - -- LIST_FOREACH(np, &lldp_head, lldp) -+ LIST_FOREACH(np, &lldp_mod_head, lldp) - if (thisid == np->id) - break; - return np; -diff --git a/vdptool.c b/vdptool.c -index 8f36277..f1d946c 100644 ---- a/vdptool.c -+++ b/vdptool.c -@@ -61,6 +61,8 @@ - #define OUI_ENCODE_HNDLR(name) name##_oui_encode_hndlr - #define OUI_PRNT_DECODE_HNDLR(name) name##_oui_print_decode_hndlr - -+struct lldp_head lldp_mod_head; -+ - #define EXTERN_OUI_FN(name) \ - extern bool name##_oui_encode_hndlr(char *, char *, size_t); \ - extern void name##_oui_print_decode_hndlr(char *) -@@ -796,13 +798,13 @@ static void init_modules(void) - struct lldp_module *premod = NULL; - int i = 0; - -- LIST_INIT(&lldp_head); -+ LIST_INIT(&lldp_mod_head); - for (i = 0; register_tlv_table[i]; i++) { - module = register_tlv_table[i](); - if (premod) - LIST_INSERT_AFTER(premod, module, lldp); - else -- LIST_INSERT_HEAD(&lldp_head, module, lldp); -+ LIST_INSERT_HEAD(&lldp_mod_head, module, lldp); - premod = module; - } - } -@@ -811,9 +813,9 @@ void deinit_modules(void) - { - struct lldp_module *module; - -- while (lldp_head.lh_first != NULL) { -- module = lldp_head.lh_first; -- LIST_REMOVE(lldp_head.lh_first, lldp); -+ while (lldp_mod_head.lh_first != NULL) { -+ module = lldp_mod_head.lh_first; -+ LIST_REMOVE(lldp_mod_head.lh_first, lldp); - module->ops->lldp_mod_unregister(module); - } - } -@@ -953,7 +955,7 @@ cli_cmd_help(UNUSED struct clif *clif, UNUSED int argc, UNUSED char *argv[], - printf("%s\n%s\n%s", commands_usage, commands_options, commands_help); - - printf("\nTLV identifiers:\n"); -- LIST_FOREACH(np, &lldp_head, lldp) -+ LIST_FOREACH(np, &lldp_mod_head, lldp) - if (np->ops->print_help) - np->ops->print_help(); - return 0; -@@ -1006,7 +1008,7 @@ u32 lookup_tlvid(char *tlvid_str) - struct lldp_module *np; - u32 tlvid = INVALID_TLVID; - -- LIST_FOREACH(np, &lldp_head, lldp) { -+ LIST_FOREACH(np, &lldp_mod_head, lldp) { - if (np->ops->lookup_tlv_name) { - tlvid = np->ops->lookup_tlv_name(tlvid_str); - if (tlvid != INVALID_TLVID) --- -2.28.0 - diff --git a/meta-networking/recipes-protocols/openlldp/files/0003-lldp-add-packed-struct-definition.patch b/meta-networking/recipes-protocols/openlldp/files/0003-lldp-add-packed-struct-definition.patch deleted file mode 100644 index 4d0594cb6c..0000000000 --- a/meta-networking/recipes-protocols/openlldp/files/0003-lldp-add-packed-struct-definition.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 702dd20f43d9ca7e0bcb917e8acfec3f1acdcb5c Mon Sep 17 00:00:00 2001 -From: Aaron Conole -Date: Mon, 3 Aug 2020 15:14:50 -0400 -Subject: [PATCH 3/9] lldp: add packed struct definition - -Signed-off-by: Aaron Conole ---- - include/lldp.h | 6 ++++++ - lldp/l2_packet.h | 5 ++--- - 2 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/include/lldp.h b/include/lldp.h -index fb5ee93..de6a4ad 100644 ---- a/include/lldp.h -+++ b/include/lldp.h -@@ -255,5 +255,11 @@ enum { - #define LLDP_EVB_DEFAULT_RTE 15 - #define LLDP_EVB_DEFAULT_MAX_RTE 31 - -+#ifndef _MSC_VER -+#define STRUCT_PACKED(STRUCT) STRUCT __attribute__((__packed__)) -+#else -+#define STRUCT_PACKED(STRUCT) __pragma(pack(push, 1)) STRUCT __pragma(pack(pop)) -+#endif -+ - void somethingChangedLocal(const char *ifname, int type); - #endif /* _LLDP_H */ -diff --git a/lldp/l2_packet.h b/lldp/l2_packet.h -index 607b8a3..831958c 100644 ---- a/lldp/l2_packet.h -+++ b/lldp/l2_packet.h -@@ -58,12 +58,11 @@ - */ - struct l2_packet_data; - -- --struct l2_ethhdr { -+STRUCT_PACKED(struct l2_ethhdr { - u8 h_dest[ETH_ALEN]; - u8 h_source[ETH_ALEN]; - u16 h_proto; --} STRUCT_PACKED; -+}); - - /** - * l2_packet_init - Initialize l2_packet interface --- -2.28.0 - diff --git a/meta-networking/recipes-protocols/openlldp/files/0004-clif-Include-string.h-for-mem-function-prototypes.patch b/meta-networking/recipes-protocols/openlldp/files/0004-clif-Include-string.h-for-mem-function-prototypes.patch new file mode 100644 index 0000000000..b6d9cf7707 --- /dev/null +++ b/meta-networking/recipes-protocols/openlldp/files/0004-clif-Include-string.h-for-mem-function-prototypes.patch @@ -0,0 +1,23 @@ +From d88aae2230683517b6d5b62cced51da81317a722 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 29 Aug 2022 22:37:14 -0700 +Subject: [PATCH] clif: Include string.h for mem* function prototypes + +Upstream-Status: Submitted [https://github.com/intel/openlldp/pull/86] +Signed-off-by: Khem Raj +--- + clif.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/clif.c b/clif.c +index cad6f75..0758a7e 100644 +--- a/clif.c ++++ b/clif.c +@@ -32,6 +32,7 @@ + + #include + #include ++#include + #include + #include + #include diff --git a/meta-networking/recipes-protocols/openlldp/files/0004-lldptool-make-extern.patch b/meta-networking/recipes-protocols/openlldp/files/0004-lldptool-make-extern.patch deleted file mode 100644 index 16b7def684..0000000000 --- a/meta-networking/recipes-protocols/openlldp/files/0004-lldptool-make-extern.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 8229f4fb700ba4fcb2ec3e9956491bf5ee8c0ae2 Mon Sep 17 00:00:00 2001 -From: Aaron Conole -Date: Mon, 3 Aug 2020 15:17:31 -0400 -Subject: [PATCH 4/9] lldptool: make extern - -This should only exist per final linked object. - -Signed-off-by: Aaron Conole ---- - include/lldptool.h | 2 +- - lldptool.c | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/include/lldptool.h b/include/lldptool.h -index c919873..a190009 100644 ---- a/include/lldptool.h -+++ b/include/lldptool.h -@@ -29,7 +29,7 @@ - - #include "clif.h" - --struct lldp_head lldp_cli_head; -+extern struct lldp_head lldp_cli_head; - - int clif_command(struct clif *clif, char *cmd, int raw); - void print_raw_message(char *msg, int print); -diff --git a/lldptool.c b/lldptool.c -index 664a248..d76cc48 100644 ---- a/lldptool.c -+++ b/lldptool.c -@@ -64,6 +64,7 @@ - #include "lldp_util.h" - #include "lldpad_status.h" - -+struct lldp_head lldp_cli_head; - struct lldp_head lldp_mod_head; - - static int show_raw; --- -2.28.0 - diff --git a/meta-networking/recipes-protocols/openlldp/files/0005-cisco_oui-match-encode-handler-prototypes.patch b/meta-networking/recipes-protocols/openlldp/files/0005-cisco_oui-match-encode-handler-prototypes.patch deleted file mode 100644 index 4bdc5f2f62..0000000000 --- a/meta-networking/recipes-protocols/openlldp/files/0005-cisco_oui-match-encode-handler-prototypes.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9203dec731e53fb72e1c0d62639e6e54378f66cc Mon Sep 17 00:00:00 2001 -From: Aaron Conole -Date: Mon, 3 Aug 2020 15:20:59 -0400 -Subject: [PATCH 5/9] cisco_oui: match encode handler prototypes - -The EXTERN_FN prototype generated requires size_t be the third parameter. - -Signed-off-by: Aaron Conole ---- - vdptool_cisco_oui.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vdptool_cisco_oui.c b/vdptool_cisco_oui.c -index 7003521..3f88c76 100644 ---- a/vdptool_cisco_oui.c -+++ b/vdptool_cisco_oui.c -@@ -28,7 +28,7 @@ - #include "lldp_util.h" - #include "vdp_cisco.h" - --bool cisco_oui_encode_hndlr(char *dst, char *src, int len) -+bool cisco_oui_encode_hndlr(char *dst, char *src, size_t len) - { - char *src_temp = strdup(src); - char *key, *data; --- -2.28.0 - diff --git a/meta-networking/recipes-protocols/openlldp/files/0006-ecp22-make-enum-a-type-rather-than-instance.patch b/meta-networking/recipes-protocols/openlldp/files/0006-ecp22-make-enum-a-type-rather-than-instance.patch deleted file mode 100644 index 2b0289df28..0000000000 --- a/meta-networking/recipes-protocols/openlldp/files/0006-ecp22-make-enum-a-type-rather-than-instance.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 2723219c08726efa08a6bad04ffb775f850a96bc Mon Sep 17 00:00:00 2001 -From: Aaron Conole -Date: Mon, 3 Aug 2020 15:23:28 -0400 -Subject: [PATCH 6/9] ecp22: make enum a type rather than instance - -The enum defined in the qbg header is setup as a discreet instance -rather than a type. Fix this. - -Signed-off-by: Aaron Conole ---- - include/qbg_ecp22.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/qbg_ecp22.h b/include/qbg_ecp22.h -index 567f6df..fe66bb3 100644 ---- a/include/qbg_ecp22.h -+++ b/include/qbg_ecp22.h -@@ -49,10 +49,10 @@ enum { /* ECP Transmit states */ - ECP22_TX_ERROR - }; - --enum { -+enum ecp22_mode { - ECP22_REQUEST = 0, - ECP22_ACK --} ecp22_mode; -+}; - - struct ecp22_hdr { /* ECP22 header */ - u16 ver_op_sub; /* ECP22 version, operation, subtype */ --- -2.28.0 - diff --git a/meta-networking/recipes-protocols/openlldp/files/0007-lldp_8021qaz-extern-config-object.patch b/meta-networking/recipes-protocols/openlldp/files/0007-lldp_8021qaz-extern-config-object.patch deleted file mode 100644 index 36b575c566..0000000000 --- a/meta-networking/recipes-protocols/openlldp/files/0007-lldp_8021qaz-extern-config-object.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 275fe9da663193a843de450f03e810daedc06955 Mon Sep 17 00:00:00 2001 -From: Aaron Conole -Date: Mon, 3 Aug 2020 15:25:38 -0400 -Subject: [PATCH 7/9] lldp_8021qaz: extern config object - -The config object only exists as part of the config translation unit -so remove the extra config object in the 8021qaz module. - -Signed-off-by: Aaron Conole ---- - lldp_8021qaz.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lldp_8021qaz.c b/lldp_8021qaz.c -index a42fd11..673d758 100644 ---- a/lldp_8021qaz.c -+++ b/lldp_8021qaz.c -@@ -49,7 +49,7 @@ - - - struct lldp_head lldp_head; --struct config_t lldpad_cfg; -+extern config_t lldpad_cfg; - extern bool read_only_8021qaz; - - static int ieee8021qaz_check_pending(struct port *port, struct lldp_agent *); --- -2.28.0 - diff --git a/meta-networking/recipes-protocols/openlldp/files/0008-stringops-fix-some-string-copy-errors.patch b/meta-networking/recipes-protocols/openlldp/files/0008-stringops-fix-some-string-copy-errors.patch deleted file mode 100644 index 501b66699c..0000000000 --- a/meta-networking/recipes-protocols/openlldp/files/0008-stringops-fix-some-string-copy-errors.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 61291de03cb6dd1aea2a633eb72951f3fe453e7f Mon Sep 17 00:00:00 2001 -From: Aaron Conole -Date: Mon, 3 Aug 2020 15:33:08 -0400 -Subject: [PATCH 8/9] stringops: fix some string copy errors - -Reported when using gcc-10. - -Signed-off-by: Aaron Conole ---- - dcb_protocol.c | 13 ++++--------- - lldp/ports.c | 2 +- - 2 files changed, 5 insertions(+), 10 deletions(-) - -diff --git a/dcb_protocol.c b/dcb_protocol.c -index 75ca139..930251b 100644 ---- a/dcb_protocol.c -+++ b/dcb_protocol.c -@@ -2257,13 +2257,8 @@ cmd_status get_bwg_descrpt(char *device_name, u8 bwgid, char **name) - - if ((it != NULL) && - (bwgid < it->second->max_pgid_desc)) { -- size = (int)strlen(it->second->pgid_desc[bwgid]) + -- sizeof(char); /* Localization OK */ -- *name = (char*)malloc(size); -- if (*name != NULL) { -- strncpy(*name, it->second->pgid_desc[bwgid], -- size); /* Localization OK */ -- } else { -+ *name = strdup(it->second->pgid_desc[bwgid]); -+ if (*name == NULL) { - goto Error; - } - } else { -@@ -2272,9 +2267,9 @@ cmd_status get_bwg_descrpt(char *device_name, u8 bwgid, char **name) - size = (int)strlen( - attribs.descript.pgid_desc[bwgid]) + - sizeof(char); -- *name = (char*)malloc(size); -+ *name = (char*)calloc(size, sizeof(char)); - if (*name != NULL) { -- memcpy(*name, attribs.descript.pgid_desc[bwgid], size); /* Localization OK */ -+ memcpy(*name, attribs.descript.pgid_desc[bwgid], size - 1); /* Localization OK */ - } else { - goto Error; - } -diff --git a/lldp/ports.c b/lldp/ports.c -index 6384f14..9b681f7 100644 ---- a/lldp/ports.c -+++ b/lldp/ports.c -@@ -264,7 +264,7 @@ struct port *add_port(int ifindex, const char *ifname) - memset(newport, 0, sizeof(*newport)); - newport->ifindex = ifindex; - newport->next = NULL; -- strncpy(newport->ifname, ifname, IFNAMSIZ); -+ strncpy(newport->ifname, ifname, IFNAMSIZ - 1); - - newport->bond_master = is_bond(ifname); - /* Initialize relevant port variables */ --- -2.28.0 - diff --git a/meta-networking/recipes-protocols/openlldp/files/0009-8021qaz-mark-prio-map-functions-static.patch b/meta-networking/recipes-protocols/openlldp/files/0009-8021qaz-mark-prio-map-functions-static.patch deleted file mode 100644 index 0f84426f9b..0000000000 --- a/meta-networking/recipes-protocols/openlldp/files/0009-8021qaz-mark-prio-map-functions-static.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7ae79b0dff53a23fa0a964f77b9e3bb387a293c4 Mon Sep 17 00:00:00 2001 -From: Aaron Conole -Date: Tue, 4 Aug 2020 09:17:50 -0400 -Subject: [PATCH 9/9] 8021qaz: mark prio map functions static - -Inline is not the correct way to mark a function for inclusion -in a single translation unit. Use 'static' to restrict export -of these functions. - -Signed-off-by: Aaron Conole ---- - lldp_8021qaz.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lldp_8021qaz.c b/lldp_8021qaz.c -index 673d758..16ae167 100644 ---- a/lldp_8021qaz.c -+++ b/lldp_8021qaz.c -@@ -397,7 +397,7 @@ static int read_cfg_file(char *ifname, struct lldp_agent *agent, - return 0; - } - --inline int get_prio_map(u32 prio_map, int prio) -+static int get_prio_map(u32 prio_map, int prio) - { - if (prio > 7) - return 0; -@@ -405,7 +405,7 @@ inline int get_prio_map(u32 prio_map, int prio) - return (prio_map >> (4 * (7-prio))) & 0xF; - } - --inline void set_prio_map(u32 *prio_map, u8 prio, int tc) -+static void set_prio_map(u32 *prio_map, u8 prio, int tc) - { - u32 mask = ~(0xffffffff & (0xF << (4 * (7-prio)))); - *prio_map &= mask; --- -2.28.0 - diff --git a/meta-networking/recipes-protocols/openlldp/files/lldp_head-remove-all-references.patch b/meta-networking/recipes-protocols/openlldp/files/lldp_head-remove-all-references.patch deleted file mode 100644 index bb3400cfa6..0000000000 --- a/meta-networking/recipes-protocols/openlldp/files/lldp_head-remove-all-references.patch +++ /dev/null @@ -1,331 +0,0 @@ -From ed6a8e5a75f56b7034a46294a0bf2a9a7fd14fbc Mon Sep 17 00:00:00 2001 -From: Aaron Conole -Date: Fri, 23 Oct 2020 14:40:32 -0400 -Subject: [PATCH] lldp_head: remove all references - -There were a number of references missed during the module cleanup. This hits the remaining -ones. - -Fixes: 07a83c583b9d ("lldp_head: rename and make extern") -Signed-off-by: Aaron Conole - -Reference to upstream patch: -https://github.com/intel/openlldp/commit/ed6a8e5a75f56b7034a46294a0bf2a9a7fd14fbc - -Signed-off-by: Li Wang ---- - ctrl_iface.c | 4 +--- - lldp_8021qaz.c | 11 +++++------ - lldp_8023.c | 6 ++---- - lldp_basman.c | 6 ++---- - lldp_evb.c | 6 ++---- - lldp_evb22.c | 6 ++---- - lldp_mand.c | 10 ++++------ - lldp_med.c | 6 ++---- - qbg_utils.c | 3 +-- - 9 files changed, 21 insertions(+), 37 deletions(-) - -diff --git a/ctrl_iface.c b/ctrl_iface.c -index 1734f49..666f7c8 100644 ---- a/ctrl_iface.c -+++ b/ctrl_iface.c -@@ -53,8 +53,6 @@ - #include "lldp_util.h" - #include "messages.h" - --extern struct lldp_head lldp_head; -- - struct ctrl_dst { - struct ctrl_dst *next; - struct sockaddr_un addr; -@@ -116,7 +114,7 @@ int clif_iface_module(struct clif_data *clifd, - return cmd_invalid; - } - -- mod = find_module_by_id(&lldp_head, module_id); -+ mod = find_module_by_id(&lldp_mod_head, module_id); - if (mod && mod->ops && mod->ops->client_cmd) - return (mod->ops->client_cmd)(clifd, from, fromlen, - cmd_start, cmd_len, rbuf+strlen(rbuf), rlen); -diff --git a/lldp_8021qaz.c b/lldp_8021qaz.c -index 16ae167..e747710 100644 ---- a/lldp_8021qaz.c -+++ b/lldp_8021qaz.c -@@ -48,7 +48,6 @@ - #include "lldp_dcbx.h" - - --struct lldp_head lldp_head; - extern config_t lldpad_cfg; - extern bool read_only_8021qaz; - -@@ -84,7 +83,7 @@ static int ieee8021qaz_check_pending(struct port *port, - if (!port->portEnabled) - return 0; - -- iud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_8021QAZ); -+ iud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_8021QAZ); - if (iud) { - LIST_FOREACH(tlv, &iud->head, entry) { - if (!strncmp(port->ifname, tlv->ifname, IFNAMSIZ)) { -@@ -143,7 +142,7 @@ struct ieee8021qaz_tlvs *ieee8021qaz_data(const char *ifname) - struct ieee8021qaz_user_data *iud; - struct ieee8021qaz_tlvs *tlv = NULL; - -- iud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_8021QAZ); -+ iud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_8021QAZ); - if (iud) { - LIST_FOREACH(tlv, &iud->head, entry) { - if (!strncmp(tlv->ifname, ifname, IFNAMSIZ)) -@@ -629,7 +628,7 @@ void ieee8021qaz_ifup(char *ifname, struct lldp_agent *agent) - LIST_INIT(&tlvs->app_head); - read_cfg_file(port->ifname, agent, tlvs); - -- iud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_8021QAZ); -+ iud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_8021QAZ); - LIST_INSERT_HEAD(&iud->head, tlvs, entry); - - initialized: -@@ -2179,7 +2178,7 @@ int ieee8021qaz_tlvs_rxed(const char *ifname) - struct ieee8021qaz_user_data *iud; - struct ieee8021qaz_tlvs *tlv = NULL; - -- iud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_8021QAZ); -+ iud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_8021QAZ); - if (iud) { - LIST_FOREACH(tlv, &iud->head, entry) { - if (!strncmp(tlv->ifname, ifname, IFNAMSIZ)) -@@ -2198,7 +2197,7 @@ int ieee8021qaz_check_active(const char *ifname) - struct ieee8021qaz_user_data *iud; - struct ieee8021qaz_tlvs *tlv = NULL; - -- iud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_8021QAZ); -+ iud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_8021QAZ); - if (iud) { - LIST_FOREACH(tlv, &iud->head, entry) { - if (!strncmp(tlv->ifname, ifname, IFNAMSIZ)) -diff --git a/lldp_8023.c b/lldp_8023.c -index 422026e..8a03211 100644 ---- a/lldp_8023.c -+++ b/lldp_8023.c -@@ -39,8 +39,6 @@ - #include "lldp_8023_clif.h" - #include "lldp_8023_cmds.h" - --extern struct lldp_head lldp_head; -- - struct tlv_info_8023_maccfg { - u8 oui[3]; - u8 sub; -@@ -84,7 +82,7 @@ static struct ieee8023_data *ieee8023_data(const char *ifname, enum agent_type t - struct ieee8023_user_data *ud; - struct ieee8023_data *bd = NULL; - -- ud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_8023); -+ ud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_8023); - if (ud) { - LIST_FOREACH(bd, &ud->head, entry) { - if (!strncmp(ifname, bd->ifname, IFNAMSIZ) && -@@ -456,7 +454,7 @@ void ieee8023_ifup(char *ifname, struct lldp_agent *agent) - goto out_err; - } - -- ud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_8023); -+ ud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_8023); - LIST_INSERT_HEAD(&ud->head, bd, entry); - LLDPAD_INFO("%s:port %s added\n", __func__, ifname); - return; -diff --git a/lldp_basman.c b/lldp_basman.c -index a4f69c1..614e2a2 100644 ---- a/lldp_basman.c -+++ b/lldp_basman.c -@@ -75,8 +75,6 @@ struct tlv_info_manaddr { - struct tlv_info_maoid o; - } __attribute__ ((__packed__)); - --extern struct lldp_head lldp_head; -- - static const struct lldp_mod_ops basman_ops = { - .lldp_mod_register = basman_register, - .lldp_mod_unregister = basman_unregister, -@@ -91,7 +89,7 @@ static struct basman_data *basman_data(const char *ifname, enum agent_type type) - struct basman_user_data *bud; - struct basman_data *bd = NULL; - -- bud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_BASIC); -+ bud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_BASIC); - if (bud) { - LIST_FOREACH(bd, &bud->head, entry) { - if (!strncmp(ifname, bd->ifname, IFNAMSIZ) && -@@ -688,7 +686,7 @@ void basman_ifup(char *ifname, struct lldp_agent *agent) - goto out_err; - } - -- bud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_BASIC); -+ bud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_BASIC); - LIST_INSERT_HEAD(&bud->head, bd, entry); - LLDPAD_DBG("%s:port %s added\n", __func__, ifname); - return; -diff --git a/lldp_evb.c b/lldp_evb.c -index dcdcc7e..a8f3965 100644 ---- a/lldp_evb.c -+++ b/lldp_evb.c -@@ -36,14 +36,12 @@ - #include "messages.h" - #include "config.h" - --extern struct lldp_head lldp_head; -- - struct evb_data *evb_data(char *ifname, enum agent_type type) - { - struct evb_user_data *ud; - struct evb_data *ed = NULL; - -- ud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_EVB); -+ ud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_EVB); - if (ud) { - LIST_FOREACH(ed, &ud->head, entry) { - if (!strncmp(ifname, ed->ifname, IFNAMSIZ) && -@@ -347,7 +345,7 @@ static void evb_ifup(char *ifname, struct lldp_agent *agent) - - evb_init_tlv(ed, agent); - -- ud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_EVB); -+ ud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_EVB); - LIST_INSERT_HEAD(&ud->head, ed, entry); - LLDPAD_DBG("%s:%s agent %d added\n", __func__, ifname, agent->type); - } -diff --git a/lldp_evb22.c b/lldp_evb22.c -index 76ba883..6e92d9d 100644 ---- a/lldp_evb22.c -+++ b/lldp_evb22.c -@@ -37,14 +37,12 @@ - #include "messages.h" - #include "config.h" - --extern struct lldp_head lldp_head; -- - struct evb22_data *evb22_data(char *ifname, enum agent_type type) - { - struct evb22_user_data *ud; - struct evb22_data *ed = NULL; - -- ud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_EVB22); -+ ud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_EVB22); - if (ud) { - LIST_FOREACH(ed, &ud->head, entry) { - if (!strncmp(ifname, ed->ifname, IFNAMSIZ) && -@@ -453,7 +451,7 @@ static void evb22_ifup(char *ifname, struct lldp_agent *agent) - STRNCPY_TERMINATED(ed->ifname, ifname, IFNAMSIZ); - ed->agenttype = agent->type; - evb22_init_tlv(ed, agent); -- ud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_EVB22); -+ ud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_EVB22); - LIST_INSERT_HEAD(&ud->head, ed, entry); - LLDPAD_DBG("%s:%s agent %d added\n", __func__, ifname, agent->type); - } -diff --git a/lldp_mand.c b/lldp_mand.c -index 0db63cb..b857a88 100644 ---- a/lldp_mand.c -+++ b/lldp_mand.c -@@ -42,8 +42,6 @@ - #include "lldp/l2_packet.h" - #include "lldp_tlv.h" - --extern struct lldp_head lldp_head; -- - static const struct lldp_mod_ops mand_ops = { - .lldp_mod_register = mand_register, - .lldp_mod_unregister = mand_unregister, -@@ -59,7 +57,7 @@ struct mand_data *mand_data(const char *ifname, enum agent_type type) - struct mand_user_data *mud; - struct mand_data *md = NULL; - -- mud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_MAND); -+ mud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_MAND); - if (mud) { - LIST_FOREACH(md, &mud->head, entry) { - if (!strncmp(ifname, md->ifname, IFNAMSIZ) && -@@ -608,7 +606,7 @@ void mand_ifup(char *ifname, struct lldp_agent *agent) - STRNCPY_TERMINATED(md->ifname, ifname, IFNAMSIZ); - md->agenttype = agent->type; - -- mud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_MAND); -+ mud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_MAND); - LIST_INSERT_HEAD(&mud->head, md, entry); - } - -@@ -636,7 +634,7 @@ struct lldp_module *mand_register(void) - LLDPAD_ERR("failed to malloc LLDP Mandatory module data\n"); - goto out_err; - } -- mud = malloc(sizeof(struct mand_user_data)); -+ mud = malloc(sizeof(struct mand_user_data)); - if (!mud) { - free(mod); - LLDPAD_ERR("failed to malloc LLDP Mandatory module user data\n"); -@@ -644,8 +642,8 @@ struct lldp_module *mand_register(void) - } - LIST_INIT(&mud->head); - mod->id = LLDP_MOD_MAND; -+ mod->data = mud; - mod->ops = &mand_ops; -- mod->data = mud; - LLDPAD_INFO("%s:done\n", __func__); - return mod; - out_err: -diff --git a/lldp_med.c b/lldp_med.c -index f6c373e..7b6996e 100644 ---- a/lldp_med.c -+++ b/lldp_med.c -@@ -40,8 +40,6 @@ - #include "lldp_mand_clif.h" - #include "lldp_med_cmds.h" - --extern struct lldp_head lldp_head; -- - struct tlv_info_medcaps { - u8 oui[OUI_SIZE]; - u8 subtype; -@@ -95,7 +93,7 @@ static struct med_data *med_data(const char *ifname, enum agent_type type) - struct med_user_data *mud; - struct med_data *md = NULL; - -- mud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_MED); -+ mud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_MED); - if (mud) { - LIST_FOREACH(md, &mud->head, entry) { - if (!strncmp(ifname, md->ifname, IFNAMSIZ) && -@@ -914,7 +912,7 @@ void med_ifup(char *ifname, struct lldp_agent *agent) - free(md); - goto out_err; - } -- mud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_MED); -+ mud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_MED); - LIST_INSERT_HEAD(&mud->head, md, entry); - LLDPAD_INFO("%s:port %s added\n", __func__, ifname); - return; -diff --git a/qbg_utils.c b/qbg_utils.c -index 9daeade..0d40c5b 100644 ---- a/qbg_utils.c -+++ b/qbg_utils.c -@@ -36,7 +36,6 @@ - #include "qbg_utils.h" - - extern int loglvl; /* Global lldpad log level */ --extern struct lldp_head lldp_head; - - /* - * hexdump_frame - print raw evb/ecp/vdp frame -@@ -73,7 +72,7 @@ void hexdump_frame(const char *ifname, char *txt, const unsigned char *buf, - */ - int modules_notify(int id, int sender_id, char *ifname, void *data) - { -- struct lldp_module *mp = find_module_by_id(&lldp_head, id); -+ struct lldp_module *mp = find_module_by_id(&lldp_mod_head, id); - int rc = 0; - - if (mp && mp->ops->lldp_mod_notify) --- -2.18.1 - diff --git a/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb b/meta-networking/recipes-protocols/openlldp/openlldp_1.1.0.bb similarity index 57% rename from meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb rename to meta-networking/recipes-protocols/openlldp/openlldp_1.1.0.bb index acde9c3659..812f4fbcf0 100644 --- a/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb +++ b/meta-networking/recipes-protocols/openlldp/openlldp_1.1.0.bb @@ -12,27 +12,15 @@ inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} DEPENDS = "libnl libconfig readline" -SRCREV = "b71bfb87fefb31c4b1a6a7ae351791c90966c3a8" +SRCREV = "85e55837a81d710e5baa7da47f7ed0d205c8ede5" PV .= "+git${SRCPV}" -SRC_URI = "git://github.com/intel/openlldp.git;protocol=https;branch=master \ +SRC_URI = "git://github.com/intel/openlldp.git;protocol=https;branch=branch-1.1 \ file://0001-Fix-musl-libc-build-issue.patch \ file://0001-autotools-Add-include-path-to-generated-version.h.patch \ file://0001-autotools-Add-option-to-disable-installation-of-syst.patch \ - file://0001-cmds-fix-enum-conversion.patch \ - file://0002-lldp_head-rename-and-make-extern.patch \ - file://0003-lldp-add-packed-struct-definition.patch \ - file://0004-lldptool-make-extern.patch \ - file://0005-cisco_oui-match-encode-handler-prototypes.patch \ - file://0006-ecp22-make-enum-a-type-rather-than-instance.patch \ - file://0007-lldp_8021qaz-extern-config-object.patch \ - file://0008-stringops-fix-some-string-copy-errors.patch \ - file://0009-8021qaz-mark-prio-map-functions-static.patch \ - file://lldp_head-remove-all-references.patch \ + file://0004-clif-Include-string.h-for-mem-function-prototypes.patch \ " -# Makefile.am adds -Werror to AM_CFLAGS. There are warnings so disable it. -TARGET_CFLAGS += "-Wno-error" - # Enable install of systemd conf files. EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_system_unitdir}', '', d)}" From patchwork Tue Aug 30 07:14:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12107 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 08EEEC6FA83 for ; Tue, 30 Aug 2022 07:14:33 +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.web12.8933.1661843672631382275 for ; Tue, 30 Aug 2022 00:14:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ImWpxmLg; 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 145so10129476pfw.4 for ; Tue, 30 Aug 2022 00:14:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=z3LYKuV4/9Peg0dsYl7OggiQ7tSn7HaGyIY+Uhn4AuA=; b=ImWpxmLgq9FWh+iYHJCT+I/gxTbnM+AV8/QV4ecbE/m+ZciFEYPL5faRa9MQgy9TyQ tsZxDd7k2du6C4HjFDOuULfyQ2uSUka4HSaUTJfhCPxTon+oXDblgYS9R4uzSl6601YM YV3QarfuEmBdASmhkv/XeXK5K0EPliq74QWAXbjWQ65IhYQUPhQfcTvdUrJqh6BCK8iS LoZ3jYy9Yhra7UOnYnwAR9mZvQ2V0Rw2cFk0HHnH9euPzb7ECo8v07qC6+TVMD3CEhZe v0NEaE1X5ZbhTgY6Ri5NUFa4r4pQN2uVXwi4WcktVsljTwtfKC+FMEVuT0b8XYSetem7 Szng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=z3LYKuV4/9Peg0dsYl7OggiQ7tSn7HaGyIY+Uhn4AuA=; b=B1nhQ/5EfEC9HOAp0OcMnu5mErTDkZBzwvA0KrcOWhlzDtkQtSzoPIpL3AepjzpKvJ b2JsMnudVfVcqVkCidx3HOHNTwgiNbm5adcmFgHjCtS9ZTBx2mKgkzSeiNGGcpH5x8AY B00msHxl+ZcWoedUNDGBQeBihkQXBC9pFS8aKsw6S4oxe4vZum1LXosDVfKqJczS6vkH 8aJg5zAiM52Y+sfuRdyoxo9x9gH42U6gAdxXZ1rRb4rZG1REeLgF4YapbjO6CLnoSQBL hNYBILvsKKmsj1axP2BZDlf7of9bc9QOICwVCn8ArWrpJPV1GFdmtJEQilYbetH3ZEdR kCgw== X-Gm-Message-State: ACgBeo1/sQCXGa41zYV9zHa+uvbD7QNdrv/wxU1jmhxZCRhG2rmMAaAZ 2+nb9RVKwtJXo/sCbfp7RRk+WLh7Ccwspw== X-Google-Smtp-Source: AA6agR40kxuFDazjKyw0okqZLyEoh7p/vClHMjO70iVec3YCI4WuzSDwCNSfoDqLwsJAkma7lz1ZHA== X-Received: by 2002:a63:fb56:0:b0:429:983f:b91e with SMTP id w22-20020a63fb56000000b00429983fb91emr17111754pgj.399.1661843671912; Tue, 30 Aug 2022 00:14:31 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id z24-20020aa79f98000000b00537f9e32b00sm6041616pfr.37.2022.08.30.00.14.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 00:14:31 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 18/21] ettercap: Pass -D_GNU_SOURCE Date: Tue, 30 Aug 2022 00:14:10 -0700 Message-Id: <20220830071413.3887189-18-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220830071413.3887189-1-raj.khem@gmail.com> References: <20220830071413.3887189-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 ; Tue, 30 Aug 2022 07:14:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98555 Fixes build on musl Signed-off-by: Khem Raj --- meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb b/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb index 99fcacd3ef..7d37f41096 100644 --- a/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb +++ b/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb @@ -32,6 +32,7 @@ EXTRA_OECMAKE = " \ -DENABLE_GTK=OFF \ " +CFLAGS += "-D_GNU_SOURCE" # Replaces default encoding set (ISO-8859-1) with UTF-8 in ettercap # configuration file installed by the package. # It ensures that all characters are properly decoded and avoids From patchwork Tue Aug 30 07:14:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12111 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 01B9EECAAA1 for ; Tue, 30 Aug 2022 07:14:43 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web08.8724.1661843673645801317 for ; Tue, 30 Aug 2022 00:14:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=NgtFSJbQ; spf=pass (domain: gmail.com, ip: 209.85.215.182, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f182.google.com with SMTP id c24so9866866pgg.11 for ; Tue, 30 Aug 2022 00:14:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=nWII2GUb5cs8f9pLWwO2lmDnz6nL8D0YX+xetTU5s6I=; b=NgtFSJbQwETwHdk7xkIHdXnErfbZJYnxljGkDkDRi283Dp8CgQQ15Y7XC4cTEUKDAm m7DMg7/Gl4raXTgytf2awLbkrIqMf0jGMkN4Z7ODm1oPk4oz120csrHJ5FovYkxTK2Ri vZDwcag2y4Mgxqzo+xYxnRhkSDTt1vPmucoAGbIHjUcxaXMRxdOMK9r31sSq5+czKZML rGt5293BdVxLE/shnPCwNXOk0b6QQ4/9sVeB+LE0YhVDNnGfZHdRxDyet7jCpdg7qYcm chwqkjwahdY6z2BD4bj5+i0/t5Tl+FfazDTfCdnd8gGRzwjEijYWadPkyLyASQVkuiiA mP/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=nWII2GUb5cs8f9pLWwO2lmDnz6nL8D0YX+xetTU5s6I=; b=Y6enF+j2Dj4xRCfohWdSsWGCHHbiKMBD8GoI8j8ZEuF/l/Copt0VfmGLVpfQHjZBSz fjOxwHZnygfz0I6KTv9+IhxS/81Q1OqWwy2uE4Ik8kYEBF/X29DiU47vGYOUlp6MzYDY N6U5hx4r1mQgR9gzGRC0JnJEYfYQMWFu9lALFJB2oUupJrxzhvH4ZHDNDl1n5tJtKlIw mL9cNATQ5EOzFZ3xgxosS9187XGNoHnL7qFsVzvBc20IC9dIlDkkxhNoRHB1xVABPwoN JtxYPJ6Oukic8QAAcheuC/XmcCjzkccObn87PmiYhPPSy26dKViSOv1xTdF7btRLcije bl4Q== X-Gm-Message-State: ACgBeo2KrQFqV92vnoDx/Zx2lVx4S/TPf3bwfNu8qMUVjS8OlMFcbYbQ lAqfNIMWloxSNzsO3SG0olg4OKS9ykT4Hw== X-Google-Smtp-Source: AA6agR5LnSqdkLaGuz2WGvR5JJaCy0P5hnH6BxTgBt7r3v1Cu4ugIIlPwN3nWvecxMrDG/QZX4ZvbA== X-Received: by 2002:a05:6a02:4b:b0:42b:d98a:d85b with SMTP id az11-20020a056a02004b00b0042bd98ad85bmr9588831pgb.556.1661843672868; Tue, 30 Aug 2022 00:14:32 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id z24-20020aa79f98000000b00537f9e32b00sm6041616pfr.37.2022.08.30.00.14.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 00:14:32 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 19/21] rdma-core: Fix build with musl Date: Tue, 30 Aug 2022 00:14:11 -0700 Message-Id: <20220830071413.3887189-19-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220830071413.3887189-1-raj.khem@gmail.com> References: <20220830071413.3887189-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 ; Tue, 30 Aug 2022 07:14:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98556 Signed-off-by: Khem Raj --- ...xamples-Include-alloca.h-for-strdupa.patch | 29 +++++++++++++++++++ .../rdma-core/rdma-core_42.0.bb | 4 ++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0001-examples-Include-alloca.h-for-strdupa.patch diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-examples-Include-alloca.h-for-strdupa.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-examples-Include-alloca.h-for-strdupa.patch new file mode 100644 index 0000000000..cb472d9db9 --- /dev/null +++ b/meta-networking/recipes-support/rdma-core/rdma-core/0001-examples-Include-alloca.h-for-strdupa.patch @@ -0,0 +1,29 @@ +From a6c547e46bbadd2c08be9944a85308f6625263cb Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 29 Aug 2022 23:15:44 -0700 +Subject: [PATCH] examples: Include alloca.h for strdupa + +musl defines strdupa via a macro which uses alloca() therefore include +the header to get the prototype + +Upstream-Status: Submitted [https://github.com/linux-rdma/rdma-core/pull/1212] +Signed-off-by: Khem Raj +--- + libibverbs/examples/asyncwatch.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libibverbs/examples/asyncwatch.c b/libibverbs/examples/asyncwatch.c +index 724796e58..842b94180 100644 +--- a/libibverbs/examples/asyncwatch.c ++++ b/libibverbs/examples/asyncwatch.c +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + #include + #include +-- +2.37.2 + diff --git a/meta-networking/recipes-support/rdma-core/rdma-core_42.0.bb b/meta-networking/recipes-support/rdma-core/rdma-core_42.0.bb index e1123dcc14..86243a52c5 100644 --- a/meta-networking/recipes-support/rdma-core/rdma-core_42.0.bb +++ b/meta-networking/recipes-support/rdma-core/rdma-core_42.0.bb @@ -5,7 +5,9 @@ SECTION = "libs" DEPENDS = "libnl" RDEPENDS:${PN} = "bash perl" -SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https" +SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https \ + file://0001-examples-Include-alloca.h-for-strdupa.patch \ + " SRCREV = "196bad56ed060612e22674b668b5ec3d8659ade3" S = "${WORKDIR}/git" From patchwork Tue Aug 30 07:14:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12112 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 F0476C0502A for ; Tue, 30 Aug 2022 07:14:42 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web10.8678.1661843666714321084 for ; Tue, 30 Aug 2022 00:14:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=eqK6ekmt; spf=pass (domain: gmail.com, ip: 209.85.214.176, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f176.google.com with SMTP id jm11so10228971plb.13 for ; Tue, 30 Aug 2022 00:14:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=zSDH60LIzHWsQ7Tt2pWBxvWc/p5R66sROf5LdTU3lQ0=; b=eqK6ekmt3VVCxPTgV/DwPxQqP2YYZzG35LsZHE4EKy6zASCSKIJEZIfdD1poakfOy6 sixBujmiMairfJpP3OB62L4WpUJr3VHj8VivLl8FgYWlvWcwW3ZSIeAAdsQyEl7KQSfe 4cxMrzo6/H1hIVKvBU/p6HcHVy+hSH0jp+IRh3p/q8wCVxvFfTz/3ExmzXNuuBa9wAzF 9S2r0iBNZHjAWhhqtX8qDoxKucBKlbfolYLnTVHxkQ6Wtde75sub+XM3QJ4XOq0KF6ay v7iADt+vXrG6B0Utv3r6VxoPx9Q3HfTk5ShOVmF0VJVtEDTwV4YIC58UFWXBdPdds0Rt 6R/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=zSDH60LIzHWsQ7Tt2pWBxvWc/p5R66sROf5LdTU3lQ0=; b=zyX3ohvdbb5yGs0P/mlJHM6oOxTe8LMZ1klKw+sCimse5IaiezHnr+jZkXSriNr4Nz HKdpa8XYUSjWMNQ0ObocuOtvZRswRK9V3WhtJwQzZWCtysA6CMHm6IJabeHx26lp6VTi XPYSJhzV46RcoKNtdzfcOQSWpXZ9TArJcLmiwGPuKhDgP0KhVLJCeGBGU9e9dCov5if0 y6f8J805EkI+SpMzMtN3f8RVJg08gtYXAvTHBbN2d5M6Oq4wU0T0QsDccradvYlVVbGP 3mmWJSd1lIQt4FmQQvWsPDub/9cmsdhdYuWAZ1P15Q53NhwMxn0MPEViBXpM1Bw/QabP +eiA== X-Gm-Message-State: ACgBeo1oeon+MCgRC3gjzUbYEn/KbapjNTS7JhZf/BaKDJ+qDARZ7pii sUBChEoFe3bOOyBksOm+87D91jbw2lWRzg== X-Google-Smtp-Source: AA6agR6MqcW8EBwAdUQHA2xoSLoxq7MzFZdsxJl4ARG35/YY0lOhMFh/I6C2g0frqe3naaDLCeuNJg== X-Received: by 2002:a17:903:2311:b0:174:7160:77e0 with SMTP id d17-20020a170903231100b00174716077e0mr14079959plh.154.1661843673677; Tue, 30 Aug 2022 00:14:33 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id z24-20020aa79f98000000b00537f9e32b00sm6041616pfr.37.2022.08.30.00.14.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 00:14:33 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 20/21] openl2tp: Provide prototype for l2tp_api_rpc_check_request Date: Tue, 30 Aug 2022 00:14:12 -0700 Message-Id: <20220830071413.3887189-20-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220830071413.3887189-1-raj.khem@gmail.com> References: <20220830071413.3887189-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 ; Tue, 30 Aug 2022 07:14:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98557 Signed-off-by: Khem Raj --- ...c-Add-missing-prototype-for-l2tp_api.patch | 28 ++++++++++++ ...yacc-Add-missing-function-prototypes.patch | 45 +++++++++++++++++++ .../openl2tp/openl2tp_1.8.bb | 2 + 3 files changed, 75 insertions(+) create mode 100644 meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_rpc_server.c-Add-missing-prototype-for-l2tp_api.patch create mode 100644 meta-networking/recipes-protocols/openl2tp/openl2tp/0001-lex-yacc-Add-missing-function-prototypes.patch diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_rpc_server.c-Add-missing-prototype-for-l2tp_api.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_rpc_server.c-Add-missing-prototype-for-l2tp_api.patch new file mode 100644 index 0000000000..d9aed8804a --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_rpc_server.c-Add-missing-prototype-for-l2tp_api.patch @@ -0,0 +1,28 @@ +From ded84ed583e9b0617bc35ab1798032d18b873144 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 29 Aug 2022 23:30:02 -0700 +Subject: [PATCH] l2tp_rpc_server.c: Add missing prototype for + l2tp_api_rpc_check_request + +Upstream-Status: Inappropriate [no upstream] + +Signed-off-by: Khem Raj +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index 0815b31..2fa5b2f 100644 +--- a/Makefile ++++ b/Makefile +@@ -236,6 +236,7 @@ endif + -$(RM) $@ $@.tmp + $(RPCGEN) $(RPCGENFLAGS) -m -o $@.tmp $< + cat $@.tmp | sed -e 's/switch (rqstp->rq_proc) {/if (l2tp_api_rpc_check_request(transp) < 0) return; switch (rqstp->rq_proc) {/' > $@ ++ sed -i '21i int l2tp_api_rpc_check_request(SVCXPRT *xprt);' $@ + + %_client.c: %.x + -$(RM) $@ +-- +2.37.2 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-lex-yacc-Add-missing-function-prototypes.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-lex-yacc-Add-missing-function-prototypes.patch new file mode 100644 index 0000000000..8c21a742e0 --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-lex-yacc-Add-missing-function-prototypes.patch @@ -0,0 +1,45 @@ +From 2bfdd02d288de92ff118bf41b54c135a6a318c19 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 29 Aug 2022 23:42:11 -0700 +Subject: [PATCH] lex/yacc: Add missing function prototypes + +Fixes build with clang15 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + l2tp_config_parse.y | 3 +++ + l2tp_config_token.l | 3 +++ + 2 files changed, 6 insertions(+) + +diff --git a/l2tp_config_parse.y b/l2tp_config_parse.y +index 4baf1e0..15392d0 100644 +--- a/l2tp_config_parse.y ++++ b/l2tp_config_parse.y +@@ -29,6 +29,9 @@ static struct l2tp_api_session_msg_data session; + + extern void l2tp_log(int level, char *fmt, ...); + extern void yyfatal(const char *s); ++extern const char *l2tp_strerror(int error); ++extern int yylex (void); ++extern void yyerror(const char *s); + + %} + +diff --git a/l2tp_config_token.l b/l2tp_config_token.l +index 9016af6..43b8f0a 100644 +--- a/l2tp_config_token.l ++++ b/l2tp_config_token.l +@@ -15,6 +15,9 @@ + #include "l2tp_config_types.h" + #include "l2tp_config_parse.h" + ++extern void l2tp_log(int level, char *fmt, ...); ++extern const char *l2tp_strerror(int error); ++ + void yyfatal(const char *s); + void yyerror(const char *s); + +-- +2.37.2 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb index 15cebf40f1..183c0066df 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb @@ -35,6 +35,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz \ file://run-ptest \ file://fix_linux_4.15_compile.patch \ file://0002-user-ipv6-structures.patch \ + file://0001-l2tp_rpc_server.c-Add-missing-prototype-for-l2tp_api.patch \ + file://0001-lex-yacc-Add-missing-function-prototypes.patch \ " SRC_URI[md5sum] = "e3d08dedfb9e6a9a1e24f6766f6dadd0" SRC_URI[sha256sum] = "1c97704d4b963a87fbc0e741668d4530933991515ae9ab0dffd11b5444f4860f" From patchwork Tue Aug 30 07:14:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 12113 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 F0449ECAAD8 for ; Tue, 30 Aug 2022 07:14:42 +0000 (UTC) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mx.groups.io with SMTP id smtpd.web12.8934.1661843675895366790 for ; Tue, 30 Aug 2022 00:14:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=UajWPhQg; spf=pass (domain: gmail.com, ip: 209.85.216.43, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f43.google.com with SMTP id l5so6372929pjy.5 for ; Tue, 30 Aug 2022 00:14:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=uc2RPKday3VTBSWW3I2ik3xQx9MLqNPZwladhttCwaw=; b=UajWPhQg+7YQODml6k7TMNuqdKUvMgpXS9uXT05o+k62eCb8mKn3hCt0s1S1Si6iyV Y+834XiDNxO/jELmX/ScN+HjpSRo9ExK0ZrKzHSIFiwgrs3DRsAE5hn1uY2iPLRf7yez 3bsABiogL/3CW2V5DWy1fzBC6Uqi1pQncUo/3fWVRrNriy6VSn/JsT76/sJFd6wP/v6+ fEZOrPC5kR0yASaW0MiFQTJ6nu5dnLliinVjJrQTX79wwUXj/HXlvhti2/2g0mrkhWhQ OD0axLmThDAsnvZDEGt0pCIExSqJ0YBl3uQumYgayTW7z3NLL19xzrenMBeYyy07J91V Ev3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=uc2RPKday3VTBSWW3I2ik3xQx9MLqNPZwladhttCwaw=; b=MnKs+rExV8u/kgHiqbWoVRtli078W6I2iL4ncwpPQpHRY5Pn0QvWarjY8QD1wp6GAB IrFWfGGjMc/jIIdRjTWKu9+DvuhBRVw5+3U0WmFj7nhPxd5mo+DbN9QkgMualSL+rXcj xZwP7JstrG8S+URNEsdvjR8q1yyZ6s9QVJbJb64lGkcR4wdrOw4SypIp69MlI9VnZDFx MnieViAQU21WtCOJhMv6DIkErBXJ1XL0dS0oqmWzIIXOpnKROo/jbJm282qqSArdOzod PWO5Hv/IN+Ek73gb5I2gh4lzPWXSVrp5b0rYwue0QuYGe1fLXeN8AY7/5ToZOjXRwFAX w5CQ== X-Gm-Message-State: ACgBeo1DJnV5KUZIdga+TVrdeCuitpUrxbSfj7h42UJxcVQefTtOwJav ZE1ac9Q+IBJt/rYqQdsQNVYqMuzhwYwduw== X-Google-Smtp-Source: AA6agR5jYw2XLdvnqNNIBNaGO9sqE4NsNoYblFlOh2lhnD339ZKzbIglIquz2/Ec1aBnH7QFhJDBdw== X-Received: by 2002:a17:902:b68d:b0:172:e973:82b9 with SMTP id c13-20020a170902b68d00b00172e97382b9mr20133777pls.120.1661843674599; Tue, 30 Aug 2022 00:14:34 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::24e6]) by smtp.gmail.com with ESMTPSA id z24-20020aa79f98000000b00537f9e32b00sm6041616pfr.37.2022.08.30.00.14.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 00:14:34 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 21/21] ot-daemon,ot-br-posix: Fix mbedtls module builds Date: Tue, 30 Aug 2022 00:14:13 -0700 Message-Id: <20220830071413.3887189-21-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220830071413.3887189-1-raj.khem@gmail.com> References: <20220830071413.3887189-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 ; Tue, 30 Aug 2022 07:14:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98558 Signed-off-by: Khem Raj --- .../openthread/ot-br-posix/mbedtls.patch | 43 +++++++++++++++++++ .../openthread/ot-br-posix_git.bb | 6 ++- .../openthread/ot-daemon/mbedtls.patch | 43 +++++++++++++++++++ .../openthread/ot-daemon_git.bb | 1 + 4 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 meta-networking/recipes-connectivity/openthread/ot-br-posix/mbedtls.patch create mode 100644 meta-networking/recipes-connectivity/openthread/ot-daemon/mbedtls.patch diff --git a/meta-networking/recipes-connectivity/openthread/ot-br-posix/mbedtls.patch b/meta-networking/recipes-connectivity/openthread/ot-br-posix/mbedtls.patch new file mode 100644 index 0000000000..91b3046484 --- /dev/null +++ b/meta-networking/recipes-connectivity/openthread/ot-br-posix/mbedtls.patch @@ -0,0 +1,43 @@ +mbedtls: Disable documentation warning as error with clang + +There are shortcomings with doxygen info which clang-15+ flags, dont +treat them as errors + +Remove unused variable + +Fixes +library/bignum.c:1395:29: error: variable 't' set but not used [-Werror,-Wunused-but-set-variable] + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- a/third_party/openthread/repo/third_party/mbedtls/repo/library/bignum.c ++++ b/third_party/openthread/repo/third_party/mbedtls/repo/library/bignum.c +@@ -1544,7 +1544,7 @@ __attribute__ ((noinline)) + #endif + void mpi_mul_hlp( size_t i, mbedtls_mpi_uint *s, mbedtls_mpi_uint *d, mbedtls_mpi_uint b ) + { +- mbedtls_mpi_uint c = 0, t = 0; ++ mbedtls_mpi_uint c = 0; + + #if defined(MULADDC_HUIT) + for( ; i >= 8; i -= 8 ) +@@ -1595,8 +1595,6 @@ void mpi_mul_hlp( size_t i, mbedtls_mpi_ + } + #endif /* MULADDC_HUIT */ + +- t++; +- + do { + *d += c; c = ( *d < c ); d++; + } +--- a/third_party/openthread/repo/third_party/mbedtls/repo/CMakeLists.txt ++++ b/third_party/openthread/repo/third_party/mbedtls/repo/CMakeLists.txt +@@ -192,7 +192,7 @@ if(CMAKE_COMPILER_IS_GNU) + endif(CMAKE_COMPILER_IS_GNU) + + if(CMAKE_COMPILER_IS_CLANG) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wno-error=documentation") + set(CMAKE_C_FLAGS_RELEASE "-O2") + set(CMAKE_C_FLAGS_DEBUG "-O0 -g3") + set(CMAKE_C_FLAGS_COVERAGE "-O0 -g3 --coverage") diff --git a/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb b/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb index a16b77849e..3d3c9bc0f2 100644 --- a/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb +++ b/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb @@ -17,14 +17,16 @@ PV = "0.3.0+git${SRCPV}" SRC_URI = "gitsm://github.com/openthread/ot-br-posix.git;protocol=https;branch=main \ file://0001-otbr-agent.service.in-remove-pre-exec-hook-for-mdns-.patch \ file://0001-cmake-Disable-nonnull-compare-warning-on-gcc.patch \ + file://mbedtls.patch \ " S = "${WORKDIR}/git" SYSTEMD_SERVICE:${PN} = "otbr-agent.service" inherit pkgconfig cmake systemd - -CXXFLAGS:append:libc-musl:toolchain-clang = " -Wno-error=sign-compare" +# openthread/repo/src/cli/cli.cpp:1786:18: fatal error: variable 'i' set but not used [-Wunused-but-set-variable] +# for (uint8_t i = 0;; i++) +CXXFLAGS:append:libc-musl:toolchain-clang = " -Wno-error=sign-compare -Wno-error=unused-but-set-variable" EXTRA_OECMAKE = "-DBUILD_TESTING=OFF \ -DOTBR_DBUS=ON \ diff --git a/meta-networking/recipes-connectivity/openthread/ot-daemon/mbedtls.patch b/meta-networking/recipes-connectivity/openthread/ot-daemon/mbedtls.patch new file mode 100644 index 0000000000..be26a20dad --- /dev/null +++ b/meta-networking/recipes-connectivity/openthread/ot-daemon/mbedtls.patch @@ -0,0 +1,43 @@ +mbedtls: Disable documentation warning as error with clang + +There are shortcomings with doxygen info which clang-15+ flags, dont +treat them as errors + +Remove unused variable + +Fixes +library/bignum.c:1395:29: error: variable 't' set but not used [-Werror,-Wunused-but-set-variable] + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- a/third_party/mbedtls/repo/library/bignum.c ++++ b/third_party/mbedtls/repo/library/bignum.c +@@ -1544,7 +1544,7 @@ __attribute__ ((noinline)) + #endif + void mpi_mul_hlp( size_t i, mbedtls_mpi_uint *s, mbedtls_mpi_uint *d, mbedtls_mpi_uint b ) + { +- mbedtls_mpi_uint c = 0, t = 0; ++ mbedtls_mpi_uint c = 0; + + #if defined(MULADDC_HUIT) + for( ; i >= 8; i -= 8 ) +@@ -1595,8 +1595,6 @@ void mpi_mul_hlp( size_t i, mbedtls_mpi_ + } + #endif /* MULADDC_HUIT */ + +- t++; +- + do { + *d += c; c = ( *d < c ); d++; + } +--- a/third_party/mbedtls/repo/CMakeLists.txt ++++ b/third_party/mbedtls/repo/CMakeLists.txt +@@ -192,7 +192,7 @@ if(CMAKE_COMPILER_IS_GNU) + endif(CMAKE_COMPILER_IS_GNU) + + if(CMAKE_COMPILER_IS_CLANG) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wno-error=documentation") + set(CMAKE_C_FLAGS_RELEASE "-O2") + set(CMAKE_C_FLAGS_DEBUG "-O0 -g3") + set(CMAKE_C_FLAGS_COVERAGE "-O0 -g3 --coverage") diff --git a/meta-networking/recipes-connectivity/openthread/ot-daemon_git.bb b/meta-networking/recipes-connectivity/openthread/ot-daemon_git.bb index f3f4c70fa2..1063b5bd42 100644 --- a/meta-networking/recipes-connectivity/openthread/ot-daemon_git.bb +++ b/meta-networking/recipes-connectivity/openthread/ot-daemon_git.bb @@ -12,6 +12,7 @@ SRCREV = "7dfde1f12923f03c9680be4d838b94b7a2320324" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openthread/openthread.git;protocol=https;branch=main \ + file://mbedtls.patch \ " S = "${WORKDIR}/git"