From patchwork Thu Dec 12 18:50:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Marko, Peter" X-Patchwork-Id: 54015 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 7B144E77180 for ; Thu, 12 Dec 2024 18:51:50 +0000 (UTC) Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net [185.136.65.227]) by mx.groups.io with SMTP id smtpd.web10.587.1734029501393188708 for ; Thu, 12 Dec 2024 10:51:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm2 header.b=RnHDaezP; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.227, mailfrom: fm-256628-20241212185139a9eea8fdb701b6bdbc-a2z5ew@rts-flowmailer.siemens.com) Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20241212185139a9eea8fdb701b6bdbc for ; Thu, 12 Dec 2024 19:51:39 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=JfeQAmO3a8c9gcCbN0oVks7vTAZRMe6XYQRRJ+t60uU=; b=RnHDaezPDGlZTl4D6grYzKcfuDTt+pUtdB5nebKLGiHhGx1X7F+Ij8ZUv71+7KVmRgKhyA men0PWel6UHmmHpeC3100Vb4+leJ43xAvFlQaLS8xjt7gq/daXaZ0iM13o/mALV1pAyjxGF0 s4O8/bTdkK2sDJ+XFS1D0wK0PvMoU/LWy51TcrlQyyuUEQ5X9w83nqVRhhp1AmUuWQWoq9zg 5lzKpK0st4frgKPBnS4wqicco4OmV/VMsvS0vWc5JgtDW+pJuFS5VBZpg1yqLWr3r3RFtor4 r/wE8GYgVwI2FVFHjs537WCA4QCTVyyqebQiAPZ7FzWoyc/nGYQA7O3g==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Khem Raj , Peter Marko Subject: [meta-networking][scarthgap][PATCH 1/2] ndisc: Remove buildpaths from binaries Date: Thu, 12 Dec 2024 19:50:39 +0100 Message-Id: <20241212185040.2244548-2-peter.marko@siemens.com> In-Reply-To: <20241212185040.2244548-1-peter.marko@siemens.com> References: <20241212185040.2244548-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer 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 ; Thu, 12 Dec 2024 18:51:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114293 From: Khem Raj configure emits its arguments into binaries via PACKAGE_CONFIGURE_INVOCATION therefore edit the paths from this in generated config.h before it gets into binaries. Signed-off-by: Khem Raj Signed-off-by: Peter Marko --- meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb index a827e7f42..fb00b8351 100644 --- a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb +++ b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb @@ -27,6 +27,10 @@ do_configure:prepend() { ${S}/autogen.sh } +do_configure:append() { + sed -i -e 's|${WORKDIR}||g' ${B}/config.h +} + do_install:append () { rm -rf ${D}${localstatedir} # Enable SUID bit for applications that need it From patchwork Thu Dec 12 18:50:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Marko, Peter" X-Patchwork-Id: 54016 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 86A01E7717F for ; Thu, 12 Dec 2024 18:52:00 +0000 (UTC) Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net [185.136.65.226]) by mx.groups.io with SMTP id smtpd.web10.591.1734029512263376966 for ; Thu, 12 Dec 2024 10:51:52 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm2 header.b=bNuAptxG; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.226, mailfrom: fm-256628-202412121851491cad5bef71aeebaefd-qjxth8@rts-flowmailer.siemens.com) Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 202412121851491cad5bef71aeebaefd for ; Thu, 12 Dec 2024 19:51:49 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=vGwJGb4kXApAnEc6c8rb3nboAJMnhbM8U3MdAQ+5QLQ=; b=bNuAptxG0+d4qwCKi3mPuApbMVHAZePHxa1/uxRHR9cuGzm/AlswotKYpe65U4BI13Fu4P N/Gp4M+sK7ruosGb2fHPdwsSEjpwplp9VWaE1X7IjtUpU1PAnRgTkdFd/wJuCf2Xyr8stWzJ 7RhrKE9sSAewCS7MdBKPI6l+15bXWYqpS3UB8mLc6ySjyVRPJpyVWEhRLdThOR2b4+4vszSQ dHNUxLWxo0pOhMUf8nSJx7c1gqD+/ec8wmUWxA51dsQfWc1BBoW/Gs8hkeurEtb91Gl0BpL/ 3T5wHN8VyzJq9ZsFqGFY5R2ENQ6I741E6JppRbfu06DxyS6GaLN6L5hg==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Khem Raj , Peter Marko Subject: [meta-networking][scarthgap][PATCH 2/2] ndisc6: Fix reproducible build Date: Thu, 12 Dec 2024 19:50:40 +0100 Message-Id: <20241212185040.2244548-3-peter.marko@siemens.com> In-Reply-To: <20241212185040.2244548-1-peter.marko@siemens.com> References: <20241212185040.2244548-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer 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 ; Thu, 12 Dec 2024 18:52:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114294 From: Khem Raj includes the CFLAGS used to build the package in the binary via PACKAGE_CONFIGURE_INVOCATION which then includes the absolute build path via (eg.) the -ffile-prefix-map flag. Here we remove using variables like PACKAGE_CONFIGURE_INVOCATION in code Signed-off-by: Khem Raj Signed-off-by: Peter Marko --- ...riables-indicating-buildtime-informa.patch | 85 +++++++++++++++++++ .../recipes-support/ndisc6/ndisc6_1.0.8.bb | 1 + 2 files changed, 86 insertions(+) create mode 100644 meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch diff --git a/meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch b/meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch new file mode 100644 index 000000000..7bfb17bf0 --- /dev/null +++ b/meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch @@ -0,0 +1,85 @@ +From 7b3e78cf0348ea737609a2ace07c7c55aae36bcb Mon Sep 17 00:00:00 2001 +From: Santiago Vila +Date: Wed, 9 Oct 2024 22:05:09 -0700 +Subject: [PATCH] Remove use of variables indicating buildtime information + +We should not really care about the build date or the build host + +Sourced From: https://salsa.debian.org/debian/ndisc6/-/blob/master/debian/patches/reproducible-build.patch?ref_type=heads + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + rdnss/rdnssd.c | 2 -- + src/addrinfo.c | 2 -- + src/ndisc.c | 2 -- + src/tcpspray.c | 2 -- + src/traceroute.c | 2 -- + 5 files changed, 10 deletions(-) + +diff --git a/rdnss/rdnssd.c b/rdnss/rdnssd.c +index b87edb2..7201525 100644 +--- a/rdnss/rdnssd.c ++++ b/rdnss/rdnssd.c +@@ -741,8 +741,6 @@ version (void) + { + printf (_("rdnssd: IPv6 Recursive DNS Server discovery Daemon %s (%s)\n"), + VERSION, "$Rev$"); +- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME); +- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION); + puts (_("Written by Pierre Ynard and Remi Denis-Courmont\n")); + + printf (_("Copyright (C) %u-%u Pierre Ynard, Remi Denis-Courmont\n"), +diff --git a/src/addrinfo.c b/src/addrinfo.c +index cd73722..6316abd 100644 +--- a/src/addrinfo.c ++++ b/src/addrinfo.c +@@ -148,8 +148,6 @@ static int quick_usage (const char *path) + static int version (void) + { + printf (_("addrinfo %s (%s)\n"), VERSION, "$Rev$"); +- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME); +- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION); + puts (_("Written by Remi Denis-Courmont\n")); + + printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2002, 2007); +diff --git a/src/ndisc.c b/src/ndisc.c +index b190b18..6e222a0 100644 +--- a/src/ndisc.c ++++ b/src/ndisc.c +@@ -920,9 +920,7 @@ version (void) + { + printf (_( + "ndisc6: IPv6 Neighbor/Router Discovery userland tool %s (%s)\n"), VERSION, "$Rev$"); +- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME); + +- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION); + puts (_("Written by Remi Denis-Courmont\n")); + + printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2004, 2007); +diff --git a/src/tcpspray.c b/src/tcpspray.c +index 39d8939..6347795 100644 +--- a/src/tcpspray.c ++++ b/src/tcpspray.c +@@ -302,8 +302,6 @@ version (void) + { + printf (_( + "tcpspray6: TCP/IP bandwidth tester %s (%s)\n"), VERSION, "$Rev$"); +- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME); +- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION); + puts (_("Written by Remi Denis-Courmont\n")); + + printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2005, 2007); +diff --git a/src/traceroute.c b/src/traceroute.c +index 489bc55..604b6af 100644 +--- a/src/traceroute.c ++++ b/src/traceroute.c +@@ -1251,8 +1251,6 @@ version (void) + { + printf (_( + "traceroute6: TCP & UDP IPv6 traceroute tool %s (%s)\n"), VERSION, "$Rev$"); +- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME); +- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION); + puts (_("Written by Remi Denis-Courmont\n")); + + printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2005, 2007); diff --git a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb index fb00b8351..21579d64c 100644 --- a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb +++ b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRCREV = "92e5d1cf6547fe40316b2a6ca2f7b8195ae0cbe5" SRC_URI = "git://git.remlab.net/git/ndisc6.git;protocol=http;branch=master \ file://0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch \ + file://0001-Remove-use-of-variables-indicating-buildtime-informa.patch \ " S = "${WORKDIR}/git"