From patchwork Tue Jan 4 14:16:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 2032 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 BA081C433F5 for ; Tue, 4 Jan 2022 14:16:28 +0000 (UTC) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.groups.io with SMTP id smtpd.web11.7061.1641305788011669373 for ; Tue, 04 Jan 2022 06:16:28 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=g4Cq4iug; spf=pass (domain: linuxfoundation.org, ip: 209.85.221.42, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wr1-f42.google.com with SMTP id q16so76489403wrg.7 for ; Tue, 04 Jan 2022 06:16:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=XHxESW34wfGdpW/EFQ5Roe60Pu/g4G65T1X86gIt/8E=; b=g4Cq4iug1bT8Qs4uOpfBz0YAD+9oheXElV/vGG1ZZ8dX7FKW37CYBKKPOviwOshcvz 9CIjCZ7gDgzG2Vtvuw0TSkt+d3t+XAXde34btjG92gCgeR4Yx1c7Tl9ESM1EIEZV7RjL AGhumMYGD4P1Y9cGgSzHTt/tbmRIrr0jU0oMw= 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:mime-version :content-transfer-encoding; bh=XHxESW34wfGdpW/EFQ5Roe60Pu/g4G65T1X86gIt/8E=; b=6OXxaXDgbBo3NwI+S1FtriHEjhzijSrNWBgweaPFytpmO5tIfF1h2Y160WE79waJ19 WCwQu8N7IP/EpD63SQ7g5ETSIof/syFWI3dxPaWNMTga00Wkxh9J8jfkDUUZa+aSGpui DOtCsRXTbh0srkPICqV0AztkWmVVFN9vXCW48bMTVL2cgZMmehco5/ZHM3AbTSmAg4uy pk1HowdUL+QjS0Vde0+1NZnBE8BbAF/7EntNoaYBV8KVNnv1iXRJjU8W8isr47umwaq0 Ler/WUPXbPpfVRvVX657nhEqjLY+e14P9BCxp2Fn7/l7/3d2dtsrXkcpvxjOA6mi2kpM FhVQ== X-Gm-Message-State: AOAM533APuN1hnNbzoZx7PthpBlhmC3P4ggDHbs3tjBPGkqLRsPgV10e niBGgof1YVuM52KJHSCALX+qffdflnxTAg== X-Google-Smtp-Source: ABdhPJxtuWcUPTd4x3TV0GS/PAzNS3K/k4KnayTz3cLTmN6XvEsTqCLHEPiAIs2g9LJB48mRxKU78Q== X-Received: by 2002:a5d:6ac2:: with SMTP id u2mr42677718wrw.486.1641305786217; Tue, 04 Jan 2022 06:16:26 -0800 (PST) Received: from hex.int.rpsys.net ([2001:8b0:aba:5f3c:da22:f51:54c3:4a4f]) by smtp.gmail.com with ESMTPSA id h204sm38270838wmh.33.2022.01.04.06.16.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 06:16:26 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/4] package_deb/ipk/rpm: Add more minimal do_build dependencies back Date: Tue, 4 Jan 2022 14:16:22 +0000 Message-Id: <20220104141625.1369719-1-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.32.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 ; Tue, 04 Jan 2022 14:16:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160162 The dependencies for do_build became a little too minimal after the removal of recrdeptask since "bitbake go" would not package go-runtime despite it being in DEPENDS and the resulting package having a dependency on it. A reasonable compromise is probably rdeptask instead of recrdeptask which is a lot lower overhead but makes the build target more useful and importantly, lets world builds do what you'd expect them to. Signed-off-by: Richard Purdie --- meta/classes/package_deb.bbclass | 1 + meta/classes/package_ipk.bbclass | 1 + meta/classes/package_rpm.bbclass | 1 + 3 files changed, 3 insertions(+) diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 1ae6393d37d..2e75e222bcb 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass @@ -316,6 +316,7 @@ do_package_write_deb[dirs] = "${PKGWRITEDIRDEB}" do_package_write_deb[cleandirs] = "${PKGWRITEDIRDEB}" do_package_write_deb[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}" addtask package_write_deb after do_packagedata do_package do_deploy_source_date_epoch before do_build +do_build[rdeptask] += "do_package_write_deb" PACKAGEINDEXDEPS += "dpkg-native:do_populate_sysroot" PACKAGEINDEXDEPS += "apt-native:do_populate_sysroot" diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 902b7f94c84..f67cb0e5c90 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -275,6 +275,7 @@ do_package_write_ipk[dirs] = "${PKGWRITEDIRIPK}" do_package_write_ipk[cleandirs] = "${PKGWRITEDIRIPK}" do_package_write_ipk[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}" addtask package_write_ipk after do_packagedata do_package do_deploy_source_date_epoch before do_build +do_build[rdeptask] += "do_package_write_ipk" PACKAGEINDEXDEPS += "opkg-utils-native:do_populate_sysroot" PACKAGEINDEXDEPS += "opkg-native:do_populate_sysroot" diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index b0754421a33..e9ff1f7e65c 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -749,6 +749,7 @@ do_package_write_rpm[dirs] = "${PKGWRITEDIRRPM}" do_package_write_rpm[cleandirs] = "${PKGWRITEDIRRPM}" do_package_write_rpm[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}" addtask package_write_rpm after do_packagedata do_package do_deploy_source_date_epoch before do_build +do_build[rdeptask] += "do_package_write_rpm" PACKAGEINDEXDEPS += "rpm-native:do_populate_sysroot" PACKAGEINDEXDEPS += "createrepo-c-native:do_populate_sysroot" From patchwork Tue Jan 4 14:16:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 2034 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 95653C4332F for ; Tue, 4 Jan 2022 14:16:29 +0000 (UTC) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.groups.io with SMTP id smtpd.web10.7074.1641305788401757279 for ; Tue, 04 Jan 2022 06:16:28 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=L36Ek7dA; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.45, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f45.google.com with SMTP id g7-20020a7bc4c7000000b00345c4bb365aso20085409wmk.4 for ; Tue, 04 Jan 2022 06:16:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=mR2OVHN/8iME4RrITvLMZwxrPo49cjk6By1P3E48DZo=; b=L36Ek7dArpIwq5kUcgr5Y62iSX18NMIiGQjtNi/xW5VOh7dAsNqgp3aU/Xof57Z5kL 5n2PR9t9Nhsfqaoo+zeKNE9b7usjTBR1cOjeSty9iCMrzGjafI0ux+nd22wTIi7fnQJY l+wruWbvksA/UhXp9btXRGY9HjDe6epocgk7I= 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=mR2OVHN/8iME4RrITvLMZwxrPo49cjk6By1P3E48DZo=; b=Tllre7wDQhiu49XDrlGPmiypmE/i35YpUT/1w1M8Aqf8kI9kbJj1weZXtntSsc3lTM ASbRlQSIDyQxGBgZFKVMVIeTgLmtrWIptMTHJazTow/FPOUAw5RSS5qeEP8peCQgWBz7 aNJHzG0dZnRrEz2NOqOGcA0nxo0M22GWu41u9Z4B4U0gO61yc/CtJvnfrTVLEUawE9Va cTKMByhZvb3F69jpT5t0x9HTPrlP2xwBjsbPkBY8PfYfELvRzT/ubCuMMOVqHF6nmjt4 1PlGdRNdaT5vrS8qN46J7d0FRgyGtTtboj/wJjeC3AaQjhNiQryZdulz+o9IDbAofwVQ grmg== X-Gm-Message-State: AOAM532VYXe1pE0liplkeDkKyAzOWV3W7nEKuDsH1OUtWCwR/Wy8UDQf 4scEMKPByhPUkjYODpa7PYZPxRqhepM8hA== X-Google-Smtp-Source: ABdhPJwrYXr1YR3Gw1s1c9M9Gqy5hX8d9bF72nWaJPRw49o/eQac+5cKYMzu5bcIGnJEuL5RHaGcIw== X-Received: by 2002:a05:600c:2188:: with SMTP id e8mr42568657wme.55.1641305786531; Tue, 04 Jan 2022 06:16:26 -0800 (PST) Received: from hex.int.rpsys.net ([2001:8b0:aba:5f3c:da22:f51:54c3:4a4f]) by smtp.gmail.com with ESMTPSA id h204sm38270838wmh.33.2022.01.04.06.16.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 06:16:26 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/4] meson: Handle qemu riscv issues Date: Tue, 4 Jan 2022 14:16:23 +0000 Message-Id: <20220104141625.1369719-2-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220104141625.1369719-1-richard.purdie@linuxfoundation.org> References: <20220104141625.1369719-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 04 Jan 2022 14:16:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160163 In qemu, they merged the 32 and 64 bit riscv variants into one target for meson purposes but this isn't officially supported by upstream meson. In normal builds this would just be a warning but in OE, this is fatal. Avoid the fatal errors for now and build as qemu intended whilst this is resolved by the upstreams. Signed-off-by: Richard Purdie --- .../0001-Make-CPU-family-warnings-fatal.patch | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch index c5be526b103..848dccfbe72 100644 --- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch @@ -11,30 +11,34 @@ Signed-off-by: Ross Burton mesonbuild/environment.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) -diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 307aac3..66fb7ec 100644 ---- a/mesonbuild/envconfig.py -+++ b/mesonbuild/envconfig.py -@@ -267,7 +267,7 @@ class MachineInfo(HoldableObject): +Index: meson-0.60.2/mesonbuild/envconfig.py +=================================================================== +--- meson-0.60.2.orig/mesonbuild/envconfig.py ++++ meson-0.60.2/mesonbuild/envconfig.py +@@ -266,8 +266,8 @@ class MachineInfo(HoldableObject): + 'but is missing {}.'.format(minimum_literal - set(literal))) cpu_family = literal['cpu_family'] - if cpu_family not in known_cpu_families: +- if cpu_family not in known_cpu_families: - mlog.warning(f'Unknown CPU family {cpu_family}, please report this at https://github.com/mesonbuild/meson/issues/new') ++ if cpu_family not in known_cpu_families and cpu_family != "riscv": + raise EnvironmentException('Unknown CPU family {}, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.'.format(cpu_family)) endian = literal['endian'] if endian not in ('little', 'big'): -diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index 71286a5..179917e 100644 ---- a/mesonbuild/environment.py -+++ b/mesonbuild/environment.py -@@ -352,9 +352,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: +Index: meson-0.60.2/mesonbuild/environment.py +=================================================================== +--- meson-0.60.2.orig/mesonbuild/environment.py ++++ meson-0.60.2/mesonbuild/environment.py +@@ -354,10 +354,8 @@ def detect_cpu_family(compilers: Compile + if any_compiler_has_define(compilers, '__64BIT__'): trial = 'ppc64' - if trial not in known_cpu_families: +- if trial not in known_cpu_families: - mlog.warning(f'Unknown CPU family {trial!r}, please report this at ' - 'https://github.com/mesonbuild/meson/issues/new with the ' - 'output of `uname -a` and `cat /proc/cpuinfo`') ++ if trial not in known_cpu_families and trail != "riscv": + raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial) return trial From patchwork Tue Jan 4 14:16:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 2033 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 94B1FC433EF for ; Tue, 4 Jan 2022 14:16:29 +0000 (UTC) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.groups.io with SMTP id smtpd.web12.6954.1641305788542307259 for ; Tue, 04 Jan 2022 06:16:28 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=U1O0TkGq; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.51, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f51.google.com with SMTP id c66so23314443wma.5 for ; Tue, 04 Jan 2022 06:16:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=LqIHy1HAYP2VV2EughZZ/RXPPpNvSjHMdLhkAdegXN8=; b=U1O0TkGqUg5hiDFeKcbLOCuFFdFqStbdx3Q1pbA00Ey5OlYzJP0fqTIw0BukonlDr9 EW9/Y+kehlz/r5TbLhDnl1iQQ5enScbbYHfE6EJUkcvxD2N4pTzvBY49S8gBcQBHkP0V SBmz7XsF/zgiwmc6KhLea0ThXGTnS/jC7hBCs= 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=LqIHy1HAYP2VV2EughZZ/RXPPpNvSjHMdLhkAdegXN8=; b=jRios41MzBd2wGtQcKslI4AgFbCaAeijfscqukmTD2dD2HUjiT2jNvLQ2i/U+ugtES g1Rr5TKvJfVjhdoBWC33OcfF4j/YzS4ab21jrb8/QNKK950exC0PO+R4XSli84tE+suH 57KjNWYaPqg7sZEMgwUBBVpvENmhOZ6I4BXlKbRxcw5I18vZi02EcDEAF0dArY79uQEU I1Oe2d98VFRjJ/Mzr3l0Dp1//7vaBoh5xlQHOYOqHYBigKoB4JZw536K7Ay4zKKEe0Cw KzB2gOI73nXrRUn/BheeO8Zx2h8s0pQx1g0/iR3uCOm0KdyS0LVCQYEvquaYgwguavqu PZIg== X-Gm-Message-State: AOAM530dGJ5m4aoeaIeljmgX7zKShrw/IkR+KWDqGLk2omTEe1Pru9MP YvQwkRmgGwLO3oi0AG9dDQfbB+p0LvIIXQ== X-Google-Smtp-Source: ABdhPJx4wxoK4kAEkr9sUwKPzNMb6fttRMimj/aIFg1clGxY1SU3vjvyhpkn/5SRFpQ1Bze6uRTPAQ== X-Received: by 2002:a05:600c:6018:: with SMTP id az24mr41811961wmb.103.1641305787023; Tue, 04 Jan 2022 06:16:27 -0800 (PST) Received: from hex.int.rpsys.net ([2001:8b0:aba:5f3c:da22:f51:54c3:4a4f]) by smtp.gmail.com with ESMTPSA id h204sm38270838wmh.33.2022.01.04.06.16.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 06:16:26 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/4] openssl: Add reproducibility fix Date: Tue, 4 Jan 2022 14:16:24 +0000 Message-Id: <20220104141625.1369719-3-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220104141625.1369719-1-richard.purdie@linuxfoundation.org> References: <20220104141625.1369719-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 04 Jan 2022 14:16:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160164 When the date rolled from one year to another, it highlighted a reproducibility issue in openssl. Patch a workaround for this to avoid autobuilder failures. Help submitting upstream welcome. Signed-off-by: Richard Purdie --- .../openssl/openssl/reproducibility.patch | 22 +++++++++++++++++++ .../openssl/openssl_3.0.1.bb | 1 + 2 files changed, 23 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/reproducibility.patch diff --git a/meta/recipes-connectivity/openssl/openssl/reproducibility.patch b/meta/recipes-connectivity/openssl/openssl/reproducibility.patch new file mode 100644 index 00000000000..8accbc9df20 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/reproducibility.patch @@ -0,0 +1,22 @@ +Using localtime() means the output can depend on the timezone of the build machine. +Using gmtime() is safer. For complete reproducibility use SOURCE_DATE_EPOCH if set. + +Signed-off-by: Richard Purdie +Upstream-Status: Pending [should be suitable] + +Index: openssl-3.0.1/apps/progs.pl +=================================================================== +--- openssl-3.0.1.orig/apps/progs.pl ++++ openssl-3.0.1/apps/progs.pl +@@ -21,7 +21,10 @@ die "Unrecognised option, must be -C or + my %commands = (); + my $cmdre = qr/^\s*int\s+([a-z_][a-z0-9_]*)_main\(\s*int\s+argc\s*,/; + my $apps_openssl = shift @ARGV; +-my $YEAR = [localtime()]->[5] + 1900; ++my $YEAR = [gmtime()]->[5] + 1900; ++if (defined($ENV{SOURCE_DATE_EPOCH}) && $ENV{SOURCE_DATE_EPOCH} !~ /\D/) { ++ $YEAR = [gmtime($ENV{SOURCE_DATE_EPOCH})]->[5] + 1900; ++} + + # because the program apps/openssl has object files as sources, and + # they then have the corresponding C files as source, we need to chain diff --git a/meta/recipes-connectivity/openssl/openssl_3.0.1.bb b/meta/recipes-connectivity/openssl/openssl_3.0.1.bb index 162435480c4..7727ec43e87 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.0.1.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.0.1.bb @@ -12,6 +12,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://afalg.patch \ file://0001-Configure-do-not-tweak-mips-cflags.patch \ + file://reproducibility.patch \ " SRC_URI:append:class-nativesdk = " \ From patchwork Tue Jan 4 14:16:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 2035 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 99704C433F5 for ; Tue, 4 Jan 2022 14:16:30 +0000 (UTC) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.groups.io with SMTP id smtpd.web11.7063.1641305789037293848 for ; Tue, 04 Jan 2022 06:16:29 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=Gb2llZo3; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.46, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f46.google.com with SMTP id e5so22931124wmq.1 for ; Tue, 04 Jan 2022 06:16:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=HDZRqmWdFmzsm1BhLd9rHj578AGsi4YQP+y9Q4lgeIU=; b=Gb2llZo3hZQP5FQ3eE1MXYN7XebdYdGurwRR3gdBdov/HeArtJuQ4EfxCObZsZR83R VIn/E018xQ+lBcqDeOVdtrc698emcCNQ+hFH1tdlRwCdT0H0kcIe/bcNLg+XHYHKTNwn UxHmocY6+6OYB4loIk2Vf1IAesKbqYfqsKsB8= 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=HDZRqmWdFmzsm1BhLd9rHj578AGsi4YQP+y9Q4lgeIU=; b=K3XPojGXVUf4JX0YJJ9/EfQZCzDO1K61X4oW58eZaB6XJCVdfYJ2MWDzyIoEM88gQU W1OvywD0blqdfL5+MEO1PSdWlgR5hmUdQFt87b5ru1YhgG2HmZ9mJjdLtd8hWzy6G+A/ KuFAfycGdrhCrXUawSLbkaIQtdEffAf2/mWaPIbjhW6sDyme2A0/7uovducuzUJd4lBS aXuLNmlecquH8zX9Y4YeFZCM5lL3v/sHn6S/RS59nnREmQyYRuV1sPzEZWyq0Txpnp9G MhynLCPN+GMzm4jLeYz7rPgT+5Va/S/whXZYC/zIBgpJlcVi0FnRtMgsCbS6nx8XEw2o E9Cg== X-Gm-Message-State: AOAM532UwPw9AkrXE7EQOqt9JM/TsQE6QH3SLj/sLdDEG1oel7chHgsi tKsTCS8MwP6u5jOJpnmoxifFJwywbpc2zQ== X-Google-Smtp-Source: ABdhPJzj/A+Q6wyNwvNJhRu0Qht/Pf4ou41LtyBr21qsxVjhrCyGgHcXxLsd0ZtfzYuJSUtz3vzpdA== X-Received: by 2002:a1c:1b15:: with SMTP id b21mr42686763wmb.174.1641305787454; Tue, 04 Jan 2022 06:16:27 -0800 (PST) Received: from hex.int.rpsys.net ([2001:8b0:aba:5f3c:da22:f51:54c3:4a4f]) by smtp.gmail.com with ESMTPSA id h204sm38270838wmh.33.2022.01.04.06.16.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 06:16:27 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/4] webkitgtk: Add reproducibility fix Date: Tue, 4 Jan 2022 14:16:25 +0000 Message-Id: <20220104141625.1369719-4-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220104141625.1369719-1-richard.purdie@linuxfoundation.org> References: <20220104141625.1369719-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 04 Jan 2022 14:16:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160165 When the date rolled from one year to another this highlighted a reproducibility issue. This could be better fixed by using SOURCE_DATE_EPOCH from the environment but I'm not sure how you do that in ruby. Help from someone with that knowledge to submit that upstream very welcome. Signed-off-by: Richard Purdie --- .../webkit/webkitgtk/reproducibility.patch | 22 +++++++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.34.2.bb | 1 + 2 files changed, 23 insertions(+) create mode 100644 meta/recipes-sato/webkit/webkitgtk/reproducibility.patch diff --git a/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch b/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch new file mode 100644 index 00000000000..e866a1a193a --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch @@ -0,0 +1,22 @@ +Injection a year based on the current date isn't reproducible. Hack this +to a specific year for now for reproducibilty and to avoid autobuilder failures. + +The correct fix would be to use SOURCE_DATE_EPOCH from the environment and +then this could be submitted upstream, sadly my ruby isn't up to that. + +Upstream-Status: Pending [could be reworked] +Signed-off-by: Richard Purdie + +Index: webkitgtk-2.34.2/Source/JavaScriptCore/generator/GeneratedFile.rb +=================================================================== +--- webkitgtk-2.34.2.orig/Source/JavaScriptCore/generator/GeneratedFile.rb ++++ webkitgtk-2.34.2/Source/JavaScriptCore/generator/GeneratedFile.rb +@@ -25,7 +25,7 @@ require 'date' + require 'digest' + + $LICENSE = <<-EOF +-Copyright (C) #{Date.today.year} Apple Inc. All rights reserved. ++Copyright (C) 2021 Apple Inc. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions diff --git a/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb b/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb index a9b151e3c3c..aa071395227 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb @@ -18,6 +18,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://reduce-memory-overheads.patch \ file://musl-lower-stack-usage.patch \ file://0001-Fix-build-without-opengl-or-es.patch \ + file://reproducibility.patch \ " SRC_URI[sha256sum] = "584677d6e7cae12e27cdcc8e05b4cf73b54849a24afc3d7a40cec91016deff00"