From patchwork Sun Apr 24 03:09: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: 7105 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 BC393C35295 for ; Mon, 25 Apr 2022 19:26:11 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web10.13949.1650769807276227272 for ; Sat, 23 Apr 2022 20:10:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=G2qb5oN/; spf=pass (domain: gmail.com, ip: 209.85.214.174, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f174.google.com with SMTP id s14so19543509plk.8 for ; Sat, 23 Apr 2022 20:10:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=v3gWdXp2SUN5tUeF7cWHLjk1cSL+/tArXTLbGXK0XtE=; b=G2qb5oN/W4UVWYRYDvn8WmrKji7q38bHtfOyjrxkb26xh7rJnH3pe7oxevx4O+e3Ta z3IwWWwPdMfY5u12k9Y5e9E59obw2YyEGQZanQxZb+YqfToQB+rtJ7on18RL0XTq7VY4 mIu1hHoIhjXxxgSFaTpVlGqmycWIIeyMqIVETtdT0QQmLW5767l+1SEzzhTz9MEQLu9e TlfOB6fJKjzju7NNiz/g7kXTPHIUU0hkReawqnKmEE861vdZrnOMm4Atb/C7zCq//Azp MMn7RoZpimGJBxF9bjdApFeWspBIgBL4Pnygo8eKJrfVScLDb47wZZeCjcLjOFqRfBZo /dWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=v3gWdXp2SUN5tUeF7cWHLjk1cSL+/tArXTLbGXK0XtE=; b=DWvyuqbMeh0wsdBALcmGx47pYg20uu5xh47bRxBo08zz57eJoo7PCo42rrCZYFlkSY k9Ax/iMhahVZ5XNo3c7LAqg7N2OGGZXBO2oa5b5u2CImJITo55JXHbhSrt8BlEC2Oj73 sO6ufYDeh+XUB2o0ShEM1Lr7bFtAlW3idaS2tH+wgp/3Emh7XYY4liwHeagXVIesRhbJ TptBINmDQUALv4ev2lUb4/Csm30TUuHsC9LXnitewfQ7HBf1HeipIQWZD3FGsO4xzOGF pV/VfeKHNZW2p/dQ3QGAru09vmFRHXhvX9QjfjqYhd51M34kG8w6cjefftvThXiGjIB6 e9/g== X-Gm-Message-State: AOAM531WeU/fB3NoaMczMnGVd2lnx7t5hT7Wjj3z4sK4zNlvNg6sg9l2 O2FXG6MUQbL2VS9GMlFDzfNDGoa5p2NwLQ== X-Google-Smtp-Source: ABdhPJymD7I683P7uXctSMBdXAx8IrAhYYoIEwTNPbfG/q00b3AZWbw4j9MWf7iqxaG/wgVkXP2m3w== X-Received: by 2002:a17:902:bf07:b0:158:d334:852f with SMTP id bi7-20020a170902bf0700b00158d334852fmr11821262plb.136.1650769806609; Sat, 23 Apr 2022 20:10:06 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::2ca3]) by smtp.gmail.com with ESMTPSA id q13-20020a17090a2e0d00b001cd4989feebsm10630987pjd.55.2022.04.23.20.10.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Apr 2022 20:10:06 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 01/12] tcsh: Do not install symlinks into /bin with usrmerge Date: Sat, 23 Apr 2022 20:09:53 -0700 Message-Id: <20220424031004.3209576-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.36.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 25 Apr 2022 19:26:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96738 Signed-off-by: Khem Raj --- meta-oe/recipes-shells/tcsh/tcsh_6.22.04.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-shells/tcsh/tcsh_6.22.04.bb b/meta-oe/recipes-shells/tcsh/tcsh_6.22.04.bb index c4da5cd835..f7282bf1fd 100644 --- a/meta-oe/recipes-shells/tcsh/tcsh_6.22.04.bb +++ b/meta-oe/recipes-shells/tcsh/tcsh_6.22.04.bb @@ -27,8 +27,10 @@ do_install:append () { oe_runmake install.man DESTDIR=${D} install -d ${D}${base_bindir} - ln -s /usr/bin/tcsh ${D}${base_bindir}/tcsh - ln -s /usr/bin/tcsh ${D}${base_bindir}/csh + if ! ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then + ln -s /usr/bin/tcsh ${D}${base_bindir}/tcsh + ln -s /usr/bin/tcsh ${D}${base_bindir}/csh + fi install -d ${D}${sysconfdir}/csh/login.d install -m 0644 ${S}/csh.cshrc ${S}/csh.login ${S}/csh.logout ${S}/complete.tcsh ${D}${sysconfdir} install -D -m 0644 ${S}/csh-mode.el ${D}${datadir}/emacs/site-lisp/csh-mode.el From patchwork Sun Apr 24 03:09: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: 7107 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 C7BEBC4707F for ; Mon, 25 Apr 2022 19:26:11 +0000 (UTC) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mx.groups.io with SMTP id smtpd.web12.13895.1650769808245399468 for ; Sat, 23 Apr 2022 20:10:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=HMsbeFWP; spf=pass (domain: gmail.com, ip: 209.85.215.177, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f177.google.com with SMTP id q12so10550431pgj.13 for ; Sat, 23 Apr 2022 20:10:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aQPJO5XYE+Hvea+RD9RjmLZRhHoyVvKlrCe5EhDTwKI=; b=HMsbeFWPg17zM0E7KRt04J11JrzffqAD37FuwKc2N8Iut2RHBvpFbGS8FBlNz4aane DYNrFJR+x6AVY1RRg4weplQSpdMN8Zg27daJJ7+FQiMF+iJQElvcp098EbHdnQTZseDE owAU50O/ZwpoWt75fCiW/WMYpMdCHxWSpVeUKlZYLl6UD/zldRGShgYD1EUAIokW0pKD UJtQyN22tPJ8weFLyKAlTXOzjRa0feRd1GhWs3Pcf6cJjJoOJM6F9xIUyRqZ6H5UU1ly 1BffjAVigYl4YiG2NLuUkHfjf5H5HMtXg4t1iAf+hPRM1MojyVcCZllIRU3ErHFe13tI II8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aQPJO5XYE+Hvea+RD9RjmLZRhHoyVvKlrCe5EhDTwKI=; b=UiWltsbsBQK2zgWAheGR+JLKG0p0Hm4h9kdLzImsZrXnyyiHbyR73MpPOXovVLn02J f+VcxRV9mZadhniuDLktNkSUOvaQv2xBO/pBuAEMvUVD6oYKpZhWTvdeFKQ7ox9U0QZy cxIXeijEFpRHVKTgpsL3IlckYayiyYKtUkb4p0CytvH2Qj36oZb9lVqLJySHZOAe9RVc BJpA7GfhCNgV6UQ7FYc5fIhcSFAKEpLop2G+ngaecze6mskXracokWKrwE6NawBxTxYq Awj1MXgCx0XWZfC5SDYzJSy90fck8ZaAwf24X6oNpPV9iakxteN0a+OcBykzIFBuMr/4 uUYQ== X-Gm-Message-State: AOAM5335vj0P2gZfWg5wXxJUxu50kEy3FMofK724CEJlSnpY7p3Wuj5n Ia1Eggj58Ud/8rQR+2gt8qy2Frr9Bj94+w== X-Google-Smtp-Source: ABdhPJxrlA0C3aD4sVx/jBPuQz2AOY6rMadvd5LkHmDwBu+rbNgRP6jbVv87DZULQVYClwXrpe+8JQ== X-Received: by 2002:a63:5c60:0:b0:3a2:2f11:93fb with SMTP id n32-20020a635c60000000b003a22f1193fbmr9740159pgm.230.1650769807482; Sat, 23 Apr 2022 20:10:07 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::2ca3]) by smtp.gmail.com with ESMTPSA id q13-20020a17090a2e0d00b001cd4989feebsm10630987pjd.55.2022.04.23.20.10.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Apr 2022 20:10:07 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 02/12] arno-iptables-firewall: Do not use bitbake variable inside S Date: Sat, 23 Apr 2022 20:09:54 -0700 Message-Id: <20220424031004.3209576-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220424031004.3209576-1-raj.khem@gmail.com> References: <20220424031004.3209576-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 ; Mon, 25 Apr 2022 19:26:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96739 Location of file inside sourcedir fixed but bitbake variable systemd_unitdir varies depending on usrmerge feature hence can not be used here Signed-off-by: Khem Raj --- .../arno-iptables-firewall/arno-iptables-firewall_2.1.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.1.bb b/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.1.bb index bba11a8c64..e124fd2906 100644 --- a/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.1.bb +++ b/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.1.bb @@ -20,7 +20,7 @@ do_install() { install -m 0755 ${S}/bin/arno-fwfilter ${D}${bindir} cp -r ${S}/share/arno-iptables-firewall/* ${D}${datadir}/arno-iptables-firewall cp -r ${S}/etc/arno-iptables-firewall/* ${D}${sysconfdir}/arno-iptables-firewall - install -m 0644 ${S}/${systemd_unitdir}/system/arno-iptables-firewall.service ${D}${systemd_unitdir}/system + install -m 0644 ${S}/lib/systemd/system/arno-iptables-firewall.service ${D}${systemd_unitdir}/system sed -i -e 's%/usr/local/sbin%${bindir}%g' ${D}${systemd_unitdir}/system/arno-iptables-firewall.service sed -i -e 's%/usr/local/sbin%${sbindir}%g' ${D}${bindir}/arno-iptables-firewall sed -i -e 's%/usr/local%${exec_prefix}%g' ${D}${sysconfdir}/arno-iptables-firewall/firewall.conf From patchwork Sun Apr 24 03:09: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: 7113 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 C94EEC47080 for ; Mon, 25 Apr 2022 19:26:11 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web09.14270.1650769809247807235 for ; Sat, 23 Apr 2022 20:10:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=FR/6Ju0R; spf=pass (domain: gmail.com, ip: 209.85.210.180, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f180.google.com with SMTP id j17so11727131pfi.9 for ; Sat, 23 Apr 2022 20:10:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1iZTeCrHE9SocaQ61F7S0u3gTxC6HxMZ2UxL9wziKDo=; b=FR/6Ju0RPRuAixBcgabZTs0Et7T0BA5BKADpkZ66c8nuiDVgiYeD7hFrPoybbLM+8P 50Ygn8qS361k1otHgDUelAuvCygun7xJNPypaMGea2ZmOSposkQdaaugrpVhjLkWFlcM 0twi1SuFuFMv6z5Y3Unydb94YcE1/+l1C5ccd4MNYZ2fyQhixQdWoIKBh163JjJFC020 dwORYhk2td3OjTQ8nxa5iYGoy7U4QfncM2Zn4QilQjIAGxSPaxTB7LxeZO8MwqdyUCHf FBT9YstUFVmpSRzjp/81qlkImjBbsBGiL6D8gzjF0augr+VxFxSDUP5OqB/H3P1tZkAe C9+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1iZTeCrHE9SocaQ61F7S0u3gTxC6HxMZ2UxL9wziKDo=; b=79rvB4CP+Qyi5I9SxMZLiN0sy4iteiBntlyvPuK5xiAPZTpBBpdGjXQbqxfrDqEkab H1K8DgfDFyIRiAYrQV/PfdeKtIsUjTGM8KebfCYCplO9Ir6JyCdwz/hlwygjz46dU2Re XSOigJzuMBBhWmnKXYZxVjlXVt9PLc2Y7ciWn6aimv+bmys4dwJZ0hIReQKgOjKLU9I1 aWIMY80OFwqE4u6gD5EL9r3Iur5K3bKR0GxSRuiR6eGKhQ9C7l/4cKMAgT2o1Oaa0z3N fF2zutxePi706ZImt+qtTfKIaHK6z+eJVrk7P7C/me6kx1/wCH7QYzRNlxnZeoOSVQzq caWQ== X-Gm-Message-State: AOAM533ynydrPLc5y7yStuvOWhENz0cEIiRedrKmHLMUxQmTaIDVMrXO 7bLQn3JfsRp4AzWhmagKA8/wqkBNyz1BOQ== X-Google-Smtp-Source: ABdhPJxtwxUPSNsEgLY5POHlao5YAuGWWtZnIOC4mO5xr2KaUSzdVavOS5O0VlcKknh0GbmRGDn1Ug== X-Received: by 2002:a63:101:0:b0:3aa:b7e9:6708 with SMTP id 1-20020a630101000000b003aab7e96708mr9992310pgb.111.1650769808528; Sat, 23 Apr 2022 20:10:08 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::2ca3]) by smtp.gmail.com with ESMTPSA id q13-20020a17090a2e0d00b001cd4989feebsm10630987pjd.55.2022.04.23.20.10.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Apr 2022 20:10:07 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 03/12] boinc-client: Do not overwrite same file when using usrmerge Date: Sat, 23 Apr 2022 20:09:55 -0700 Message-Id: <20220424031004.3209576-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220424031004.3209576-1-raj.khem@gmail.com> References: <20220424031004.3209576-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 ; Mon, 25 Apr 2022 19:26:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96740 in case usrmerge is enabled, unit file is already in expected location Signed-off-by: Khem Raj --- meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb b/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb index 5e991d3099..abcb304d30 100644 --- a/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb +++ b/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb @@ -76,7 +76,8 @@ do_compile:prepend () { } do_install:append() { - if [ -e ${D}${nonarch_libdir}/systemd/system/boinc-client.service ]; then + if ! ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)} -a \ + -e ${D}${nonarch_libdir}/systemd/system/boinc-client.service; then install -d ${D}${systemd_system_unitdir} mv \ ${D}${nonarch_libdir}/systemd/system/boinc-client.service \ From patchwork Sun Apr 24 03:09: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: 7106 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 C760AC352A1 for ; Mon, 25 Apr 2022 19:26:11 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web12.13896.1650769810297443447 for ; Sat, 23 Apr 2022 20:10:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=A2Lqimsu; spf=pass (domain: gmail.com, ip: 209.85.214.172, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f172.google.com with SMTP id s17so19562683plg.9 for ; Sat, 23 Apr 2022 20:10:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6lEILUSqKiF1nRtedt+RSsVwkpSi6CY+9Iyrn9PDXO4=; b=A2Lqimsu5FfFArr6v3oSc3SUIoER2xe76AMZ5SmlBisCQOkRLS8anNFOMJlYPA0dIU 0Onmaf9rUHyiwY26WZ/LNtKYMSiKq0m5RojtQxcHyPJ54ZwZzJOHRk8h6pP7kRH3gnG5 tSlsrzgKAzeztXujwVJGPt2K7WzN2WdTwnsoo0vgtLVSPSXks96ZvjsQQ9DQ4HqoMtjy Pq0837+bOg8pWG0mCsOwFjVQ9KjRK86lEqDvdL+HZx3gzToXY6xEECXuN3W0ImoSswSB Pe/BPXRWO4CbnSOr4nunTAlnyGiBI0DZnNY7Thrle7SU736aSrboJt4bY7Ppwm6SEUfY euvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6lEILUSqKiF1nRtedt+RSsVwkpSi6CY+9Iyrn9PDXO4=; b=6WYYuoimOWVv9oxIz5vCCInqhWFn7UWMtdpXxEgqu/S+s+rhaibiKkr5Ug1gMJkxrA sK1l1nbkNOSiO/dqWC+1Xd+s2WsJ30g9eDYlbMIClIms+Vslnq9ZxvLZrt5oXqmmcee8 fIhPcsDQciCphOaSqjfQW7YIWu50/A5pONeiqbvJFeeT7qiwt7l8Ua0KOR0QBDhW7s8y bfTqUY2tbKAHoR1mXvA4ubFdE1t7Q8DHwbsbZKTmHlElmq+U9672/rUCf2Qe2zIVQMqW XTm3WPuIch78l96KvrjJBXH1kN9uJd/ZsVIyjRoB7AmvjrYRJPeUaHhOVBG1HkshnARU aKvQ== X-Gm-Message-State: AOAM530rORWa0KdmtPKKcq1HtswmlEo3hlMFlQjDfcIlVKXd942dkZRs u+677BlCwEblexuA4WeKkpL4RS79zNPNHw== X-Google-Smtp-Source: ABdhPJwY96xoX3yKcd0LMZqPN0LndT9hEDcFShX9ETXZd91cVMz4xI+92ySyvZUaGJnLCA/JKIW0SA== X-Received: by 2002:a17:902:8f86:b0:15b:4dfa:ba7b with SMTP id z6-20020a1709028f8600b0015b4dfaba7bmr11825383plo.43.1650769809594; Sat, 23 Apr 2022 20:10:09 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::2ca3]) by smtp.gmail.com with ESMTPSA id q13-20020a17090a2e0d00b001cd4989feebsm10630987pjd.55.2022.04.23.20.10.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Apr 2022 20:10:09 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 04/12] fluentbit: Fix build with usrmerge distro feature Date: Sat, 23 Apr 2022 20:09:56 -0700 Message-Id: <20220424031004.3209576-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220424031004.3209576-1-raj.khem@gmail.com> References: <20220424031004.3209576-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 ; Mon, 25 Apr 2022 19:26:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96741 Signed-off-by: Khem Raj --- ...nit-install-location-with-SYSTEM_DIR.patch | 28 +++++++++++++++++++ .../fluentbit/fluentbit_1.3.5.bb | 3 +- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/0001-Control-sytemd-unit-install-location-with-SYSTEM_DIR.patch diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Control-sytemd-unit-install-location-with-SYSTEM_DIR.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Control-sytemd-unit-install-location-with-SYSTEM_DIR.patch new file mode 100644 index 0000000000..b90a62ef19 --- /dev/null +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Control-sytemd-unit-install-location-with-SYSTEM_DIR.patch @@ -0,0 +1,28 @@ +From 5571f949fa2048b79c197b5b10a11ecb1891cbe9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 23 Apr 2022 08:24:34 -0700 +Subject: [PATCH] Control sytemd unit install location with SYSTEM_DIR + +This helps building when usrmerge is on + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -323,7 +323,11 @@ if(FLB_BINARY) + "${PROJECT_SOURCE_DIR}/init/systemd.in" + ${FLB_SYSTEMD_SCRIPT} + ) +- install(FILES ${FLB_SYSTEMD_SCRIPT} DESTINATION /lib/systemd/system) ++ if(SYSTEMD_DIR) ++ install(FILES ${FLB_SYSTEMD_SCRIPT} DESTINATION ${SYSTEMD_DIR}) ++ else() ++ install(FILES ${FLB_SYSTEMD_SCRIPT} DESTINATION /lib/systemd/system) ++ endif() + install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR}) + elseif(IS_DIRECTORY /usr/share/upstart OR FLB_UPSTART) + set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf") diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb index 670d596cad..2dd5db0580 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb @@ -18,6 +18,7 @@ SRC_URI = "http://fluentbit.io/releases/1.3/fluent-bit-${PV}.tar.gz \ file://0001-ppc-Fix-signature-for-co_create-API.patch \ file://0001-bin-fix-SIGSEGV-caused-by-using-flb_free-instead-of-.patch \ file://0002-parser-Fix-SIGSEGV-caused-by-using-flb_free-instead-.patch \ + file://0001-Control-sytemd-unit-install-location-with-SYSTEM_DIR.patch \ " SRC_URI[md5sum] = "6eae6dfd0a874e5dd270c36e9c68f747" SRC_URI[sha256sum] = "e037c76c89269c8dc4027a08e442fefd2751b0f1e0f9c38f9a4b12d781a9c789" @@ -47,7 +48,7 @@ EXTRA_OECMAKE += "-DFLB_LUAJIT=Off -DFLB_FILTER_LUA=Off " # Disable Library and examples EXTRA_OECMAKE += "-DFLB_SHARED_LIB=Off -DFLB_EXAMPLES=Off " -EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES','systemd','-DFLB_SYSTEMD=On','',d)}" +EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES','systemd','-DFLB_SYSTEMD=On -DSYSTEMD_DIR=\${systemd_system_unitdir}','',d)}" EXTRA_OECMAKE:append:riscv64 = " -DFLB_DEPS='atomic'" EXTRA_OECMAKE:append:riscv32 = " -DFLB_DEPS='atomic'" From patchwork Sun Apr 24 03:09: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: 7108 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 D28F9C47082 for ; Mon, 25 Apr 2022 19:26:11 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web10.13950.1650769811202870441 for ; Sat, 23 Apr 2022 20:10:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=mhnUP2gC; spf=pass (domain: gmail.com, ip: 209.85.210.180, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f180.google.com with SMTP id a15so11718187pfv.11 for ; Sat, 23 Apr 2022 20:10:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=derKOZKQRFIOOyOR83RT98ddZQNhk1wQafq9UdHV3x4=; b=mhnUP2gC44B/Prrf0dNtZy5nN8q9HwJq4We0SWLAZ0xznyCc9pAkeHs0g//pEyESPY V9TztmyUWZP7bvsDzFsKD38AAQTVWxG1a75gF1tTv2X34p/t7v9+rer1nRsglvjITg1V LUbF2iItRzlLvrYFwklTqSnFmQI0wa9tyw/Op+N9sX3BUspInQqmx2/wlEPqmOOQWZUz ISPIzV/D9FVcVzKMc82rl0qXNZW6Vyc0HgwNp+3Sjs1nOxY+SVrJwrPC63V72gi2XM0q K0KAMiMsh6y4g/riL+XrgpVf/SC/ourlEvIyPYsm7EWe6lhFth0bDnyiBdYCSog2cgpq AsRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=derKOZKQRFIOOyOR83RT98ddZQNhk1wQafq9UdHV3x4=; b=lhvN/BC39ug4SA5kTHt964cZ2kqkP5CooFP+XUUC4Pk/82l5Lb9OyegCGHdmkmwZTY PodWNux9JsaHp2EzUIcGqZi4GuTCzB+i++/p2zkdKzoZmShYc50LBu1FJZbMFfHPSvFb Oy4+KT2ZQZq9ByuAcewo2aDHcw14wkARE64SmglbxPtXbq506jD5m/yUzP6OF53T3We1 RGbQrVxgGRYjC95FdYNChMaAHKRI8z7X0HgGJH+1Xor0DNRBL+g/kkdb4IIsgN6skYR9 vMhu5C6Bi93bArFYvqQaEvxLZ8MeL1JQMrQJi7SC7cU8mef3DfFCKM4fpFKy2GiQuPBp Auug== X-Gm-Message-State: AOAM532gB1uFbCcocIWsvHdxvNOqkEcb8E04Tledkl946mSMPX+xz5f/ iui5ShoQg3s7heZZhflzaAc3B0NmYaLGbQ== X-Google-Smtp-Source: ABdhPJwVdcWIb9LF2/9DyONN2BGrOaNGUaouT2qtepzB0WMjUa6ENiwJuqBmvxlXkuEhJGVMKMLQAQ== X-Received: by 2002:a63:6886:0:b0:3aa:9204:d1eb with SMTP id d128-20020a636886000000b003aa9204d1ebmr10036015pgc.63.1650769810456; Sat, 23 Apr 2022 20:10:10 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::2ca3]) by smtp.gmail.com with ESMTPSA id q13-20020a17090a2e0d00b001cd4989feebsm10630987pjd.55.2022.04.23.20.10.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Apr 2022 20:10:10 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 05/12] tomoyo-tools: Define SBINDIR Date: Sat, 23 Apr 2022 20:09:57 -0700 Message-Id: <20220424031004.3209576-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220424031004.3209576-1-raj.khem@gmail.com> References: <20220424031004.3209576-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 ; Mon, 25 Apr 2022 19:26:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96742 default SBINDIR is hardcoded to /sbin which does not work when using usrmerge Signed-off-by: Khem Raj --- meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.5.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.5.0.bb b/meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.5.0.bb index a1c4cc9eb9..d9f09d1744 100644 --- a/meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.5.0.bb +++ b/meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.5.0.bb @@ -26,5 +26,5 @@ do_compile () { } do_install() { - oe_runmake install INSTALLDIR=${D} + oe_runmake install SBINDIR=${base_sbindir} INSTALLDIR=${D} } From patchwork Sun Apr 24 03:09: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: 7118 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 D1EBAC352A7 for ; Mon, 25 Apr 2022 19:26:11 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web11.13887.1650769811971140392 for ; Sat, 23 Apr 2022 20:10:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=hQ3QMwKy; spf=pass (domain: gmail.com, ip: 209.85.214.173, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f173.google.com with SMTP id c23so19603128plo.0 for ; Sat, 23 Apr 2022 20:10:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yJetwtPLbsw4QzF0XmgLTPoB/gh4RnPYzykVNWXGur0=; b=hQ3QMwKytcOOHABVDYe0S6F1ChwQYoWs7x/95X8YqhyO1BTKBBrO034CovDM2Gudqe bBAR50jQO/6oK/dX96tShFzMeYw7EZD8L3wO/VNKU1BFgyJ/y6J66aUvC6QqeUlMFAmH fVRsTlfVrOUQoMmTgnxtNgEAVfEUtK0u/6c/X+p7qg0gnxHi/aksYEli16w/A0C+VHOU JPDCeVkl6S6MuD0SC152lahpO3v5zW6OJWCI1Ak/gN32YfR7xfsUu4yrwciiNZCExEok d5BbR9trHKbYtji6udscmkoPgrKGD08tG/OSF+cVNVXmHzcTaKo41Uv8F/ELUT2vlnkm GQGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yJetwtPLbsw4QzF0XmgLTPoB/gh4RnPYzykVNWXGur0=; b=iCr8VF0ohFXfPcW0sl6BpbFKxKMx2Y14obXIxBJCHIHSneoDEpyKZ0BlVQCOZj+Onk uUd34gTszr+uMfScDgr03whEFB1fBu+8Kk8zBDQrY+14JfKeGfNU1bj8QA6dXrjD+ByA AYJ7sKmaPaD23nud9h9FeWRWURgem0muTh+JfKKqyQb5hSwd0D3dpVV/AUS0D9LEHwws owFbfEpfIHhaxvAbWSgCCPefXJwmpTLxd6IA6FGOOMv4/3ouQS9dtBwP/V/B3iZvPXpi egqEAYZLa8+l6ZtAT5xpZRN5He31LYjJnvZdJdpm6DdXkde2Byi39o2E6HlAGTBt7xbP BxeA== X-Gm-Message-State: AOAM530PhMJm0jeWwolKQO5SbN8whY6ZZvauht70x5dxC7s3hEyihwSQ 8KGWLwcHK4gcdUCkW2Vk7fHAvc8xiuWetQ== X-Google-Smtp-Source: ABdhPJzxeuXExgDzbCErZ20FYrjohAiTDNjxa/yNytKOp+59BZVuwDE+9/GQ/W0LvONaLZ3dKJ4rtA== X-Received: by 2002:a17:903:124a:b0:154:c860:6d52 with SMTP id u10-20020a170903124a00b00154c8606d52mr11788441plh.159.1650769811335; Sat, 23 Apr 2022 20:10:11 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::2ca3]) by smtp.gmail.com with ESMTPSA id q13-20020a17090a2e0d00b001cd4989feebsm10630987pjd.55.2022.04.23.20.10.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Apr 2022 20:10:10 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 06/12] tomoyo-tools: Drop md5sum Date: Sat, 23 Apr 2022 20:09:58 -0700 Message-Id: <20220424031004.3209576-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220424031004.3209576-1-raj.khem@gmail.com> References: <20220424031004.3209576-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 ; Mon, 25 Apr 2022 19:26:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96743 Signed-off-by: Khem Raj --- meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.5.0.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.5.0.bb b/meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.5.0.bb index d9f09d1744..2fcdb6bd61 100644 --- a/meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.5.0.bb +++ b/meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.5.0.bb @@ -6,7 +6,6 @@ HOMEPAGE = "http://tomoyo.sourceforge.jp/" SECTION = "System Environment/Kernel" SRC_URI = "http://jaist.dl.sourceforge.jp/tomoyo/53357/${BP}-20170102.tar.gz" -SRC_URI[md5sum] = "888804d58742452fe213a68f7eadd0ad" SRC_URI[sha256sum] = "00fedfac5e514321250bbe69eaccc732c8a8158596f77a785c2e3ae9f9968283" S = "${WORKDIR}/${BPN}" From patchwork Sun Apr 24 03:09: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: 7112 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 D2875C47081 for ; Mon, 25 Apr 2022 19:26:11 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web09.14271.1650769812980967757 for ; Sat, 23 Apr 2022 20:10:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=XfJ/iTvE; spf=pass (domain: gmail.com, ip: 209.85.214.177, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f177.google.com with SMTP id h12so15874023plf.12 for ; Sat, 23 Apr 2022 20:10:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LdQ0EqP+XjLgxxc/2wClxNbGZ/o+tXdM2koIYfM3eYI=; b=XfJ/iTvEgDW+RDyb4wqt0BTHTlZy/Kcyjhqt4CA9TchX2DdMNFVjGeVtJgj56w2jlG 9s9kKNyqn6dZFbJoiaAeuqwl5mdYUMO5Wba8reDKxx3FrnwFKkd6d4ya1IzQ3RJkQdQc k7U51rnRYSZ0fjAiYOWRfmmGQAdMcF+sEYAOdNY46Hcnoe8/dYXNseDwiUDOzp3vSYRi 88CWy3guuFFYpaS0DMerEUpjuEKZokboI8D1BIIpbezeHNLka1JSWtSvrk5ECnM561XM DvPXZmX9ofBX3rH3+WtPRPkUaw3JFYltAajVGvSCYWcMcTkLKwyq3RSFJ8MS5rJy0vb3 HyJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LdQ0EqP+XjLgxxc/2wClxNbGZ/o+tXdM2koIYfM3eYI=; b=R0//y66P6e1tfje/lU9UJcugfO9F/dh/xbLzf2gaZNTE3CQKIAt4HZVwbrqyujlR3Y 7chZHnZcSo5zK5/RNX4MimYC/rPT1fZnhUkdRdvu88k/OLWOXKoPWek7AvwR5UPqJ2Ar 7GU8HUP43STbrNNNJ4Y+DKXIsAOGdFp3I5frtdno00HtsAcD6yL2IvhaBL/3Ry/l7AxB 33K1fvBWohkyCA0ZSaVZW66MWLwxeffWYOtOGlqJmIgDDiSkUopQ9pLperBL/kV+uW+Y CxcqkFfzgcyn/Qubrigmp+47LEW+i50ECtEEoQqbhsAazDEWqv8zUdqxHdcMzqRJ+duw ISGA== X-Gm-Message-State: AOAM5315d+pOVSEq0gbLTEyJKbgKUUs6kea8yMw0lyGifbRQSVY3U3m9 IKMw3BseBsv+VIQikgX2dyrwoFyiNrF7nA== X-Google-Smtp-Source: ABdhPJx75nxhVxShU5DSa9nwNjmT8Uu2D1t84LMehWBJZAbYSO9cmPLjqtsoLrIT+wk5GY89EGehUQ== X-Received: by 2002:a17:902:b092:b0:156:a40f:f716 with SMTP id p18-20020a170902b09200b00156a40ff716mr11907133plr.72.1650769812295; Sat, 23 Apr 2022 20:10:12 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::2ca3]) by smtp.gmail.com with ESMTPSA id q13-20020a17090a2e0d00b001cd4989feebsm10630987pjd.55.2022.04.23.20.10.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Apr 2022 20:10:11 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 07/12] gradm: Upgrade to 3.1-202111052217 Date: Sat, 23 Apr 2022 20:09:59 -0700 Message-Id: <20220424031004.3209576-7-raj.khem@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220424031004.3209576-1-raj.khem@gmail.com> References: <20220424031004.3209576-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 ; Mon, 25 Apr 2022 19:26:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96744 Fix build when using usrmerge distro features Signed-off-by: Khem Raj --- .../gradm/0001-make-Define-SBINDIR-flag.patch | 69 +++++++++++++++++++ ...903191516.bb => gradm_3.1-202111052217.bb} | 5 +- 2 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-support/gradm/gradm/0001-make-Define-SBINDIR-flag.patch rename meta-oe/recipes-support/gradm/{gradm_3.1-201903191516.bb => gradm_3.1-202111052217.bb} (90%) diff --git a/meta-oe/recipes-support/gradm/gradm/0001-make-Define-SBINDIR-flag.patch b/meta-oe/recipes-support/gradm/gradm/0001-make-Define-SBINDIR-flag.patch new file mode 100644 index 0000000000..1c0f3bfbae --- /dev/null +++ b/meta-oe/recipes-support/gradm/gradm/0001-make-Define-SBINDIR-flag.patch @@ -0,0 +1,69 @@ +From 12bc62ac26df012fc143913b6e046a3cf5127db2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 23 Apr 2022 09:20:49 -0700 +Subject: [PATCH] make: Define SBINDIR flag + +Provides a facility to control install locations of /sbin elements from +environment + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + Makefile | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +diff --git a/Makefile b/Makefile +index deed94c..9190fe9 100644 +--- a/Makefile ++++ b/Makefile +@@ -25,6 +25,7 @@ MKNOD=/bin/mknod + CC=/usr/bin/gcc + FIND=/usr/bin/find + LIBS := $(shell if [ "`uname -m`" != "sparc64" -a "`uname -m`" != "x86_64" ]; then echo "-lfl" ; else echo "" ; fi) ++SBINDIR=/sbin + OPT_FLAGS := -O2 + # for older versions of grsecurity, comment the above line and uncomment the below: + #OPT_FLAGS := $(shell if [ "`uname -m`" != "sparc64" ] && [ "`uname -m`" != "x86_64" ]; then echo "-O2" ; else echo "-O2 -m64" ; fi) +@@ -136,15 +137,15 @@ lex.learn_pass1.o: lex.learn_pass1.c learn_pass1.tab.h + lex.learn_pass2.o: lex.learn_pass2.c learn_pass2.tab.h + + install: $(GRADM_BIN) gradm.8 policy grlearn +- @mkdir -p $(DESTDIR)/sbin ++ @mkdir -p $(DESTDIR)$(SBINDIR) + @echo "Installing gradm..." +- @$(INSTALL) -m 0755 $(GRADM_BIN) $(DESTDIR)/sbin ++ @$(INSTALL) -m 0755 $(GRADM_BIN) $(DESTDIR)$(SBINDIR) + @if [ -f $(GRADM_PAM) ] ; then \ + echo "Installing gradm_pam..." ; \ +- $(INSTALL) -m 4755 $(GRADM_PAM) $(DESTDIR)/sbin ; \ ++ $(INSTALL) -m 4755 $(GRADM_PAM) $(DESTDIR)$(SBINDIR) ; \ + fi + @echo "Installing grlearn..." +- @$(INSTALL) -m 0700 grlearn $(DESTDIR)/sbin ++ @$(INSTALL) -m 0700 grlearn $(DESTDIR)$(SBINDIR) + @mkdir -p -m 700 $(DESTDIR)$(GRSEC_DIR) + @if [ ! -f $(DESTDIR)$(GRSEC_DIR)/policy ] ; then \ + if [ -f $(DESTDIR)$(GRSEC_DIR)/acl ] ; then \ +@@ -170,15 +171,15 @@ install: $(GRADM_BIN) gradm.8 policy grlearn + echo "KERNEL==\"grsec\", MODE=\"0622\"" >> $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \ + echo "LABEL=\"permissions_end\"" >> $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \ + fi +- @if [ -f $(DESTDIR)/sbin/udevadm ] ; then \ +- $(DESTDIR)/sbin/udevadm trigger --action=change ; \ ++ @if [ -f $(DESTDIR)$(SBINDIR)/udevadm ] ; then \ ++ $(DESTDIR)$(SBINDIR)/udevadm trigger --action=change ; \ + fi + @echo "Installing gradm manpage..." + @mkdir -p $(DESTDIR)$(MANDIR)/man8 + @$(INSTALL) -m 0644 gradm.8 $(DESTDIR)$(MANDIR)/man8/$(GRADM_BIN).8 +- @if [ -x /sbin/$(GRADM_BIN) ] ; then \ ++ @if [ -x $(SBINDIR)/$(GRADM_BIN) ] ; then \ + if [ -z $(DESTDIR) ] && [ ! -f $(GRSEC_DIR)/pw ] ; then \ +- /sbin/$(GRADM_BIN) -P ; \ ++ $(SBINDIR)/$(GRADM_BIN) -P ; \ + fi \ + fi + @true +-- +2.36.0 + diff --git a/meta-oe/recipes-support/gradm/gradm_3.1-201903191516.bb b/meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb similarity index 90% rename from meta-oe/recipes-support/gradm/gradm_3.1-201903191516.bb rename to meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb index 0513f0dca0..c82b529f96 100644 --- a/meta-oe/recipes-support/gradm/gradm_3.1-201903191516.bb +++ b/meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb @@ -14,9 +14,9 @@ DEPENDS = "flex-native bison-native ${@bb.utils.contains('DISTRO_FEATURES', 'pam SRC_URI = "http://grsecurity.net/stable/${BP}.tar.gz \ file://0001-Makefile-remove-strip.patch \ file://0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch \ + file://0001-make-Define-SBINDIR-flag.patch \ " -SRC_URI[md5sum] = "5099c715433981d5a3eed8ded7c5bbc0" -SRC_URI[sha256sum] = "d3a0b6383ff97a2054941d71133c737efae66afdd8eef59346c031ae15c75ff3" +SRC_URI[sha256sum] = "2459290f367a47c8a1ce4ea2ec08359799ea33dc15ed4436439596ce88284fb9" S = "${WORKDIR}/gradm" @@ -35,6 +35,7 @@ do_compile() { do_install() { oe_runmake 'CC=${CC}' \ 'DESTDIR=${D}' \ + 'SBINDIR=${base_sbindir}' \ 'LIBS=' \ 'LLEX=${STAGING_BINDIR_NATIVE}/lex' \ 'FLEX=${STAGING_BINDIR_NATIVE}/flex' \ From patchwork Sun Apr 24 03:10: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: 7111 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 DCC95C47084 for ; Mon, 25 Apr 2022 19:26:11 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web10.13951.1650769813824107159 for ; Sat, 23 Apr 2022 20:10:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Fg/I/ne8; spf=pass (domain: gmail.com, ip: 209.85.214.182, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f182.google.com with SMTP id d15so19552373pll.10 for ; Sat, 23 Apr 2022 20:10:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zLaX2BXtbHO8QdcofcoQN/yuVYOPJcKLGdyPr5+U94s=; b=Fg/I/ne8fm4Hr9gSlSSjn5Lf0u1BQxde2jdAj+N5yp3fvr0TodHWeTQzDTDy27LLiU wYUr7GJoSyXfRF+QXQX5cht0U1fuxqDcwYVAHUCk8CSVYaY+vMt4OkRr36e5RKASLrxS FrjyZJVLMXXizAzy7KvcqJvmy7hTqDsm78Ysl7tILZN2R05ORdvsj0qUSI6zqvTsxwG3 nopko1uHSS/G5T/oxbmWX5bVB8TuzKCmc33ZUFwbs8AOVoHOVwxPF8hlwMUFUWDIhMF5 XORx0rv3knVYcv/7IfsMloa0wIgg9Qdn/RVQxhn4WbX9U1PcF8xMibiAcr3UigQAX3y+ K65Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zLaX2BXtbHO8QdcofcoQN/yuVYOPJcKLGdyPr5+U94s=; b=2oNY7n38EIveGDs6JQwbbV50ZN74HHgI1H/5Q3HNuZMkbvlsK4w6YQOatV1MwVnokq yQcXxm8eiHEEsxCspBXMGYU4F0mA1GLwPmdSRTVt6dRVM//LbxSjp4FchV06f+iinBoL MAN3fxaf6bZ2CwzLsIOUUrOj98N2Vvg6DYK6ZU9M1UPwQQZzMxNyc/2Yi6hLZ8t1SB9P Li8dSpBnGiNR3uQLVH2+SEOYcow6RBZ4SazDyVX6TpxbqSHokSnMvcVfSBhO1G0LV85U 0XLCqo//gNTqIH0oywgdh40yrVHlyBaeXeVELRZn58uEF/SweWRoZqTMJO3s6hC46nes l2hw== X-Gm-Message-State: AOAM53154C9w1PmaZ40uSpwYUXFQ/YJWAQkLIWt2QicoEjc990gFzvui zzFtwxio1ZEIjbiGlWZYr36oIWd7G6Buww== X-Google-Smtp-Source: ABdhPJyImOX784Bb9m/iwguw0cYywH6In72XNfvoKy4BgcK3xW89QSoYuZzQ3az6PmOjxL895ZTVdg== X-Received: by 2002:a17:90a:db45:b0:1d9:29d0:4c6e with SMTP id u5-20020a17090adb4500b001d929d04c6emr6618043pjx.46.1650769813158; Sat, 23 Apr 2022 20:10:13 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::2ca3]) by smtp.gmail.com with ESMTPSA id q13-20020a17090a2e0d00b001cd4989feebsm10630987pjd.55.2022.04.23.20.10.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Apr 2022 20:10:12 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 08/12] babeld: Upgrade to 1.11 Date: Sat, 23 Apr 2022 20:10:00 -0700 Message-Id: <20220424031004.3209576-8-raj.khem@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220424031004.3209576-1-raj.khem@gmail.com> References: <20220424031004.3209576-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 ; Mon, 25 Apr 2022 19:26:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96745 Provide proper prefix so that install works correctly when using usrmerge Signed-off-by: Khem Raj --- .../babeld/{babeld_1.10.bb => babeld_1.11.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-networking/recipes-protocols/babeld/{babeld_1.10.bb => babeld_1.11.bb} (80%) diff --git a/meta-networking/recipes-protocols/babeld/babeld_1.10.bb b/meta-networking/recipes-protocols/babeld/babeld_1.11.bb similarity index 80% rename from meta-networking/recipes-protocols/babeld/babeld_1.10.bb rename to meta-networking/recipes-protocols/babeld/babeld_1.11.bb index 529cccf872..dd1d6931dc 100644 --- a/meta-networking/recipes-protocols/babeld/babeld_1.10.bb +++ b/meta-networking/recipes-protocols/babeld/babeld_1.11.bb @@ -12,8 +12,8 @@ SECTION = "net" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE;md5=411a48ac3c2e9e0911b8dd9aed26f754" -SRC_URI = "git://github.com/jech/babeld.git;protocol=https;branch=master" -SRCREV = "dbb8799d1b5b3bfaf4387386c92369c847704480" +SRC_URI = "gitsm://github.com/jech/babeld.git;protocol=https;branch=master" +SRCREV = "f82a10e97a02849cd82087863055c9af08ca3454" UPSTREAM_CHECK_GITTAGREGEX = "babeld-(?P\d+(\.\d+)+)" @@ -24,6 +24,6 @@ do_compile () { } do_install () { - oe_runmake install.minimal PREFIX=${D} + oe_runmake install.minimal TARGET=${D} PREFIX=${root_prefix} } From patchwork Sun Apr 24 03:10: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: 7109 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 DCCC0C47085 for ; Mon, 25 Apr 2022 19:26:11 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web08.14008.1650769814792109878 for ; Sat, 23 Apr 2022 20:10:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=cSmhcovM; spf=pass (domain: gmail.com, ip: 209.85.214.172, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f172.google.com with SMTP id n18so19594096plg.5 for ; Sat, 23 Apr 2022 20:10:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=k3k9RHpq9jsoQP1LX188xnl5NvNzT+oNdVEwSCLJbGQ=; b=cSmhcovMrVVOmSCAhzJcvIkHQDzaQhq5kZRNrChyaXL5iFrGuctRuoI4t5iKi1yjgl OlEDF7BVfWiH6yJZg50MubGaLIvL6tugISjfE13RAKDTQ0qp+pyNwMeC7QzJZZgtoP51 ykx19jHxWNVqt2OrnzKWkXkpN3ftrAscE9rRnLLnw4ErVkY0jcLFaCURRJ+4zmy/bO1N a4Of7YKGth5B0PyXSwVyOce5s5AfEutlDaTmLCW/4V2yhWmVBfHn2NALdfjpuhPXPlgb PzFTAZT7ttSgAGt6wB/cDBq+BIEJ9pdOqkXUM6c7m8QuMylK3DCv+BohoHCuJdxC25nM XyHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=k3k9RHpq9jsoQP1LX188xnl5NvNzT+oNdVEwSCLJbGQ=; b=h4RIc7Q5yYVuFczrP1TPtB3oNc3ICzrPA6fOE5JD1UFDIj5KddsQDmiWdNvlDWBp1m pGIH4i9nwKPz/T0kGGYTn+0oMcQhyEFJkVxsdB9jXq+v3+2s8Jn1MXzOA7KJXyvASETV MgWKyM1nvnGSasrHjn+w1HiPGIS63V2SR0ZeFM23u/5K1DTdRfEvdsijuCOdYNVeJOUO FaUh/SDVC03t8iGXnW6dt3XmDagLXHA7zizXkhKyjUL3P4fQKWB1pGNqyOFr97qahkWL CriHoX+PWp8dCJzHJI2Nt0PeR+CAEkJXKxnOMutFheXMBKGM6hArBNSxllOaycy5MiWk sv4A== X-Gm-Message-State: AOAM531J2HF5EH1f9ZYDVHjGMYclJ3USAFOz7lseJc1dAOmGXs4Gz1br 9vQOztUWTht/Dk7skLoYCf+OH+7Il18+XQ== X-Google-Smtp-Source: ABdhPJw+ltaYrEjnGHnTpv1xsqSPqH2khlgBGjHSRkahoW2PWFC0w+/TCW/wE3t5lcynCh1Lz1PwXg== X-Received: by 2002:a17:903:240c:b0:153:c452:f282 with SMTP id e12-20020a170903240c00b00153c452f282mr11584014plo.88.1650769814127; Sat, 23 Apr 2022 20:10:14 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::2ca3]) by smtp.gmail.com with ESMTPSA id q13-20020a17090a2e0d00b001cd4989feebsm10630987pjd.55.2022.04.23.20.10.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Apr 2022 20:10:13 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 09/12] scsirastools: Fix build with usrmerge Date: Sat, 23 Apr 2022 20:10:01 -0700 Message-Id: <20220424031004.3209576-9-raj.khem@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220424031004.3209576-1-raj.khem@gmail.com> References: <20220424031004.3209576-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 ; Mon, 25 Apr 2022 19:26:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96746 Signed-off-by: Khem Raj --- meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb b/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb index 66620ea5ff..d3f2bd678d 100644 --- a/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb +++ b/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "e7b997e75decb06a650c42c35cd63d0c94c34e39cf133c723337b0eeab inherit autotools update-rc.d # mdadm Makefile has CC set to gcc, hence override CC to ${CC} -EXTRA_OEMAKE += "CC='${CC}'" +EXTRA_OEMAKE += "CC='${CC}' sbindir=${base_sbindir}" do_configure:append() { From patchwork Sun Apr 24 03:10: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: 7110 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 DC4CBC352A8 for ; Mon, 25 Apr 2022 19:26:11 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web09.14272.1650769815646307481 for ; Sat, 23 Apr 2022 20:10:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=cqoHYbWG; spf=pass (domain: gmail.com, ip: 209.85.214.179, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f179.google.com with SMTP id u7so4198558plg.13 for ; Sat, 23 Apr 2022 20:10:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LKt+In8DOjuluHj5Y9T4MTswY+DyzdHR/cMNwt6D6CM=; b=cqoHYbWGY+QhJC7Xhi8ZIByG1m33MxVzFqrugBniQh0rLyRP78G9DucPo7Px4Ok1R6 YMmQkW+iOT1vUcMTK1DjJ9BfRQixZlpvMAAubvV0cPGbmggJpXAIws8O2yhc0cGE60nJ Zl8h4+Cxn/pPclGyVeVDlZ3J1q/+qNBWdFqDWfLiJsTAOKKpBhY8phKPFe4iXsreXhEw 5Qnnuf7PASGtqF05yljeI9iPQIUkU68LsQWMvVP9L8p811YjKPQB9P6TJEtrUJzMId/K HXZyp/0j2dbVKu678PPJ+680LeCBdgMId0S/eSOCvEoM2Nzu4GT4aAsh0gzhqdSUiQIh OSsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LKt+In8DOjuluHj5Y9T4MTswY+DyzdHR/cMNwt6D6CM=; b=6jY7zuR7K9WNs2Rec/h/oDiynDePmNpq3WMpOmKlRA7kkSRW5G0JurUNl9zvWdWZ57 xmxLuRo51NcdODgbWSJxay5rHiM/UDpSCOisSWRx4Hie1DC3i1BhGVbsff1iFum3L2dr EZ98PruO4WzxOL9WroZsj1/YN+15X0XnfZi6Wd7jN/+5bOdOWC2U8UmTcIipwIjue0rq vKj2/4jQemV/FEZqicnTZieZC9tk2mJ5/MYQ2lfLXvsLjQVl8Eluvtuf9TkMarHBYy3g mGpGOWSrvF9ZbOd0iqLO7jtst+YKoKvhWWX6fMzujkYQahjZkbFFvq+gReRraDvYCa5y AjyA== X-Gm-Message-State: AOAM531Xm6BLaJaPlvmf1+YZzUlO4QukbceYI9vlEaTsH7H2qFyum2W/ DqSNSG9JrFaTGpVx+A3AlnBEuZpRKtI/Yw== X-Google-Smtp-Source: ABdhPJyNgLdZPIpwlT0TyfscreFPm6MbDEvlCHlixfKglrEnS0ClYgmGF2wO6w1+AQu3xREEjMHdww== X-Received: by 2002:a17:902:bd05:b0:158:544d:6557 with SMTP id p5-20020a170902bd0500b00158544d6557mr11868651pls.70.1650769814992; Sat, 23 Apr 2022 20:10:14 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::2ca3]) by smtp.gmail.com with ESMTPSA id q13-20020a17090a2e0d00b001cd4989feebsm10630987pjd.55.2022.04.23.20.10.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Apr 2022 20:10:14 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 10/12] dietsplash: specify install rootdir Date: Sat, 23 Apr 2022 20:10:02 -0700 Message-Id: <20220424031004.3209576-10-raj.khem@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220424031004.3209576-1-raj.khem@gmail.com> References: <20220424031004.3209576-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 ; Mon, 25 Apr 2022 19:26:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96747 This takes care of rootdir being different when using usrmerge Signed-off-by: Khem Raj --- meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb b/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb index 44fc2d08ca..2c28fde347 100644 --- a/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb +++ b/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb @@ -17,6 +17,6 @@ inherit autotools S = "${WORKDIR}/git" EXTRA_OECONF = " --with-systemdsystemunitdir=${systemd_unitdir}/system \ - --disable-staticimages" + --disable-staticimages --with-rootdir=${root_prefix}" FILES:${PN} += "${systemd_unitdir}/system/" From patchwork Sun Apr 24 03:10: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: 7119 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 E6387C47087 for ; Mon, 25 Apr 2022 19:26:11 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web10.13952.1650769816545976081 for ; Sat, 23 Apr 2022 20:10:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=KBTtmJjB; spf=pass (domain: gmail.com, ip: 209.85.214.174, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f174.google.com with SMTP id q3so19609430plg.3 for ; Sat, 23 Apr 2022 20:10:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gJIjRHedlnz5ee6Ho0VIU/N05OtM6PSbErHA0s1Oln4=; b=KBTtmJjBUiY7FsJs93O8IjC/RVbyYNGLtigeJvx6hQ+E9QcwXBWmBrIAYm41HeFFRG maQ3Eyo3D+13XOx+FMPZsIM0blkALD058GIizna5ZC2j0FYIRfYC7Ts3HtWuS2itp0YR thEC4Qarxy3kqlW0XvmOx3m8KjoLVA6Dmq05GHDmnkpkMOJshNL3Jy9Lnf6f8BZ5c3E4 Dj7P//kGet3+uWaoVpeVv5RWemwDHAqwcdoV2fFiXrvgjiH/XoPuwQag1sJS4NUwEE/R IIJojnOTdS9KJDVl75flpEnTnjuEicRX/G/IADJuwrr9sEVV8CKlsLjbSdtQ2U1D+i4R cdxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gJIjRHedlnz5ee6Ho0VIU/N05OtM6PSbErHA0s1Oln4=; b=xOYdzRQb/J+jzZAJUDTbYPxCoZYsKK8VP8Wj5NpmnVdVFfoPsvlFYbnqigY/kYxYgj daEykMx14i6glDTMoAF06VAL/T3fgMG9DqTd7Jr+tBqswsejO+k/uKoDJ7mgiCf7oXPh m9nE47xP5SoqAj2LzHCzZN89jssAR6Wu6dH9/tL97SVMyk40F/kuZH9xxSbMUkSt/Rsb v7EB3sF9C3QmYP6poVYqZwKqyto/9gpK4YNpQb7AI8vE5ZfvZ66CetFFPQ/vxb6nLWR1 0R72up3W2npJVaBVQNs78A7/SmjapyVJaINjJMF1ti3S5scB2th38yIMM3uoMA4XAnQH +GUA== X-Gm-Message-State: AOAM530yGBxKbCQ9PfnYIl6ctaR6/q74t/bmZB/6n33hfedH4tbskcvj m1J4xh2JL0g/BQQqVjdhzYnQyl2MMKKDIA== X-Google-Smtp-Source: ABdhPJy4WidQqgny3lAQiVfRa3OROAO/89nkWjT4kHp4G+Si1Tvkpe0cbzX2WcbqKwkkCs6S3u9uWA== X-Received: by 2002:a17:902:b10f:b0:156:612f:318d with SMTP id q15-20020a170902b10f00b00156612f318dmr11720202plr.143.1650769815922; Sat, 23 Apr 2022 20:10:15 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::2ca3]) by smtp.gmail.com with ESMTPSA id q13-20020a17090a2e0d00b001cd4989feebsm10630987pjd.55.2022.04.23.20.10.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Apr 2022 20:10:15 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 11/12] linux-atm: Add knob to root prefix Date: Sat, 23 Apr 2022 20:10:03 -0700 Message-Id: <20220424031004.3209576-11-raj.khem@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220424031004.3209576-1-raj.khem@gmail.com> References: <20220424031004.3209576-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 ; Mon, 25 Apr 2022 19:26:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96748 Fixes build with usrmerge Signed-off-by: Khem Raj --- .../linux-atm/0001-make-Add-PREFIX-knob.patch | 31 +++++++++++++++++++ .../linux-atm/linux-atm_2.5.2.bb | 7 ++--- 2 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 meta-networking/recipes-support/linux-atm/linux-atm/0001-make-Add-PREFIX-knob.patch diff --git a/meta-networking/recipes-support/linux-atm/linux-atm/0001-make-Add-PREFIX-knob.patch b/meta-networking/recipes-support/linux-atm/linux-atm/0001-make-Add-PREFIX-knob.patch new file mode 100644 index 0000000000..9c83ef0af4 --- /dev/null +++ b/meta-networking/recipes-support/linux-atm/linux-atm/0001-make-Add-PREFIX-knob.patch @@ -0,0 +1,31 @@ +From 94cb952207e44a5c29578c9c56912190a5422876 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 23 Apr 2022 09:41:51 -0700 +Subject: [PATCH] make: Add PREFIX knob + +This will be used to pass appropriate root prefix which is different +when using usrmerge + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/extra/Makefile.am | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/src/extra/Makefile.am ++++ b/src/extra/Makefile.am +@@ -8,10 +8,10 @@ BUILT_SOURCES = pca200e.bin pca200e_ecd. + CLEANFILES = pca200e.bin pca200e_ecd.bin2 sba200e_ecd.bin2 + + install-exec-hook: +- $(MKDIR_P) $(DESTDIR)/lib/firmware +- $(INSTALL_DATA) $(builddir)/pca200e.bin $(DESTDIR)/lib/firmware +- $(INSTALL_DATA) $(builddir)/pca200e_ecd.bin2 $(DESTDIR)/lib/firmware +- $(INSTALL_DATA) $(builddir)/sba200e_ecd.bin2 $(DESTDIR)/lib/firmware ++ $(MKDIR_P) $(DESTDIR)$(ROOTPREFIX)/lib/firmware ++ $(INSTALL_DATA) $(builddir)/pca200e.bin $(DESTDIR)$(ROOTPREFIX)/lib/firmware ++ $(INSTALL_DATA) $(builddir)/pca200e_ecd.bin2 $(DESTDIR)$(ROOTPREFIX)/lib/firmware ++ $(INSTALL_DATA) $(builddir)/sba200e_ecd.bin2 $(DESTDIR)$(ROOTPREFIX)/lib/firmware + + %.bin %.bin2: %.data + objcopy -Iihex $< -Obinary $@.gz 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 effd7502ff..bb79b78568 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 @@ -13,11 +13,11 @@ SRC_URI = "http://nchc.dl.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BPN}-${P file://0003-mpoad-Drop-old-hack-to-compile-with-very-old-glibc.patch \ 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 \ " SRC_URI:append:libc-musl = " file://musl-no-on_exit.patch" -SRC_URI[md5sum] = "d49499368c3cf15f73a05d9bce8824a8" SRC_URI[sha256sum] = "9645481a2b16476b59220aa2d6bc5bc41043f291326c9b37581018fbd16dd53a" LIC_FILES_CHKSUM = "\ @@ -27,7 +27,6 @@ file://COPYING.LGPL;md5=6e29c688d912da12b66b73e32b03d812" inherit autotools pkgconfig -# The firmware is explicitly put under /lib when installed. -# +EXTRA_OEMAKE += "ROOTPREFIX=${root_prefix}" -FILES:${PN} += "/lib/firmware" +FILES:${PN} += "${nonarch_base_libdir}/firmware" From patchwork Sun Apr 24 03:10: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: 7114 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 E630DC47086 for ; Mon, 25 Apr 2022 19:26:11 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web09.14273.1650769817410895740 for ; Sat, 23 Apr 2022 20:10:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=mbdn3xlY; spf=pass (domain: gmail.com, ip: 209.85.214.172, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f172.google.com with SMTP id d15so5116442plh.2 for ; Sat, 23 Apr 2022 20:10:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZHcQiTqXlYcMin9/KxM7R45cIEapfcEgi7LoTaqyDOo=; b=mbdn3xlYfhPVY8k8KVrBJeG5LshYMn0O5ocFwO6T6eqakUAASsiEDkBctjKS1aU2BZ ktPPfoXjHHzHISTZ/cFlBkki45QWO+qFLx08Cv+keBTNVEfLDyqnmsfRYoYnScjpbSNU 5JxgwL/h2I/TvngRL2XHIo2PL/+WuvvzkWh/JAIOcrOxTd7v0TyOj/vphbz+wW8pwMjM BhsAPkrkK+CMX/A2bjvkf9xsTkEMGHa+2tXXSeFzWVRlr4fwh51twknwlou7Qs1OADvC xc4QL87DAwbk3ivzLKTjUHJyB62Bw0wITZ3pWvanJu31Vp985WsGzKnX8KzxMBKiPnX1 e6Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZHcQiTqXlYcMin9/KxM7R45cIEapfcEgi7LoTaqyDOo=; b=KGef+XCV4OaWatjLFPM2VF2vs23KUv7h8L0JM/rsIXRZ+n1AH0QZizTyLtpk3MxZYs 8y5E/unVfKBhLYFYOnHc/srcLFM5yuG8wYGU8dL2tQRwyZaeA8nkfRxME50sQYZmMZhg /29GhuC82KZJMhPmJyqUA+FsLytahNo35vUfCaxfXVExkk3Kc2lC7biMU4kjmpx4FNkv dMSkXiiYcTROY118CgfCvLGzHocyqpc8DXyuRnUOY9vgKUxQSCsLNjHolQN39v/1H+hn HmHNr6jbyqD4LtobHxWzfVljeyG7ypCCYUpaLC8BP79uMB55+FNs07u6Brl8GyJk65Np Qwlg== X-Gm-Message-State: AOAM5337fufGQ7BG0Ih+VmK6ERVkXBtEunoJxEOHSOudJw4NOkl3eWng ZuGZ4ms/k84MdrF75hAeQe9m+GoyBiA28g== X-Google-Smtp-Source: ABdhPJwNIesaTwdbyUtrNXVSDadaLO91TXZ0Ax0ZM6jZv+3cwSqyf+BSd7Ev0SJ0Vr9LAuWN+JYhug== X-Received: by 2002:a17:902:b189:b0:14d:6f87:7c25 with SMTP id s9-20020a170902b18900b0014d6f877c25mr12023127plr.31.1650769816755; Sat, 23 Apr 2022 20:10:16 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::2ca3]) by smtp.gmail.com with ESMTPSA id q13-20020a17090a2e0d00b001cd4989feebsm10630987pjd.55.2022.04.23.20.10.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Apr 2022 20:10:16 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 12/12] ufw: Fix build with usrmerge distro feature Date: Sat, 23 Apr 2022 20:10:04 -0700 Message-Id: <20220424031004.3209576-12-raj.khem@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220424031004.3209576-1-raj.khem@gmail.com> References: <20220424031004.3209576-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 ; Mon, 25 Apr 2022 19:26:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/96749 Signed-off-by: Khem Raj --- meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb b/meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb index 70216a85e3..6dca784bf4 100644 --- a/meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb +++ b/meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb @@ -38,6 +38,13 @@ RRECOMMENDS:${PN} = " \ kernel-module-nf-recent \ " + +do_configure:prepend() { + if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then + sed -i -e 's|/lib|${nonarch_base_libdir}|' ${S}/setup.py + fi +} + do_install:append() { install -d ${D}${systemd_unitdir}/system/ install -m 0644 ${S}/doc/systemd.example ${D}${systemd_unitdir}/system/ufw.service