From patchwork Mon Aug 8 14:22:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 11140 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 09C3BC25B0D for ; Mon, 8 Aug 2022 14:25:09 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mx.groups.io with SMTP id smtpd.web10.26169.1659968701629754220 for ; Mon, 08 Aug 2022 07:25:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=h87Ci6Ci; spf=pass (domain: gmail.com, ip: 209.85.215.180, mailfrom: akuster808@gmail.com) Received: by mail-pg1-f180.google.com with SMTP id f11so8705350pgj.7 for ; Mon, 08 Aug 2022 07:25:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=6Q9gRPpbT5sdlPTHwX5Ye3o9R2HbXPJ+sPURY5TIiP0=; b=h87Ci6CiAiqlCTs3e8uS+fY1hj2B9Kxu6a26K7cf9wgx29tUvLqopi2ePd72jmlT4h PEea5AcBgZ7k9+XEY4+66/Gj91nGRPmR8fICZAXiJJxf/9Pzm6RYbJSCMG5wS+zsomYk 32mEZhHur9722mfPJ8ezdZZS6Y8R6r8kOV7mfVT4Q1XIbLYBTBQEn/+iaZKK7tU4Jvly +QkMvju1fYwtJe7rFMSKl7A3QunEgN4mY1/wSeDVfslS3bihm3II5DdiXNHGexhmrgOr y+uoj/K4ypE3/4F/vWu45C2uBApHBx1gNAfY27eBaZ5w88hubwvE6UHYD0WcP4gYUjmD wP3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6Q9gRPpbT5sdlPTHwX5Ye3o9R2HbXPJ+sPURY5TIiP0=; b=tncMYcDHavglrxGj+3j1oEpiEzWLdkGZK9ntfzGMZl49xeB48x9MZHUff9SVAUGZ8A x7qPD9+4deQCIStOSfRK2o/AtwJWwzCPKX1+g+FaaHHHcgFtdjIrCvtguLq9IyOrASJ5 wyMy0pj1g230I9pIzPT7RThZl1dn/CwqYfbPVhLBVPzaOJOiXi7zyNEoJgIU5gGIZ7Se sft1x9/EninPHi8LOApdBBByA1acB4QaC0aYJr41E+5Wd5R5Kp/b1hnRIbwp61dkM3bz ReXRQJj8Qqn3b4253TxxQL3zSj9bYkhiV4pGStotxRM1E20zQlVF41nyO6x6Vc2fx5O5 YBnw== X-Gm-Message-State: ACgBeo1vyO7iOVUao+mqLtwDhiNj1d2OFVSsRXwxqw5tN27n7b1FlwLd LaTA/iKUZbmwftoLWwzVg8SA5X1OI5M= X-Google-Smtp-Source: AA6agR4KXkUmTSvi6sIQCpjAAwdOW7+aWYFOR2goHazdWfcDLzLNYi/CylFcG3EMcgXW+Yl9uSdTsQ== X-Received: by 2002:a63:c5:0:b0:40d:d290:24ef with SMTP id 188-20020a6300c5000000b0040dd29024efmr15646140pga.141.1659968700695; Mon, 08 Aug 2022 07:25:00 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id u8-20020a1709026e0800b0016f1204cde8sm8757492plk.301.2022.08.08.07.24.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 07:24:59 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 02/13] polkit: add udisks2 rule Date: Mon, 8 Aug 2022 07:22:41 -0700 Message-Id: <64f95345ad3814aa7cdf7b21b2177b8052c59610.1659968069.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 08 Aug 2022 14:25:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98162 From: Vyacheslav Yurkov The rule allows non-priviledged users from plugdev group to mount/unmount block devices Signed-off-by: Vyacheslav Yurkov Signed-off-by: Khem Raj (cherry picked from commit d7ff4a77241fc79fc704a0d9d6b414b52f025531) Signed-off-by: Armin Kuster --- .../files/50-org.freedesktop.udiskie.rules | 24 +++++++++++++++++++ .../polkit/polkit-group-rule-udisks2.bb | 17 +++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 meta-oe/recipes-extended/polkit/files/50-org.freedesktop.udiskie.rules create mode 100644 meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb diff --git a/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.udiskie.rules b/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.udiskie.rules new file mode 100644 index 0000000000..2ffa4087a8 --- /dev/null +++ b/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.udiskie.rules @@ -0,0 +1,24 @@ +polkit.addRule(function(action, subject) { + var YES = polkit.Result.YES; + var permission = { + // required for udisks1: + "org.freedesktop.udisks.filesystem-mount": YES, + "org.freedesktop.udisks.luks-unlock": YES, + "org.freedesktop.udisks.drive-eject": YES, + "org.freedesktop.udisks.drive-detach": YES, + // required for udisks2: + "org.freedesktop.udisks2.filesystem-mount": YES, + "org.freedesktop.udisks2.encrypted-unlock": YES, + "org.freedesktop.udisks2.eject-media": YES, + "org.freedesktop.udisks2.power-off-drive": YES, + // required for udisks2 if using udiskie from another seat (e.g. systemd): + "org.freedesktop.udisks2.filesystem-mount-other-seat": YES, + "org.freedesktop.udisks2.filesystem-unmount-others": YES, + "org.freedesktop.udisks2.encrypted-unlock-other-seat": YES, + "org.freedesktop.udisks2.eject-media-other-seat": YES, + "org.freedesktop.udisks2.power-off-drive-other-seat": YES + }; + if (subject.isInGroup("plugdev")) { + return permission[action.id]; + } +}); diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb b/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb new file mode 100644 index 0000000000..ae024d0328 --- /dev/null +++ b/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Polkit rule to allow non-priviledged users mount/umount block devices via udisks2" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +require polkit-group-rule.inc + +# The file originates from https://github.com/coldfix/udiskie/wiki/Permissions +SRC_URI = "file://50-org.freedesktop.udiskie.rules" + +RDEPENDS_${PN} += "udisks2" + +do_install() { + install -m 0755 ${WORKDIR}/50-org.freedesktop.udiskie.rules ${D}${sysconfdir}/polkit-1/rules.d +} + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM:${PN} = "--system plugdev" From patchwork Mon Aug 8 14:22:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 11139 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 036D7C25B0C for ; Mon, 8 Aug 2022 14:25:09 +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.web11.26268.1659968703040427161 for ; Mon, 08 Aug 2022 07:25:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=bCAkgFl+; spf=pass (domain: gmail.com, ip: 209.85.214.179, mailfrom: akuster808@gmail.com) Received: by mail-pl1-f179.google.com with SMTP id w14so8689003plp.9 for ; Mon, 08 Aug 2022 07:25:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=G4uAsqP5YZGf2U1f+SH2uiOUliOig+Yb7Vb7EG6MHj8=; b=bCAkgFl+SRWV1OkkbUY03beaajLA9PMowFKb+K3AzMuI1kUXOYdazq9BkTHOtV/0oa 4ssc1rteXb1+K6WqQ7mch6z73PqelJTRkp6eALjsNgAXUDUNhQoIc5THDx1TBMQCas6I jJq8Q9Jwg81q6CwWo/7Xoy4PIJ5wTMlAnVJLG5pxLnnQhzo+7di4l6+qvJ20440xw6Xa RZH+lkZ13irMa8VK7b8sVtqOOgBqOXWp42BgwV2hSvlQZZE2xopUZhjscfhu2hCYtdk0 1UO3Viwbi3SYXRY0M69WqqSutUd2AKb8Prq2+yyq/5nkBQD3drh2WH8+f2wOkRfD6Vxk QwNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=G4uAsqP5YZGf2U1f+SH2uiOUliOig+Yb7Vb7EG6MHj8=; b=x9Z2betN5oSLFq2fOF7ruGQ/Qsg5elh+A521taEBsD6o88cUboi8SmLVWXanjPwZ3D p2RmORVYR5vw1aapQt3kiQskBT4D9CaqsqJJ/tYKUQKq64Lu/dbpTm1SKdLpWQMsP50h wEmXShSnQP6adKPDMSrIhWt/z30DGDONREub1iBGj5LuGdRfaNSEB1HGxUyBuBF2qSU+ 9XjYLs1y7DaEp+mPwFekAjO7We4NaMbJMqY506I/G40MKmPBNEGir1dfOwF8SpJhzDVU mxB/vOiInQ6K6TlSvkh1i+hKpQq5ZB4y44IPu9cEy3n9Mvphh5UUYckh6Ch4HKagzzxV UV0g== X-Gm-Message-State: ACgBeo2qPBWp+0PSUIA6NI14IJXNkJFfQLdqg5Zr3BwOMTVrEu1GnVjg Hs+njjtg16vVQdOcHPW1VvjnT5+3k4c= X-Google-Smtp-Source: AA6agR7qEiufCp9/JsKAlmrCIi92gYAsW/ba1ckAiUflkTuyNaSDlB15MDKdz/XyTzTpqu7Um6CKdg== X-Received: by 2002:a17:90a:4fc7:b0:1f5:8d67:c7b7 with SMTP id q65-20020a17090a4fc700b001f58d67c7b7mr15904814pjh.106.1659968702063; Mon, 08 Aug 2022 07:25:02 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id u8-20020a1709026e0800b0016f1204cde8sm8757492plk.301.2022.08.08.07.25.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 07:25:01 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 03/13] polkit-group-rule-udisks2: fix override syntax in RDEPENDS Date: Mon, 8 Aug 2022 07:22:42 -0700 Message-Id: <5b7f7f31ffd330a7ac7b78f436ce07587d33af1c.1659968069.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 08 Aug 2022 14:25:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98163 From: Yi Zhao RDEPENDS_${PN} -> RDEPENDS:${PN} Signed-off-by: Yi Zhao Signed-off-by: Khem Raj (cherry picked from commit 10b508deacd8ff588b1511d077fcdd708deb653a) Signed-off-by: Armin Kuster --- meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb b/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb index ae024d0328..db2ed015b4 100644 --- a/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb +++ b/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb @@ -7,7 +7,7 @@ require polkit-group-rule.inc # The file originates from https://github.com/coldfix/udiskie/wiki/Permissions SRC_URI = "file://50-org.freedesktop.udiskie.rules" -RDEPENDS_${PN} += "udisks2" +RDEPENDS:${PN} += "udisks2" do_install() { install -m 0755 ${WORKDIR}/50-org.freedesktop.udiskie.rules ${D}${sysconfdir}/polkit-1/rules.d From patchwork Mon Aug 8 14:22:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 11137 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 04729C25B0E for ; Mon, 8 Aug 2022 14:25:09 +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.25873.1659968704971485734 for ; Mon, 08 Aug 2022 07:25:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=H++oeNo+; spf=pass (domain: gmail.com, ip: 209.85.210.180, mailfrom: akuster808@gmail.com) Received: by mail-pf1-f180.google.com with SMTP id f192so8221850pfa.9 for ; Mon, 08 Aug 2022 07:25:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=VRT94c2C2PE+nfgNhvQoDsCCDCun1WOQxT/1eJTFI64=; b=H++oeNo+dECHDUasseH+F0Pj2uu1b96UHnbBbtYnstWaaN3yBtklyrSOGXfd1WokLO xQUHQL+xJF7UsA3IGkkfOnJ4yO9XkJ1wWBN61UkGzhXLlNH1sirKZJKjh9F+tPEOCd38 WxrqtQgMc8eMtM4N73oYPkscz5NPDd08dRoUfzDYZev7Q8Ntn9zb7lPbgYceZtdY0kg5 E7Ivgyh5c57Mjs3q2oCXX96B1I8I9UAMRA0G4obHbYNzg/H9SsS+MFhq39d2Mu1GvUkE zZXdim7+bLmYkRfS7XEnKDsVMo+FwtIeGMUB0UQGLfQnR64HWzRNyYLNDP9cShVJJ2Jv pPjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VRT94c2C2PE+nfgNhvQoDsCCDCun1WOQxT/1eJTFI64=; b=uh5FuCxpVONXTftWcVpJtvEcMSpUrCjAO2se/3tb3S/Ykrvgx+i06Y3OURW8kcOmd3 QyspiRQiIp02KEqAlz33cmMnarRoI3ixDkP4wAV6pc8AO+qh+kXufzF8/N3DRxMJalz6 n7hbfJIKyC3FvkJaD2zn+jG1EosdCJxoi81j/JZH1vb7bdqPcY6qLAUXS6PYUN96FsWv WfXWYM6o08xXGI3Wu3675l4TP2Tjr1NAWg2EC001cIXJFDEYYwBIC6+jA/JleJgzCVwb LD9ChOThDrxbLWufm8E4jCpXQyhLloLVOnkX2UECHouL2WjR1WEoGejLqKhOwnSeNvO0 9mJw== X-Gm-Message-State: ACgBeo3wAFDpR+tb7gP0ptaQE7+/7KCgtbBaxNvD4EajEV4xmvG0oWZI 8Pz7rw0FtLKb0RbZjEhO2P0gJMBXIag= X-Google-Smtp-Source: AA6agR4qcluCYobsuDZAe+5iqgAC4RlygFJgbaFtCBcfz5YEWTqs6AcQ2eeq7zfm9m7J9tCo9cpA0g== X-Received: by 2002:a63:89c6:0:b0:41c:84c:bdae with SMTP id v189-20020a6389c6000000b0041c084cbdaemr15933918pgd.300.1659968703798; Mon, 08 Aug 2022 07:25:03 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id u8-20020a1709026e0800b0016f1204cde8sm8757492plk.301.2022.08.08.07.25.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 07:25:02 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 04/13] polkit: Add --shell /bin/nologin to polkitd user Date: Mon, 8 Aug 2022 07:22:43 -0700 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 08 Aug 2022 14:25:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98164 From: Akash Hadke polkitd user has default access to /bin/sh, add --shell /bin/nologin to remove default access to /bin/sh and avoid login through it. Signed-off-by: Akash Hadke Signed-off-by: Khem Raj (cherry picked from commit 7ca63e5454bd7cbdb5ac58f6b5913e3387b64201) Signed-off-by: Armin Kuster --- meta-oe/recipes-extended/polkit/polkit_0.119.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/polkit/polkit_0.119.bb b/meta-oe/recipes-extended/polkit/polkit_0.119.bb index 66bbf735f0..9444cb9f2d 100644 --- a/meta-oe/recipes-extended/polkit/polkit_0.119.bb +++ b/meta-oe/recipes-extended/polkit/polkit_0.119.bb @@ -58,7 +58,7 @@ FILES:${PN}:append = " \ FILES:${PN}-examples = "${bindir}/*example*" USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/${BPN}-1 polkitd" +USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/${BPN}-1 --shell /bin/nologin polkitd" SYSTEMD_SERVICE:${PN} = "${BPN}.service" SYSTEMD_AUTO_ENABLE = "disable" From patchwork Mon Aug 8 14:22:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 11141 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 EF689C00140 for ; Mon, 8 Aug 2022 14:25:08 +0000 (UTC) Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by mx.groups.io with SMTP id smtpd.web09.25874.1659968706765909770 for ; Mon, 08 Aug 2022 07:25:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=B38W7s84; spf=pass (domain: gmail.com, ip: 209.85.215.181, mailfrom: akuster808@gmail.com) Received: by mail-pg1-f181.google.com with SMTP id l64so8763596pge.0 for ; Mon, 08 Aug 2022 07:25:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Du15EqXrTi+WITPErODisWaHnRb8ADGeU1Mdc4goHK4=; b=B38W7s84EQUSMnhposuXht4tjgTURLPQSheSKcFM/B7r2Qg7/NHjqvOQjGAiD3Ryvf 2Xsyr0hpqvs9CYxonakosAFenNdcExQ363i634WDoHQVlul3w3KQfJmUiu/YgokZ4GSZ IRSTqCtDNpcesI4DwFDhQZeUQr2x3hWk3mETv+k5Tmh36eT/20vr85ynyiryu7zNU/e8 m9+X/kmjyfrLys/2l9mdtvwHMsU52y8W0qlsfk11wI7qmLO/RBiXZjKuabUsFT6yur8S H96QKkmz0NdnMY6ItapbWYkbhaNwZjE/J9YICh9VJqaDMKNYI6zY0ucYIeYH13PEqOiU mzzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Du15EqXrTi+WITPErODisWaHnRb8ADGeU1Mdc4goHK4=; b=Hnzv3S6n70V8WIOlCpAyT3plTCT2Bl+YJjnXvb/JeiYST2K8sy8dp5vr1z4Zg+M4bj hAwhyy0dT9lGcqqyw4eaE0hNc+afHcdqvkfN7wclprasIpWdH27j9CaOcEYFRljjnKgu 3xGTJz9AmoAB8q8xm6dQZatMRQPN86P2CXx9bkizlS1P0ubxSyHWeUuH3/JPT7517IbV qqd2gO4uVab7KSNF1KDMoV4bfUQ1xgXZQL9vLHV6GKEGap8og6TVC0k1KR0Jy6ZQTsGs uvV9UzjDg/hlkrjBBzj5dYHoFL5qGQk/JzxfXPRfz0TG/UAG29KTI/TWxkfUxAam0yyk BS1A== X-Gm-Message-State: ACgBeo1whUR0fZbe01CmMWCgRzmn++C+ZrOzWTH2wZLgC93aK7EcO1/C yReHr7bM8pYHLKOL6Fgy1eONslPsMxc= X-Google-Smtp-Source: AA6agR7yzFcf+fJB0jlOG2FjNG8SupCIyel2t1jzdffEZO+xcxldcCXCqA7Ytwycpu5jV1XSPdQE+Q== X-Received: by 2002:a63:4612:0:b0:41d:39:82ab with SMTP id t18-20020a634612000000b0041d003982abmr13210517pga.11.1659968705538; Mon, 08 Aug 2022 07:25:05 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id u8-20020a1709026e0800b0016f1204cde8sm8757492plk.301.2022.08.08.07.25.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 07:25:04 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 05/13] polkit: update patches for musl compilation Date: Mon, 8 Aug 2022 07:22:44 -0700 Message-Id: <3207be50c5b56f5edd3cbf8fa46a203246494519.1659968069.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 08 Aug 2022 14:25:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98165 From: Marta Rybczynska Update the patch to make netgroup support optional to fit the commit merged upstream [1], update the other patch depending on one of the changes. Without this update, a compilation using duktape with musl fails with: | ../../../polkit-0.119/src/polkitbackend/polkitbackendduktapeauthority.c: In function 'js_polkit_user_is_in_netgroup': | ../../../polkit-0.119/src/polkitbackend/polkitbackendduktapeauthority.c:1039:7: warning: implicit declaration of function 'innetgr' [-Wimplicit-function-declaration] | 1039 | if (innetgr (netgroup, | | ^~~~~~~ The main patch has been split in two, to apply the duktape part only when duktape is applied. [1] https://gitlab.freedesktop.org/polkit/polkit/-/commit/b57deee8178190a7ecc75290fa13cf7daabc2c66 Signed-off-by: Marta Rybczynska Signed-off-by: Khem Raj (cherry picked from commit 271282b1a5579179241748d5f0bdb8d2ea013dd6) {Fixup for kirkstone content; exlude Ducktape chages] Signed-off-by: Armin Kuster --- ...ded-support-for-duktape-as-JS-engine.patch | 20 ++-- ...0004-Make-netgroup-support-optional.patch} | 103 +++++++++--------- ...ke-netgroup-support-optional-duktape.patch | 34 ++++++ .../recipes-extended/polkit/polkit_0.119.bb | 2 +- 4 files changed, 96 insertions(+), 63 deletions(-) rename meta-oe/recipes-extended/polkit/polkit/{0003-make-netgroup-support-optional.patch => 0004-Make-netgroup-support-optional.patch} (74%) create mode 100644 meta-oe/recipes-extended/polkit/polkit/0005-Make-netgroup-support-optional-duktape.patch diff --git a/meta-oe/recipes-extended/polkit/polkit/0003-Added-support-for-duktape-as-JS-engine.patch b/meta-oe/recipes-extended/polkit/polkit/0003-Added-support-for-duktape-as-JS-engine.patch index e44e4f6e4a..b8562f8ce2 100644 --- a/meta-oe/recipes-extended/polkit/polkit/0003-Added-support-for-duktape-as-JS-engine.patch +++ b/meta-oe/recipes-extended/polkit/polkit/0003-Added-support-for-duktape-as-JS-engine.patch @@ -1,15 +1,18 @@ -From eaecfb21e1bca42e99321cc731e21dbfc1ea0d0c Mon Sep 17 00:00:00 2001 +From 4af72493cb380ab5ce0dd7c5bcd25a8b5457d770 Mon Sep 17 00:00:00 2001 From: Gustavo Lima Chaves Date: Tue, 25 Jan 2022 09:43:21 +0000 -Subject: [PATCH 3/3] Added support for duktape as JS engine +Subject: [PATCH] Added support for duktape as JS engine Original author: Wu Xiaotian (@yetist) Resurrection author, runaway-killer author: Gustavo Lima Chaves (@limachaves) Signed-off-by: Mikko Rapeli +Upstream-Status: Backport [c7fc4e1b61f0fd82fc697c19c604af7e9fb291a2] +Dropped change to .gitlab-ci.yml and adapted configure.ac due to other +patches in meta-oe. + --- - .gitlab-ci.yml | 1 + buildutil/ax_pthread.m4 | 522 ++++++++ configure.ac | 34 +- docs/man/polkit.xml | 4 +- @@ -23,16 +26,12 @@ Signed-off-by: Mikko Rapeli .../polkitbackendjsauthority.cpp | 721 +---------- .../etc/polkit-1/rules.d/10-testing.rules | 6 +- .../test-polkitbackendjsauthority.c | 2 +- - 14 files changed, 2399 insertions(+), 678 deletions(-) + 13 files changed, 2398 insertions(+), 678 deletions(-) create mode 100644 buildutil/ax_pthread.m4 create mode 100644 src/polkitbackend/polkitbackendcommon.c create mode 100644 src/polkitbackend/polkitbackendcommon.h create mode 100644 src/polkitbackend/polkitbackendduktapeauthority.c -Upstream-Status: Backport [c7fc4e1b61f0fd82fc697c19c604af7e9fb291a2] -Dropped change to .gitlab-ci.yml and adapted configure.ac due to other -patches in meta-oe. - diff --git a/buildutil/ax_pthread.m4 b/buildutil/ax_pthread.m4 new file mode 100644 index 0000000..9f35d13 @@ -603,7 +602,7 @@ index b625743..bbf4768 100644 +CC="$PTHREAD_CC" +AC_CHECK_FUNCS([pthread_condattr_setclock]) + - AC_CHECK_FUNCS(clearenv fdatasync setnetgrent) + AC_CHECK_FUNCS(clearenv fdatasync) if test "x$GCC" = "xyes"; then @@ -581,6 +598,13 @@ echo " @@ -3458,6 +3457,3 @@ index f97e0e0..2103b17 100644 }, { --- -2.20.1 - diff --git a/meta-oe/recipes-extended/polkit/polkit/0003-make-netgroup-support-optional.patch b/meta-oe/recipes-extended/polkit/polkit/0004-Make-netgroup-support-optional.patch similarity index 74% rename from meta-oe/recipes-extended/polkit/polkit/0003-make-netgroup-support-optional.patch rename to meta-oe/recipes-extended/polkit/polkit/0004-Make-netgroup-support-optional.patch index 1a268f2d0d..fa273d4503 100644 --- a/meta-oe/recipes-extended/polkit/polkit/0003-make-netgroup-support-optional.patch +++ b/meta-oe/recipes-extended/polkit/polkit/0004-Make-netgroup-support-optional.patch @@ -1,36 +1,43 @@ -From 0c1debb380fee7f5b2bc62406e45856dc9c9e1a1 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 22 May 2019 13:18:55 -0700 -Subject: [PATCH] make netgroup support optional +From 7ef2621ab7adcedc099ed39acfb73c6fa835cbc3 Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" +Date: Sun, 15 May 2022 05:04:10 +0000 +Subject: [PATCH] Make netgroup support optional -On at least Linux/musl and Linux/uclibc, netgroup -support is not available. PolKit fails to compile on these systems -for that reason. +On at least Linux/musl and Linux/uclibc, netgroup support is not +available. PolKit fails to compile on these systems for that reason. This change makes netgroup support conditional on the presence of the setnetgrent(3) function which is required for the support to work. If that function is not available on the system, an error will be returned to the administrator if unix-netgroup: is specified in configuration. -Fixes bug 50145. +(sam: rebased for Meson and Duktape.) -Closes polkit/polkit#14. +Closes: https://gitlab.freedesktop.org/polkit/polkit/-/issues/14 +Closes: https://gitlab.freedesktop.org/polkit/polkit/-/issues/163 +Closes: https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/52 Signed-off-by: A. Wilcox -Signed-off-by: Khem Raj + +Ported back the change in configure.ac (upstream removed autotools +support). + +Upstream-Status: Backport [https://gitlab.freedesktop.org/polkit/polkit/-/commit/b57deee8178190a7ecc75290fa13cf7daabc2c66] +Signed-off-by: Marta Rybczynska --- - configure.ac | 2 +- - src/polkit/polkitidentity.c | 16 ++++++++++++++++ - src/polkit/polkitunixnetgroup.c | 3 +++ - .../polkitbackendinteractiveauthority.c | 14 ++++++++------ - src/polkitbackend/polkitbackendjsauthority.cpp | 3 +++ - test/polkit/polkitidentitytest.c | 9 ++++++++- - test/polkit/polkitunixnetgrouptest.c | 3 +++ - .../test-polkitbackendjsauthority.c | 2 ++ - 8 files changed, 44 insertions(+), 8 deletions(-) + configure.ac | 2 +- + meson.build | 1 + + src/polkit/polkitidentity.c | 17 +++++++++++++++++ + src/polkit/polkitunixnetgroup.c | 3 +++ + .../polkitbackendinteractiveauthority.c | 14 ++++++++------ + src/polkitbackend/polkitbackendjsauthority.cpp | 2 ++ + test/polkit/polkitidentitytest.c | 8 +++++++- + test/polkit/polkitunixnetgrouptest.c | 2 ++ + .../test-polkitbackendjsauthority.c | 2 ++ + 9 files changed, 43 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac -index b625743..d807086 100644 +index 59858df..5a7fc11 100644 --- a/configure.ac +++ b/configure.ac @@ -100,7 +100,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXPAT_LIBS="-lexpat"], @@ -42,8 +49,20 @@ index b625743..d807086 100644 if test "x$GCC" = "xyes"; then LDFLAGS="-Wl,--as-needed $LDFLAGS" +diff --git a/meson.build b/meson.build +index 733bbff..d840926 100644 +--- a/meson.build ++++ b/meson.build +@@ -82,6 +82,7 @@ config_h.set('_GNU_SOURCE', true) + check_functions = [ + 'clearenv', + 'fdatasync', ++ 'setnetgrent', + ] + + foreach func: check_functions diff --git a/src/polkit/polkitidentity.c b/src/polkit/polkitidentity.c -index 3aa1f7f..10e9c17 100644 +index 3aa1f7f..793f17d 100644 --- a/src/polkit/polkitidentity.c +++ b/src/polkit/polkitidentity.c @@ -182,7 +182,15 @@ polkit_identity_from_string (const gchar *str, @@ -62,7 +81,7 @@ index 3aa1f7f..10e9c17 100644 } if (identity == NULL && (error != NULL && *error == NULL)) -@@ -344,6 +352,13 @@ polkit_identity_new_for_gvariant (GVariant *variant, +@@ -344,6 +352,14 @@ polkit_identity_new_for_gvariant (GVariant *variant, GVariant *v; const char *name; @@ -73,10 +92,11 @@ index 3aa1f7f..10e9c17 100644 + "Netgroups are not available on this machine"); + goto out; +#else ++ v = lookup_asv (details_gvariant, "name", G_VARIANT_TYPE_STRING, error); if (v == NULL) { -@@ -353,6 +368,7 @@ polkit_identity_new_for_gvariant (GVariant *variant, +@@ -353,6 +369,7 @@ polkit_identity_new_for_gvariant (GVariant *variant, name = g_variant_get_string (v, NULL); ret = polkit_unix_netgroup_new (name); g_variant_unref (v); @@ -144,10 +164,10 @@ index 056d9a8..36c2f3d 100644 } diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp -index ca17108..41d8d5c 100644 +index 5027815..bcb040c 100644 --- a/src/polkitbackend/polkitbackendjsauthority.cpp +++ b/src/polkitbackend/polkitbackendjsauthority.cpp -@@ -1520,6 +1520,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, +@@ -1524,6 +1524,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, JS::CallArgs args = JS::CallArgsFromVp (argc, vp); @@ -155,28 +175,19 @@ index ca17108..41d8d5c 100644 JS::RootedString usrstr (authority->priv->cx); usrstr = args[0].toString(); user = JS_EncodeStringToUTF8 (cx, usrstr); -@@ -1535,6 +1536,8 @@ js_polkit_user_is_in_netgroup (JSContext *cx, +@@ -1538,6 +1539,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, + { is_in_netgroup = true; } - +#endif -+ + ret = true; - args.rval ().setBoolean (is_in_netgroup); diff --git a/test/polkit/polkitidentitytest.c b/test/polkit/polkitidentitytest.c -index e91967b..e829aaa 100644 +index e91967b..2635c4c 100644 --- a/test/polkit/polkitidentitytest.c +++ b/test/polkit/polkitidentitytest.c -@@ -19,6 +19,7 @@ - * Author: Nikki VonHollen - */ - -+#include "config.h" - #include "glib.h" - #include - #include -@@ -145,11 +146,15 @@ struct ComparisonTestData comparison_test_data [] = { +@@ -145,11 +145,15 @@ struct ComparisonTestData comparison_test_data [] = { {"unix-group:root", "unix-group:jane", FALSE}, {"unix-group:jane", "unix-group:jane", TRUE}, @@ -192,7 +203,7 @@ index e91967b..e829aaa 100644 {NULL}, }; -@@ -181,11 +186,13 @@ main (int argc, char *argv[]) +@@ -181,11 +185,13 @@ main (int argc, char *argv[]) g_test_add_data_func ("/PolkitIdentity/group_string_2", "unix-group:jane", test_string); g_test_add_data_func ("/PolkitIdentity/group_string_3", "unix-group:users", test_string); @@ -208,18 +219,10 @@ index e91967b..e829aaa 100644 add_comparison_tests (); diff --git a/test/polkit/polkitunixnetgrouptest.c b/test/polkit/polkitunixnetgrouptest.c -index 3701ba1..e3352eb 100644 +index 3701ba1..e1d211e 100644 --- a/test/polkit/polkitunixnetgrouptest.c +++ b/test/polkit/polkitunixnetgrouptest.c -@@ -19,6 +19,7 @@ - * Author: Nikki VonHollen - */ - -+#include "config.h" - #include "glib.h" - #include - #include -@@ -69,7 +70,9 @@ int +@@ -69,7 +69,9 @@ int main (int argc, char *argv[]) { g_test_init (&argc, &argv, NULL); diff --git a/meta-oe/recipes-extended/polkit/polkit/0005-Make-netgroup-support-optional-duktape.patch b/meta-oe/recipes-extended/polkit/polkit/0005-Make-netgroup-support-optional-duktape.patch new file mode 100644 index 0000000000..12988ad94f --- /dev/null +++ b/meta-oe/recipes-extended/polkit/polkit/0005-Make-netgroup-support-optional-duktape.patch @@ -0,0 +1,34 @@ +From 792f8e2151c120ec51b50a4098e4f9642409cbec Mon Sep 17 00:00:00 2001 +From: Marta Rybczynska +Date: Fri, 29 Jul 2022 11:52:59 +0200 +Subject: [PATCH] Make netgroup support optional + +This patch adds a fragment of the netgroup patch to apply on the duktape-related +code. This change is needed to compile with duktape+musl. + +Upstream-Status: Backport [https://gitlab.freedesktop.org/polkit/polkit/-/commit/b57deee8178190a7ecc75290fa13cf7daabc2c66] +Signed-off-by: Marta Rybczynska +--- + src/polkitbackend/polkitbackendduktapeauthority.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/polkitbackend/polkitbackendduktapeauthority.c b/src/polkitbackend/polkitbackendduktapeauthority.c +index c89dbcf..58a5936 100644 +--- a/src/polkitbackend/polkitbackendduktapeauthority.c ++++ b/src/polkitbackend/polkitbackendduktapeauthority.c +@@ -1036,6 +1036,7 @@ js_polkit_user_is_in_netgroup (duk_context *cx) + user = duk_require_string (cx, 0); + netgroup = duk_require_string (cx, 1); + ++#ifdef HAVE_SETNETGRENT + if (innetgr (netgroup, + NULL, /* host */ + user, +@@ -1043,6 +1044,7 @@ js_polkit_user_is_in_netgroup (duk_context *cx) + { + is_in_netgroup = TRUE; + } ++#endif + + duk_push_boolean (cx, is_in_netgroup); + return 1; diff --git a/meta-oe/recipes-extended/polkit/polkit_0.119.bb b/meta-oe/recipes-extended/polkit/polkit_0.119.bb index 9444cb9f2d..eff80cd43d 100644 --- a/meta-oe/recipes-extended/polkit/polkit_0.119.bb +++ b/meta-oe/recipes-extended/polkit/polkit_0.119.bb @@ -24,10 +24,10 @@ PACKAGECONFIG[consolekit] = ",,,consolekit" PAM_SRC_URI = "file://polkit-1_pam.patch" SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ - file://0003-make-netgroup-support-optional.patch \ file://0001-pkexec-local-privilege-escalation-CVE-2021-4034.patch \ file://0002-CVE-2021-4115-GHSL-2021-077-fix.patch \ file://0003-Added-support-for-duktape-as-JS-engine.patch \ + file://0004-Make-netgroup-support-optional.patch \ " SRC_URI[sha256sum] = "c8579fdb86e94295404211285fee0722ad04893f0213e571bd75c00972fd1f5c" From patchwork Mon Aug 8 14:22:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 11136 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 EA369C25B08 for ; Mon, 8 Aug 2022 14:25:08 +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.web10.26171.1659968707949884940 for ; Mon, 08 Aug 2022 07:25:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=o81cPmVW; spf=pass (domain: gmail.com, ip: 209.85.216.54, mailfrom: akuster808@gmail.com) Received: by mail-pj1-f54.google.com with SMTP id t2-20020a17090a4e4200b001f21572f3a4so9290973pjl.0 for ; Mon, 08 Aug 2022 07:25:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=PQeRRJH1egG5YIbEvyeH0yX0gSeniJT0nk38BjYqWmI=; b=o81cPmVWOPn4UpCK0/DP+ngasVC51lyrrkY6y3WPc6oeIXrsiX15aI9YeewZVyw4B7 O9/paxqCVLXzYJPb7DQnc5ECq+1aOjYif8S0wdHULQ64djQN5QksU+EkgtkNmYG2367h NU+zaRFnB78ZD1zJ1Y4X+ONRcuhI4rPIyw8CCdtj0gNuTdL6owfDecqe02ngD0BMrCH5 /e9C3gy576eHsGMbIoHCYPFF2hqgdmXZAzgQxkRxXjfXxKD2NawNPhEUGzck5GwL9p3Q lWY9OC3o2AE5h53EWgThL6g95K1ecFLagMV4N40/Q1OI/L6U6vIWpHt2vGdUkqHQBfbt 7DUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PQeRRJH1egG5YIbEvyeH0yX0gSeniJT0nk38BjYqWmI=; b=d9aQaKNwhfBrJjL8NJz4sQNMPU7CrMNpmbQ9MIR7dtGV3/vCcUbPnhbl4o2ZnniWXL ljMLOhTHqtuy3G8Ocek1LyQMb1k7kWbMZil25nP7qxgjJqWmmo8R/ddY6yyZI2ASmuZm TqSXyMoY4RnoASHCB7VKG7EZoRZmKe94HqH9wrWFJKlaQzU8Kg+6iy+WXHuuje/y++41 Jy8FePAkxfhuPyqrP/UsnIkV5u4nhv+kLt+gqlR1NsmO1FlGW4FkX08jYz17mIsEC2Wg 5xBWUwfufRpUzCrYGVesvLU8Xb+YMfuCukINZO9GHOaiYJt/ATB2c0vLLvlgKGPL2k5g /2HA== X-Gm-Message-State: ACgBeo16FUuDh9gNu4ucr+xqW85G9MqIFSPDITaLBKQeWCgTNLyEEugX 14dzLi6QIer9JwxcS3WuYYvwXewBlPo= X-Google-Smtp-Source: AA6agR4lnP3eRbzvI8g35rx+dWiiBWU3IKXnP9F3SM4LnnDuWsTPl9Coph0H7UWBxEkyA2Yjm5+j5g== X-Received: by 2002:a17:902:e5d1:b0:16f:15a1:6dbc with SMTP id u17-20020a170902e5d100b0016f15a16dbcmr18853909plf.73.1659968706996; Mon, 08 Aug 2022 07:25:06 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id u8-20020a1709026e0800b0016f1204cde8sm8757492plk.301.2022.08.08.07.25.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 07:25:06 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 06/13] ibus: Swith to use main branch instead of master Date: Mon, 8 Aug 2022 07:22:45 -0700 Message-Id: <72d3abde62f208f4f9a1e19cd8a773c93b6e6aa7.1659968069.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 08 Aug 2022 14:25:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98166 From: Khem Raj Upstream has switched to using main for tip of trunk, therefore follow it here in SRC_URI as well. Signed-off-by: Khem Raj Suggested-by: Fabio Estevam Reported-by: Markus Volk (cherry picked from commit ca5f1dde541689f6a479a914ec742a3bf46dfbe1) Signed-off-by: Armin Kuster --- meta-gnome/recipes-support/ibus/ibus.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-gnome/recipes-support/ibus/ibus.inc b/meta-gnome/recipes-support/ibus/ibus.inc index 37a490abe0..bb662f2ec9 100644 --- a/meta-gnome/recipes-support/ibus/ibus.inc +++ b/meta-gnome/recipes-support/ibus/ibus.inc @@ -10,7 +10,7 @@ PV = "1.5.26" DEPENDS = "unicode-ucd" SRC_URI = " \ - git://github.com/ibus/ibus.git;branch=master;protocol=https \ + git://github.com/ibus/ibus.git;branch=main;protocol=https \ file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \ " SRCREV = "6a70ab0338206bd1c7d01a4e1874ea0ee5b3a9d3" From patchwork Mon Aug 8 14:22:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 11144 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 0841FC48BEA for ; Mon, 8 Aug 2022 14:25:19 +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.web09.25876.1659968709873341622 for ; Mon, 08 Aug 2022 07:25:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=aCnKjbaQ; spf=pass (domain: gmail.com, ip: 209.85.210.172, mailfrom: akuster808@gmail.com) Received: by mail-pf1-f172.google.com with SMTP id d20so8238631pfq.5 for ; Mon, 08 Aug 2022 07:25:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=t1dD6QJR+z2NswpNIM2DNa+2t1H+eixBapFca/TudEs=; b=aCnKjbaQFXBgBE2dT1aOQtRKeGJs0G+JNdkTwh2Uikx03XxX8Mz29KXvW70lvwU1mr CCuRV9lDv/JKz/G3qUEPGZfWcwxC8D9JJOFkb6FHVvgwQWJIqUXcFJxNu1GL0dfpMS3z rJ4+8aYA2zkjbO6tm9BX5wwwYqtx4HUixeAEOInbfoCuCzndmds5DU53qgFQV6V2OlE+ 6qC7oGCXoRvDEY91yIjYaa1UoeG3qPk484uJ2jj+J7WJ6CqaqB4sCxjJZ0jrNH9yNbPF sCBYZAfrhteMADu/bbx0kuaOn7qw2ZxLzIa8Zx8cSA+I+2puoHZy8MJxc7j0i42U9/sL nsgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=t1dD6QJR+z2NswpNIM2DNa+2t1H+eixBapFca/TudEs=; b=yapq53VzzQ4c8MdRtKxExYXGNVtNEoS+rit/9xAhJjZsX5UW14DaqNm49/7us9eDwd /XbMHqETDR0WlGMpgoR6Y6B4t/wPoAhwLrqTynv2A6MRG3LEwXu/8+84dnhl4F7G4lHG iDO4Hz/k4pR3KMPYLv9HEwGXSlOORqanvqjFeUfKAdeslTkfCz0j1C2sQrcZx8MmqVf/ RSFFw24bOXCy2tYG59tAzhYp7QdGS6BSvfeet77KYFf3FwvkcDLIfNHCsTw3dIuzi/fU 6cp27rcilF1ry382jK3qeec0H30IJIj6VOkxXYXGXq8IcchVw5PRzfgcjr9HWWhvj2Oi 4WJw== X-Gm-Message-State: ACgBeo3PxfU3ax04XGV3qnGsk9uz0BRTKXaGdR/zJEmgqKunJ21PMLea s5n+gD/YNQjRqqGedd0ZNyAeYVIATys= X-Google-Smtp-Source: AA6agR7eJdYZaKNXSqXkhD840yNCI2LUdmrETXYCEma4x99QKDFwrRqjdF7wq+pBFNVq8QKCGIDM9Q== X-Received: by 2002:a63:170d:0:b0:415:f76d:45e1 with SMTP id x13-20020a63170d000000b00415f76d45e1mr15718255pgl.171.1659968708866; Mon, 08 Aug 2022 07:25:08 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id u8-20020a1709026e0800b0016f1204cde8sm8757492plk.301.2022.08.08.07.25.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 07:25:07 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 07/13] net-snmp: set ac_cv_path_PSPROG Date: Mon, 8 Aug 2022 07:22:46 -0700 Message-Id: <2594e977785f3ba5116125927de17e51f3b6a07d.1659968069.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 08 Aug 2022 14:25:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98167 From: Mingli Yu Fixes: WARNING: net-snmp-5.9.1-r0 do_package_qa: QA Issue: File /usr/include/net-snmp/net-snmp-config-64.h in package net-snmp-dev contains reference to TMPDIR File /usr/bin/net-snmp-create-v3-user in package net-snmp-dev contains reference to TMPDIR [buildpaths] WARNING: net-snmp-5.9.1-r0 do_package_qa: QA Issue: File /usr/lib/net-snmp/ptest/include/net-snmp/net-snmp-config.h in package net-snmp-ptest contains reference to TMPDIR [buildpaths] Signed-off-by: Mingli Yu Signed-off-by: Khem Raj (cherry picked from commit 1bf83255aee9850bf5ce5138c4bdefbe9eeb120c) Signed-off-by: Armin Kuster --- meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb index 5f887b8868..30c0ce74cb 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb @@ -72,6 +72,7 @@ CACHED_CONFIGUREVARS = " \ ac_cv_ETC_MNTTAB=/etc/mtab \ lt_cv_shlibpath_overrides_runpath=yes \ ac_cv_path_UNAMEPROG=${base_bindir}/uname \ + ac_cv_path_PSPROG=${base_bindir}/ps \ ac_cv_file__etc_printcap=no \ NETSNMP_CONFIGURE_OPTIONS= \ " From patchwork Mon Aug 8 14:22:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 11146 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 1368AC25B08 for ; Mon, 8 Aug 2022 14:25:19 +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.web12.26242.1659968711232821746 for ; Mon, 08 Aug 2022 07:25:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=RAvwD4tp; spf=pass (domain: gmail.com, ip: 209.85.214.175, mailfrom: akuster808@gmail.com) Received: by mail-pl1-f175.google.com with SMTP id x23so8706021pll.7 for ; Mon, 08 Aug 2022 07:25:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=0sBxPiwAONBPcBBObMtS3BDX5DtvObXZeOafqZgYvDM=; b=RAvwD4tpx7/40MRE8WIFVE8DAXkeD7q9ht6yTOVudc+nbsjNeQfTjXtXy8mKjSSHjw 12/tipfrUhLp+RIJR/G0mS8W8QBJ44KB8VKn9a+Sscx65wtJGcHfIzqXJlg4dPQaVFBa 3XjBcIT8rnhLYQ6cUcUEqaIn6uhCS+n2+oxK/hWb3RCPSgwwq3iQT6JX664wqx6wT3Dz xG6TGKLlJg6JJRwok8I/iclqmcFJDQsa0uTb5jLBkEeu0AV+/IUAd2b8kC4kvAKZlBOB 7umVTr3iTSgCegbyQlnpQnB2/WzGcck7Y1hVcJqGQ4mdSxE2CazfL+GEpyPCHXcigvoj Ph3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0sBxPiwAONBPcBBObMtS3BDX5DtvObXZeOafqZgYvDM=; b=3yyMka/gMv4jr5aWKbePBwRfoyUk3oroLSKN/i0hkm37aKkGQJWQ+/ip7+7/gTR9P0 iBKW+khMxvhve0BkD1ipdbVZgMgB0FrmnTgJmEUF8LdKELgn7yo76WkEw9QUqVRJVH7f SSnPrBIshB50iBDhn8Fzty8rrkE7vlriyNfTdiq+4BSYA7h839TQAY7Xq61k7pA3RbN5 eygqbBux+NWqmqu7Cs/V7vSM6KAQg02fXt6FMUogbFfjjlbSKIEQ1qbxEIamH1hVXSRV Qqrg+4FQ7McaFEGoER9GfMtA467k0ye7PTpTaXeSXNB5cYMGI8OVcPiQdyUsuGzJ7pJJ e5mA== X-Gm-Message-State: ACgBeo2rG9L4eWiU/GqGZp5B1VHt56ZESXchuKrSUi4GucNWGk7e58/E N886t0NyB1t2rXSGKWBTUk8yhX9E+50= X-Google-Smtp-Source: AA6agR4cYdsXnE9e14dDKpkqo5jRMt9M3TeP316kTxyWKyNA9c8Mg1hnT9zz4nnqZci3pngfoVu+dQ== X-Received: by 2002:a17:902:f688:b0:16f:4b4:fc18 with SMTP id l8-20020a170902f68800b0016f04b4fc18mr18405853plg.49.1659968710125; Mon, 08 Aug 2022 07:25:10 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id u8-20020a1709026e0800b0016f1204cde8sm8757492plk.301.2022.08.08.07.25.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 07:25:09 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 08/13] postgresql: Fix the buildpaths issue Date: Mon, 8 Aug 2022 07:22:47 -0700 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 08 Aug 2022 14:25:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98168 From: Mingli Yu Fixes: WARNING: postgresql-14.4-r0 do_package_qa: QA Issue: File /usr/bin/postgres in package postgresql contains reference to TMPDIR File /usr/bin/pg_config in package postgresql contains reference to TMPDIR [buildpaths] WARNING: postgresql-14.4-r0 do_package_qa: QA Issue: File /usr/include/pg_config.h in package libpq-dev contains reference to TMPDIR [buildpaths] WARNING: postgresql-14.4-r0 do_package_qa: QA Issue: File /usr/include/postgresql/server/pg_config.h in package postgresql-server-dev contains reference to TMPDIR File /usr/lib/postgresql/pgxs/src/Makefile.global in package postgresql-server-dev contains reference to TMPDIR [buildpaths] WARNING: postgresql-14.4-r0 do_package_qa: QA Issue: File /usr/lib/libpgcommon.a in package postgresql-staticdev contains reference to TMPDIR File /usr/lib/libpgcommon_shlib.a in package postgresql-staticdev contains reference to TMPDIR [buildpaths] Signed-off-by: Mingli Yu Signed-off-by: Khem Raj (cherry picked from commit 59eff6269c4f4c150d976054d585872c92f20207) Signed-off-by: Armin Kuster --- ...-config_info.c-not-expose-build-info.patch | 110 ++++++++++++++++++ meta-oe/recipes-dbs/postgresql/postgresql.inc | 8 ++ .../recipes-dbs/postgresql/postgresql_14.4.bb | 1 + 3 files changed, 119 insertions(+) create mode 100644 meta-oe/recipes-dbs/postgresql/files/0001-config_info.c-not-expose-build-info.patch diff --git a/meta-oe/recipes-dbs/postgresql/files/0001-config_info.c-not-expose-build-info.patch b/meta-oe/recipes-dbs/postgresql/files/0001-config_info.c-not-expose-build-info.patch new file mode 100644 index 0000000000..101a748776 --- /dev/null +++ b/meta-oe/recipes-dbs/postgresql/files/0001-config_info.c-not-expose-build-info.patch @@ -0,0 +1,110 @@ +From b92eebe8b0760fee7bd55c6c22318620c2c07579 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Mon, 1 Aug 2022 15:44:38 +0800 +Subject: [PATCH] config_info.c: not expose build info + +Don't collect the build information to fix the buildpaths issue. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Mingli Yu +--- + configure.ac | 2 +- + src/common/config_info.c | 68 ---------------------------------------- + 2 files changed, 1 insertion(+), 69 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0eb595b..508487b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -23,7 +23,7 @@ AC_COPYRIGHT([Copyright (c) 1996-2021, PostgreSQL Global Development Group]) + AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) + AC_CONFIG_AUX_DIR(config) + AC_PREFIX_DEFAULT(/usr/local/pgsql) +-AC_DEFINE_UNQUOTED(CONFIGURE_ARGS, ["$ac_configure_args"], [Saved arguments from configure]) ++AC_DEFINE_UNQUOTED(CONFIGURE_ARGS, ["ac_configure_args"], [Saved arguments from configure]) + + [PG_MAJORVERSION=`expr "$PACKAGE_VERSION" : '\([0-9][0-9]*\)'`] + [PG_MINORVERSION=`expr "$PACKAGE_VERSION" : '.*\.\([0-9][0-9]*\)'`] +diff --git a/src/common/config_info.c b/src/common/config_info.c +index e72e729..b482c20 100644 +--- a/src/common/config_info.c ++++ b/src/common/config_info.c +@@ -123,74 +123,6 @@ get_configdata(const char *my_exec_path, size_t *configdata_len) + configdata[i].setting = pstrdup(path); + i++; + +- configdata[i].name = pstrdup("CONFIGURE"); +- configdata[i].setting = pstrdup(CONFIGURE_ARGS); +- i++; +- +- configdata[i].name = pstrdup("CC"); +-#ifdef VAL_CC +- configdata[i].setting = pstrdup(VAL_CC); +-#else +- configdata[i].setting = pstrdup(_("not recorded")); +-#endif +- i++; +- +- configdata[i].name = pstrdup("CPPFLAGS"); +-#ifdef VAL_CPPFLAGS +- configdata[i].setting = pstrdup(VAL_CPPFLAGS); +-#else +- configdata[i].setting = pstrdup(_("not recorded")); +-#endif +- i++; +- +- configdata[i].name = pstrdup("CFLAGS"); +-#ifdef VAL_CFLAGS +- configdata[i].setting = pstrdup(VAL_CFLAGS); +-#else +- configdata[i].setting = pstrdup(_("not recorded")); +-#endif +- i++; +- +- configdata[i].name = pstrdup("CFLAGS_SL"); +-#ifdef VAL_CFLAGS_SL +- configdata[i].setting = pstrdup(VAL_CFLAGS_SL); +-#else +- configdata[i].setting = pstrdup(_("not recorded")); +-#endif +- i++; +- +- configdata[i].name = pstrdup("LDFLAGS"); +-#ifdef VAL_LDFLAGS +- configdata[i].setting = pstrdup(VAL_LDFLAGS); +-#else +- configdata[i].setting = pstrdup(_("not recorded")); +-#endif +- i++; +- +- configdata[i].name = pstrdup("LDFLAGS_EX"); +-#ifdef VAL_LDFLAGS_EX +- configdata[i].setting = pstrdup(VAL_LDFLAGS_EX); +-#else +- configdata[i].setting = pstrdup(_("not recorded")); +-#endif +- i++; +- +- configdata[i].name = pstrdup("LDFLAGS_SL"); +-#ifdef VAL_LDFLAGS_SL +- configdata[i].setting = pstrdup(VAL_LDFLAGS_SL); +-#else +- configdata[i].setting = pstrdup(_("not recorded")); +-#endif +- i++; +- +- configdata[i].name = pstrdup("LIBS"); +-#ifdef VAL_LIBS +- configdata[i].setting = pstrdup(VAL_LIBS); +-#else +- configdata[i].setting = pstrdup(_("not recorded")); +-#endif +- i++; +- + configdata[i].name = pstrdup("VERSION"); + configdata[i].setting = pstrdup("PostgreSQL " PG_VERSION); + i++; +-- +2.25.1 + diff --git a/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-oe/recipes-dbs/postgresql/postgresql.inc index 00c0107469..bef33e6bb4 100644 --- a/meta-oe/recipes-dbs/postgresql/postgresql.inc +++ b/meta-oe/recipes-dbs/postgresql/postgresql.inc @@ -215,6 +215,14 @@ do_install:append() { install -m 0644 ${WORKDIR}/postgresql.service ${D}${systemd_unitdir}/system sed -i -e 's,@BINDIR@,${bindir},g' \ ${D}${systemd_unitdir}/system/postgresql.service + # Remove the build path + if [ -f ${D}${libdir}/${BPN}/pgxs/src/Makefile.global ]; then + sed -i -e 's#${RECIPE_SYSROOT}##g' \ + -e 's#${RECIPE_SYSROOT_NATIVE}##g' \ + -e 's#${WORKDIR}##g' \ + -e 's#${TMPDIR}##g' \ + ${D}${libdir}/${BPN}/pgxs/src/Makefile.global + fi } SSTATE_SCAN_FILES += "Makefile.global" diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_14.4.bb b/meta-oe/recipes-dbs/postgresql/postgresql_14.4.bb index 64e83b2cde..1daab22f92 100644 --- a/meta-oe/recipes-dbs/postgresql/postgresql_14.4.bb +++ b/meta-oe/recipes-dbs/postgresql/postgresql_14.4.bb @@ -8,6 +8,7 @@ SRC_URI += "\ file://0001-Improve-reproducibility.patch \ file://0001-configure.ac-bypass-autoconf-2.69-version-check.patch \ file://remove_duplicate.patch \ + file://0001-config_info.c-not-expose-build-info.patch \ " SRC_URI[sha256sum] = "c23b6237c5231c791511bdc79098617d6852e9e3bdf360efd8b5d15a1a3d8f6a" From patchwork Mon Aug 8 14:22:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 11145 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 136DFC25B0D for ; Mon, 8 Aug 2022 14:25:19 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web09.25879.1659968713722983131 for ; Mon, 08 Aug 2022 07:25:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=qOeJKuQ6; spf=pass (domain: gmail.com, ip: 209.85.216.49, mailfrom: akuster808@gmail.com) Received: by mail-pj1-f49.google.com with SMTP id o3-20020a17090a0a0300b001f7649cd317so1616184pjo.0 for ; Mon, 08 Aug 2022 07:25:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=/Wg481gMWcu/fBGI3mFJHxhWgh0L1AQyYr/QD3dfevQ=; b=qOeJKuQ6WlS5JpuADkScuZ8LugPnihOgUFyhQfQR5/HGk8DtMFjbbE7Y6gty3ZN2Y8 wddAn/aRzlWTac5Kpb5EWSjSondozLJpHVG50b0fFMmb3UPvi/Earb/S++5ibPaTzdXp XStJsDgFOsbDkK7lVZ+HzIjCE8IATLkMyoz+heaqEjskeyvbimGkTnhYWhTqbt6x8gGI Xlu7tdu2wfSaeiQms2acRo3FH8Ze3QBcogzQaNHMBGYxgn/GuO4wKaUw0naNyalE4yEZ 1fS2Ob2ic8o27w0kfAgEfc6KCyIXi88oS3JYdkO77j2cyGXoaoGqxo6/dh3IVzZDXPVG 5K3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/Wg481gMWcu/fBGI3mFJHxhWgh0L1AQyYr/QD3dfevQ=; b=QzSoBdlox0hpt5AGLdUVF370A36U/n+HVtJ/e/CKTBJUSuXZkkpzXm+kUNh4HyyKZo 1UyePFVAscHzZ8YoRROPeos3wUaopE/SVszUvJY3UDSIfzmyBsbnjV+anct9eB25voUm QIeTkAT/GtDildSyb7SqVevFCVnlp77qrqvIQGbwnerFt2D2LT8T44RARCZcFCom3d39 GK0L8Spytx5Va20YHXZ5+/1JKapCCvT1rPue3VUiZZUF7t5wLpJLxlVnfZlPIZ8O+t8j /ahg+tLyIPpE+6+waLtxeDN0gZN69jPoHRlShWzpz0Sq/CRn7F+ai2UXefvkZOuxPFm9 Jnkg== X-Gm-Message-State: ACgBeo3vhulDxB92sj12kcgsKUVqWuuvL1sj3a9W5IKk/QYVPRcwoD87 u4c3km159xP34frBzmu8wr4Tblcv/eI= X-Google-Smtp-Source: AA6agR5hit8fe+n+tGWYRV/HxbGbOoWoqmU0PWooMRwyUtwScJ0if5dfmZcohhPPhSXa4QrNKYwgdw== X-Received: by 2002:a17:902:70c7:b0:170:9030:8219 with SMTP id l7-20020a17090270c700b0017090308219mr9897132plt.163.1659968712728; Mon, 08 Aug 2022 07:25:12 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id u8-20020a1709026e0800b0016f1204cde8sm8757492plk.301.2022.08.08.07.25.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 07:25:11 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 09/13] freeradius: Fix buildpaths issue Date: Mon, 8 Aug 2022 07:22:48 -0700 Message-Id: <055f26ce9a2607b7412730de728abd6305fd4c80.1659968069.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 08 Aug 2022 14:25:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98169 From: Mingli Yu Fixes: WARNING: freeradius-3.0.21-r0 do_package_qa: QA Issue: File /usr/bin/radeapclient in package freeradius-utils contains reference to TMPDIR [buildpaths] WARNING: freeradius-3.0.21-r0 do_package_qa: QA Issue: File /usr/lib/libfreeradius-server.so.0.0.0 in package freeradius contains reference to TMPDIR [buildpaths] Signed-off-by: Mingli Yu Signed-off-by: Khem Raj (cherry picked from commit 1c91de67b4981f62ddc7308bf88c1a6f4a844fdb) Signed-off-by: Armin Kuster --- ...01-version.c-don-t-print-build-flags.patch | 41 +++++++++++++++++++ .../freeradius/freeradius_3.0.21.bb | 1 + 2 files changed, 42 insertions(+) create mode 100644 meta-networking/recipes-connectivity/freeradius/files/0001-version.c-don-t-print-build-flags.patch diff --git a/meta-networking/recipes-connectivity/freeradius/files/0001-version.c-don-t-print-build-flags.patch b/meta-networking/recipes-connectivity/freeradius/files/0001-version.c-don-t-print-build-flags.patch new file mode 100644 index 0000000000..697205efe0 --- /dev/null +++ b/meta-networking/recipes-connectivity/freeradius/files/0001-version.c-don-t-print-build-flags.patch @@ -0,0 +1,41 @@ +From cbc64dcf6aa2a1be63f45ea6dd7d2c49b70a0bee Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Wed, 3 Aug 2022 16:44:29 +0800 +Subject: [PATCH] version.c: don't print build flags + +Don't print the build flags to avoid collecting the build environment info. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Mingli Yu +--- + src/main/version.c | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/src/main/version.c b/src/main/version.c +index 62972d9f53..cf81de72c9 100644 +--- a/src/main/version.c ++++ b/src/main/version.c +@@ -589,19 +589,6 @@ void version_print(void) + DEBUG2(" unknown"); + #endif + +- DEBUG2("Compilation flags:"); +-#ifdef BUILT_WITH_CPPFLAGS +- DEBUG2(" cppflags : " BUILT_WITH_CPPFLAGS); +-#endif +-#ifdef BUILT_WITH_CFLAGS +- DEBUG2(" cflags : " BUILT_WITH_CFLAGS); +-#endif +-#ifdef BUILT_WITH_LDFLAGS +- DEBUG2(" ldflags : " BUILT_WITH_LDFLAGS); +-#endif +-#ifdef BUILT_WITH_LIBS +- DEBUG2(" libs : " BUILT_WITH_LIBS); +-#endif + DEBUG2(" "); + } + INFO("FreeRADIUS Version " RADIUSD_VERSION_STRING); +-- +2.25.1 + diff --git a/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb b/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb index d6477e340e..1407b798b5 100644 --- a/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb +++ b/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb @@ -32,6 +32,7 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.0.x;lfs=0 file://radiusd.service \ file://radiusd-volatiles.conf \ file://check-openssl-cmds-in-script-bootstrap.patch \ + file://0001-version.c-don-t-print-build-flags.patch \ " raddbdir="${sysconfdir}/${MLPREFIX}raddb" From patchwork Mon Aug 8 14:22:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 11142 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 067D5C00140 for ; Mon, 8 Aug 2022 14:25:19 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web12.26243.1659968714958773731 for ; Mon, 08 Aug 2022 07:25:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ogWaaMw6; spf=pass (domain: gmail.com, ip: 209.85.216.53, mailfrom: akuster808@gmail.com) Received: by mail-pj1-f53.google.com with SMTP id 15-20020a17090a098f00b001f305b453feso14743710pjo.1 for ; Mon, 08 Aug 2022 07:25:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=KVyPBSj47u0whfJcbhjoJAxYLscm8vfSk2nvRYOBfeM=; b=ogWaaMw67yQBud5yGv19xc+pt/pPANqy2FvDEpUyTAzvcolStn258mgBAu4JzEZWDL yPMLNKbi74R8AxXKX435xqUFb0OSjCXHsVV4jWHS9XRLXsykWQHV2yiNGEorZGM1XrUA vwx9LDokLGWKLtuuyqKfd+mOjDj9O0IUFSb8OxW6vm8ZcQ+/xmy4zfigNhezJE8pCE6k aa+kVl9DF4hG+skZ5tyooycO/6ebO1f4Odrk+1lcSD8Y78xW96/zkPpV5vp1SclALpPP eHGRy/hBQJbdmLzezFfnY4URRAq8Eja6BEzSJXNNlgM5KKu4lZ/QE0HLDSeUT92GPlQv 2tcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KVyPBSj47u0whfJcbhjoJAxYLscm8vfSk2nvRYOBfeM=; b=hJmm1yE358hbW+P+I4YT71v941DBw1oQjsRyi0aidAvW7aH3DlP+tzv+F4N2qenPtm LwE2aAZFzbXL1Nfq5DjuEdNQLKcmHnn1YGMrbtf0xRsZDgtLQpYvPIOFx3EirsMjKnLD 7IZdRGf+wpj2Myl0Dp1HhNBU8fobpMzt3Vdqm/DBLO/NyxyFb7Ct21ASeTiZZ9CfFZpc NVXa/cnp6MKsMVMD+kW8bU6V+cvsGypA6uuxQup7i6nsanVfnaFSki1gva2UpGoMtYwA XfsACDh9Dm3V8/7ma55e7dmhtRAADlKQnIv4RviC9u8c2VmHvQ0Uazxqv+GeIC9+QPEK A9Rg== X-Gm-Message-State: ACgBeo0KA1woluWjF01BbU0gJVsmqbE5PIk5fjddxQH3fm2GIu4GBGLF BTIZ9UatSbJmagBasLzhxF2hhhLhb+g= X-Google-Smtp-Source: AA6agR5bCcF9V7A3QFUFiM1G371qtVef1IKTvZUu3B28ccbu27Rf5GLVNxHQRZEqjm3efdng8H67Vg== X-Received: by 2002:a17:90b:3586:b0:1f4:d507:783e with SMTP id mm6-20020a17090b358600b001f4d507783emr28896539pjb.171.1659968713927; Mon, 08 Aug 2022 07:25:13 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id u8-20020a1709026e0800b0016f1204cde8sm8757492plk.301.2022.08.08.07.25.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 07:25:13 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 10/13] openipmi: Fix buildpaths issue Date: Mon, 8 Aug 2022 07:22:49 -0700 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 08 Aug 2022 14:25:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98170 From: Mingli Yu Fixes: WARNING: openipmi-2.0.32-r0 do_package_qa: QA Issue: File /usr/src/debug/openipmi/2.0.32-r0/OpenIPMI-2.0.32/swig/perl/OpenIPMI_wrap.c in package openipmi-src contains reference to TMPDIR [buildpaths] Signed-off-by: Mingli Yu Signed-off-by: Khem Raj (cherry picked from commit 5abd81567d5ed091ed870abf24e51f260747d593) Signed-off-by: Armin Kuster --- meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb b/meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb index c61303b81e..8625afaa74 100644 --- a/meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb +++ b/meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb @@ -85,6 +85,10 @@ do_configure () { done } +do_compile:append () { + sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' ${S}/swig/perl/OpenIPMI_wrap.c +} + do_install:append () { echo "SAL: D = $D" echo "SAL: libdir = $libdir" From patchwork Mon Aug 8 14:22:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 11143 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 06800C3F6B0 for ; Mon, 8 Aug 2022 14:25:19 +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.web08.25910.1659968718539934302 for ; Mon, 08 Aug 2022 07:25:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=YYQKVn/5; spf=pass (domain: gmail.com, ip: 209.85.210.175, mailfrom: akuster808@gmail.com) Received: by mail-pf1-f175.google.com with SMTP id p125so4705994pfp.2 for ; Mon, 08 Aug 2022 07:25:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=+kQSOMazC6n9XCFmvcsU86RvZVKozFF7JZUdGX2IbK0=; b=YYQKVn/5nfnatWWxMXU/X/lmFVmOCWx/40X5y+87keqs/oQ4CR/TRmmc8CGSzyFI/+ CYOmUbNkbg5K1Wof60B3fLO9OMmNdWekTHuC1/4KlNWQ4NK7vzNgwhrivAGh8aIMuj8/ MibDRMCgfhCJdOzZyFCaTjE9JC2ob4cFVntkHsh7lkVIaxfKC+H7EgEdgVAi5TqgzKU4 y6TiCDsohcMGQ1X8UcZG+MZPdPCNuMv7rAcHdl34vAPoiF1taocvzi2kyzbEiarzPtXp rYF/XlhbscqdqxymmoHty67dquif0oYBh00VJbOYO4uGTFShjz7acrW7Zpe2bhIv58qF Q2hQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+kQSOMazC6n9XCFmvcsU86RvZVKozFF7JZUdGX2IbK0=; b=ObLAV5wXJTbCxq6B1y6OZ3EszurcmKmIs7jyLS3VhvCUv+0MCTYbISVJuvI7rCMt4C qAG9DU0fPWJQBrijSId0n1u5iu5ysHr8tVqwJAu5ZEU2/73W6c4ORNzj02VY9cvLrJm6 iVCu2uqT4Pq8C0vbvwmm3KH0bSqMlJy9387nZ7JoEgBcXpyrArNgq9ZjSOb6FdvIphji gh8gFTZgRkoASVpQzu+fBJ5PRmFm8mRuBemKZpq71vfZjd8d0JrXIuPLO9dy7aS65nEB uRD+tkD7Bsf0ImAy2Lo3Byk9lN5nnilyIif1XojzJmBUzobgJ1NW8Yn/iPbhjjFL2Pqq Sy/A== X-Gm-Message-State: ACgBeo1jYYKKOjIE+VFacXrBFTcmkpaRpLBNSOFLnEHbHf3AxYRL9uha 0cdz0T2jBoqMDaa7w/6acfWl+gnWImg= X-Google-Smtp-Source: AA6agR6/fp/tGAi95PaTFBZjdUQF9J1B8vBxm+CFp7iwLv04IGs2rxgxZ/T/9zd/O29eRCfg9Xj0mg== X-Received: by 2002:a63:8543:0:b0:41b:f0b2:ab0 with SMTP id u64-20020a638543000000b0041bf0b20ab0mr15504936pgd.248.1659968717298; Mon, 08 Aug 2022 07:25:17 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id u8-20020a1709026e0800b0016f1204cde8sm8757492plk.301.2022.08.08.07.25.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 07:25:14 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 11/13] apache2: Fix the buildpaths issue Date: Mon, 8 Aug 2022 07:22:50 -0700 Message-Id: <78e65e77992252f0d348f5a7d3a8f86313ed1beb.1659968069.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 08 Aug 2022 14:25:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98171 From: Mingli Yu Fixes: WARNING: apache2-2.4.54-r0 do_package_qa: QA Issue: File /usr/src/debug/apache2/2.4.54-r0/build/server/exports.c in package apache2-src contains reference to TMPDIR [buildpaths] Before the patch: # cat ./build/server/exports.c [snip] #include "mpm_fdqueue.h" const void *ap_ugly_hack = NULL; /* * /buildarea/build/tmp-glibc/work/core2-32-wrs-linux/apache2/2.4.54-r0/httpd-2.4.54/include/ap_expr.h */ const void *ap_hack_ap_expr_exec = (const void *)ap_expr_exec; [snip] After the patch: # cat ./build/server/exports.c [snip] #include "mpm_fdqueue.h" const void *ap_ugly_hack = NULL; /* * ap_expr.h */ const void *ap_hack_ap_expr_exec = (const void *)ap_expr_exec; [snip] Signed-off-by: Mingli Yu Signed-off-by: Khem Raj (cherry picked from commit 4f2025e8d2f1626e97f7e9e675ce3c7d45477807) Signed-off-by: Armin Kuster --- ...make_exports.awk-not-expose-the-path.patch | 32 +++++++++++++++++++ .../recipes-httpd/apache2/apache2_2.4.54.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta-webserver/recipes-httpd/apache2/apache2/0001-make_exports.awk-not-expose-the-path.patch diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0001-make_exports.awk-not-expose-the-path.patch b/meta-webserver/recipes-httpd/apache2/apache2/0001-make_exports.awk-not-expose-the-path.patch new file mode 100644 index 0000000000..78f23f0f2d --- /dev/null +++ b/meta-webserver/recipes-httpd/apache2/apache2/0001-make_exports.awk-not-expose-the-path.patch @@ -0,0 +1,32 @@ +From 5b5eae9cdf3bae91756c717349f2f33a31888f24 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Wed, 3 Aug 2022 12:35:16 +0800 +Subject: [PATCH] make_exports.awk: not expose the path + +Don't print the full path in the comment line. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Mingli Yu +--- + build/make_exports.awk | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/build/make_exports.awk b/build/make_exports.awk +index 1cf0568..44d93c5 100644 +--- a/build/make_exports.awk ++++ b/build/make_exports.awk +@@ -47,7 +47,9 @@ function push(line) { + + function do_output() { + printf("/*\n") +- printf(" * %s\n", FILENAME) ++ file = FILENAME ++ sub("([^/]*[/])*", "", file) ++ printf(" * %s\n", file) + printf(" */\n") + + for (i = 0; i < stackptr; i++) { +-- +2.25.1 + diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb index 4b0ed2f622..37d498f52e 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb @@ -15,6 +15,7 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \ file://0007-apache2-allow-to-disable-selinux-support.patch \ file://0008-Fix-perl-install-directory-to-usr-bin.patch \ file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch \ + file://0001-make_exports.awk-not-expose-the-path.patch \ " SRC_URI:append:class-target = " \ From patchwork Mon Aug 8 14:22:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 11148 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 08698C00140 for ; Mon, 8 Aug 2022 14:25:29 +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.web08.25911.1659968720293693013 for ; Mon, 08 Aug 2022 07:25:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=B1O2vLH6; spf=pass (domain: gmail.com, ip: 209.85.210.177, mailfrom: akuster808@gmail.com) Received: by mail-pf1-f177.google.com with SMTP id k14so6212598pfh.0 for ; Mon, 08 Aug 2022 07:25:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=batd0QYVk06pcmjwVaR3nrtnt3DUMxmF4jjm7WgG3fg=; b=B1O2vLH6dMR/jeZd8QWBsz/4kgf22F3poJ9lPxT1aPcx2GVmR2TdmL8Piwq3IKddXA f/MTyR9z7KWsDhUgXnkXL2dbaEVmt6OtZLtBWnTAQYJRtLLbC5oLC35U97OSJNjAng4l 3+myj5dJlDPYd2MlJzuvpc+37ttZzc5o8UOBJ4cb7W1VEWUPotJ2Ea2XWy94hyACqsF0 a1ex5BGRAT+vCIl8S00zlkltq9ALkAm9sypGEdSFcrWyx3mEX4LvxGMy0u0Au5nKgn1e AxjxDy59C2TU5shrZLkXNfNJiExIb0n30xo2a87sIBqsAorrIaSKnQYYuSny2DetasM3 SX2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=batd0QYVk06pcmjwVaR3nrtnt3DUMxmF4jjm7WgG3fg=; b=sLbSgxhVu1UuqBTwUujXtjsBFFg40ITJtpHViFBFzei8CB0WPaduwP0efN8hWMHfoq W0lJeo1nddFG6fxleFHNi1892DOITSgqH/+N3CwkMuy4NwqdRaEogceev1+wGfEQXK1K 4aoToAbWPPl/3vabVtI/Hv7fDIWgcaXnyHVQ+/GC8aqxnjvmgX56k/ACmwbB3B7bAK0u VYDY5L1Zu5YawXsF195iJAzNFa6QJnEouWxBFEQZuANpihe7KY9ub3NOJSX/W9iVbPSv qmQIAQnqEmP9KCTLQqk45apwCgm2yocl6boeITWex4JC4My+b/CQac13TlrtNJvk3Htl 9gEA== X-Gm-Message-State: ACgBeo2+9r7IiDRTwz1cCJDm6bplJvk7zg+TnwweNOvovkA16SQE8RrK FdR8INRxdI87YqqFBi355XzHeKPwL9I= X-Google-Smtp-Source: AA6agR769cqKmh97SbyyvsXssQ6q/WWZotXRKTN82GeLQIeDyOwCsbk7jX3AfHI0yUK1RVWCu474Lw== X-Received: by 2002:aa7:88d1:0:b0:52e:f8e:aab5 with SMTP id k17-20020aa788d1000000b0052e0f8eaab5mr18900542pff.63.1659968719296; Mon, 08 Aug 2022 07:25:19 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id u8-20020a1709026e0800b0016f1204cde8sm8757492plk.301.2022.08.08.07.25.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 07:25:18 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 12/13] frr: fix buildpaths issue Date: Mon, 8 Aug 2022 07:22:51 -0700 Message-Id: <73a17ff992d2f33dd95cd2fcd10453712874e362.1659968069.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 08 Aug 2022 14:25:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98172 From: Mingli Yu Fixes: WARNING: frr-8.2.2-r0 do_package_qa: QA Issue: File /usr/lib/libfrr.a in package frr-staticdev contains reference to TMPDIR [buildpaths] WARNING: frr-8.2.2-r0 do_package_qa: QA Issue: File /usr/src/debug/frr/8.2.2-r0/git/lib/version.h in package frr-src contains reference to TMPDIR [buildpaths] WARNING: frr-8.2.2-r0 do_package_qa: QA Issue: File /usr/include/frr/version.h in package frr-dev contains reference to TMPDIR [buildpaths] WARNING: frr-8.2.2-r0 do_package_qa: QA Issue: File /usr/bin/vtysh in package frr contains reference to TMPDIR File /usr/lib/libfrr.so.0.0.0 in package frr contains reference to TMPDIR [buildpaths] Signed-off-by: Mingli Yu Signed-off-by: Khem Raj (cherry picked from commit 8b76b6c8e3ffdb30da839408084289c57e292752) Signed-off-by: Armin Kuster --- meta-networking/recipes-protocols/frr/frr_8.2.2.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-networking/recipes-protocols/frr/frr_8.2.2.bb b/meta-networking/recipes-protocols/frr/frr_8.2.2.bb index ceb94109de..96be49b53f 100644 --- a/meta-networking/recipes-protocols/frr/frr_8.2.2.bb +++ b/meta-networking/recipes-protocols/frr/frr_8.2.2.bb @@ -73,6 +73,11 @@ SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "frr.service" SYSTEMD_AUTO_ENABLE = "disable" +do_compile:prepend () { + sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' \ + -e 's#${RECIPE_SYSROOT}##g' ${S}/lib/version.h +} + do_compile:class-native () { oe_runmake clippy-only } From patchwork Mon Aug 8 14:22:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 11147 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 08768C3F6B0 for ; Mon, 8 Aug 2022 14:25:29 +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.web08.25912.1659968721982457239 for ; Mon, 08 Aug 2022 07:25:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=CUZ8qFNR; spf=pass (domain: gmail.com, ip: 209.85.216.47, mailfrom: akuster808@gmail.com) Received: by mail-pj1-f47.google.com with SMTP id b4so8929295pji.4 for ; Mon, 08 Aug 2022 07:25:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=/aLvAHAIQhn97f46LAf6vi/tm+G4wf1C5lMPlW6XaRI=; b=CUZ8qFNRjrnHLe2mXujC7dw8eplEDZ9wog5N0gnGIHvFLqHPtupCY9bkFiseqGBu8R G/MZIqsZqMdLQShb3ZFVhp53/VL6soor3ceEVGCDo6hxuA1oVS9tPY9PdoJMPOaibWTr tqT129SXp3g5ATpl/EP9XjNtASwh5MLTBvICeGaeCCnf0jNkCTMS8ekKwRYynJ/cVGeS iYqMfJzj19iPWo1wD2h0vhYj3X86E83q01H23fzJ2Ak3DWGIc+i75SXUhE6IaOjz+uWy luVmXKfx4HFJzu7W9N1N+CmN0r6EeAryfO1Y0auZBb3ZUw1y/ILvc5NcKvIVy6mESyYs Bo3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/aLvAHAIQhn97f46LAf6vi/tm+G4wf1C5lMPlW6XaRI=; b=Yy2U+9z1p0wce6pesQ66/TdqOPhQ3IkWZIHWI+KVjmElcsj5Hn2BCkKhQS3N3c6xn4 NOkyKHqVYx4pgf6aquCM6y9RwxTYI0pOGhb6xB85shy7INROF5SvEkiX2ldNzkdLdX54 FakJaYsd5soQ5pnFwNWz0kDja8cuNsTM+hWgUNJGnqXNlx0lUg3zpcDfbvHDk6epZ30I TS/4VZETFebc2lLpTITeUfGd/NiK9zkWmVaUpVVjzNnK0ety7D80G2aYCazpOmIk9CG4 9aXX4MGodFO1+o2Me1ZbdyCGTWUbSl4d+n2ShDHGzcpY+EnodJtkg3HD2ti4lbGlJ4Y6 S9og== X-Gm-Message-State: ACgBeo3dVaz4r6Hj2s/P1LitgJTwmf6wDHsTUtI4SgBYTgkkp/H1HSAq wUB7B882Gcwqd8QU/jS6Z1xoz3d+IBo= X-Google-Smtp-Source: AA6agR7qWHPU/mng8CNdoiyy6qpT8iSlLVR2hDor8PjPO+2q+ZaVPqtndY3SLrJ8clgTHtbf44UIXw== X-Received: by 2002:a17:902:e844:b0:16f:9d2:f4ff with SMTP id t4-20020a170902e84400b0016f09d2f4ffmr19065815plg.27.1659968721068; Mon, 08 Aug 2022 07:25:21 -0700 (PDT) Received: from keaua.caveonetworks.com (c-67-181-203-136.hsd1.ca.comcast.net. [67.181.203.136]) by smtp.gmail.com with ESMTPSA id u8-20020a1709026e0800b0016f1204cde8sm8757492plk.301.2022.08.08.07.25.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 07:25:20 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 13/13] yasm: fix buildpaths warning Date: Mon, 8 Aug 2022 07:22:52 -0700 Message-Id: <9165fb0d1fde9a99e6ce3ec37e8c2ca43757756e.1659968069.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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, 08 Aug 2022 14:25:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/98173 From: Anuj Mittal ax_create_stdint_h.m4 includes $CC as a comment in the generated header which leads to buildpaths warning: | WARNING: yasm-1.3.0+gitAUTOINC+ba463d3c26-r0 do_package_qa: QA Issue: File /usr/include/libyasm-stdint.h in package yasm-dev contains reference to TMPDIR [buildpaths] Signed-off-by: Anuj Mittal Signed-off-by: Khem Raj (cherry picked from commit a7346d2bb1a60289225cce78d760e4d264d1b2a2) Signed-off-by: Armin Kuster --- meta-oe/recipes-devtools/yasm/yasm_git.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-oe/recipes-devtools/yasm/yasm_git.bb b/meta-oe/recipes-devtools/yasm/yasm_git.bb index b5cd35ab3a..044fcbea74 100644 --- a/meta-oe/recipes-devtools/yasm/yasm_git.bb +++ b/meta-oe/recipes-devtools/yasm/yasm_git.bb @@ -22,3 +22,8 @@ CACHED_CONFIGUREVARS = "CCLD_FOR_BUILD='${CC_FOR_BUILD}'" BBCLASSEXTEND = "native" PARALLEL_MAKE = "" + +do_configure:prepend() { + # Don't include $CC (which includes path to sysroot) in generated header. + sed -i -e "s/^echo \"\/\* generated \$ac_cv_stdint_message \*\/\" >>\$ac_stdint$"// ${S}/m4/ax_create_stdint_h.m4 +}