On 11/24/21 00:06, Richard Purdie wrote: > On Tue, 2021-11-23 at 21:22 +0100, Jacob Kroon wrote: >> >> On 11/23/21 15:12, Richard Purdie wrote: >>> From: Jacob Kroon <[email protected]> >>> >>> Add a wrapper around ar calls for native/cross recipes. This wrapper adds >>> the -D option so that deterministic archives are built for native/cross >>> output. This improves the changes of hash equivalence matches and hence >>> build artefact reuse. >>> >>> We don't need this in the target case since we compile binutils-cross >>> with an option making this the default. We need a wrapper since we need >>> to remove the "u" option and replace it with "D" but also allow things like >>> "--version" to continue to work too. >>> >>> Signed-off-by: Jacob Kroon <[email protected]> >>> Signed-off-by: Richard Purdie <[email protected]> >>> --- >>> meta/classes/cross.bbclass | 2 ++ >>> scripts/cross-intercept/ar | 1 + >>> scripts/native-intercept/ar | 29 +++++++++++++++++++++++++++++ >>> 3 files changed, 32 insertions(+) >>> create mode 120000 scripts/cross-intercept/ar >>> create mode 100755 scripts/native-intercept/ar >>> >>> diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass >>> index 3e6a2f60b9e..9d951076a78 100644 >>> --- a/meta/classes/cross.bbclass >>> +++ b/meta/classes/cross.bbclass >>> @@ -93,3 +93,5 @@ python do_addto_recipe_sysroot () { >>> } >>> addtask addto_recipe_sysroot after do_populate_sysroot >>> do_addto_recipe_sysroot[deptask] = "do_populate_sysroot" >>> + >>> +PATH:prepend = "${COREBASE}/scripts/cross-intercept:" >>> diff --git a/scripts/cross-intercept/ar b/scripts/cross-intercept/ar >>> new file mode 120000 >>> index 00000000000..bc68ffd7a21 >>> --- /dev/null >>> +++ b/scripts/cross-intercept/ar >>> @@ -0,0 +1 @@ >>> +../native-intercept/ar >>> \ No newline at end of file >>> diff --git a/scripts/native-intercept/ar b/scripts/native-intercept/ar >>> new file mode 100755 >>> index 00000000000..642b6eae864 >>> --- /dev/null >>> +++ b/scripts/native-intercept/ar >>> @@ -0,0 +1,29 @@ >>> +#!/usr/bin/env python3 >>> +# >>> +# Wrapper around 'ar' that defaults to deterministic archives >>> + >>> +import os >>> +import shutil >>> +import sys >>> + >>> +# calculate path to the real 'ar' >>> +path = os.environ['PATH'] >>> +path = path.replace(os.path.dirname(sys.argv[0]), '') >>> +real_ar = shutil.which('ar', path=path) >>> + >>> +if len(sys.argv) == 1: >>> + os.execl(real_ar, 'ar') >>> + >>> +# modify args to mimic 'ar' configured with >>> --default-deterministic-archives >>> +argv = sys.argv >>> +if argv[1].startswith('--'): >>> + # No modifier given >>> + None >>> +else: >>> + # remove the optional '-' >>> + if argv[1][0] == '-': >>> + argv[1] = argv[1][1:] >>> + argv[1] = argv[1].replace('u', '') >>> + argv[1] = 'D' + argv[1] >>> + >>> +os.execv(real_ar, argv) >>> >> >> What should we do if the user is explicitly passing U, "Do not operate >> in deterministic mode." ? Don't replace any 'u' and don't pass D ? > > That would seem to make sense to me... >
Could we log a warning somewhere when this is done ? I can't write to stdout here, but stderr perhaps ? Jacob
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#158646): https://lists.openembedded.org/g/openembedded-core/message/158646 Mute This Topic: https://lists.openembedded.org/mt/87259014/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
