[PATCH] reproducible builds: strip embedded file paths

[Vagrant Cascadian <vagrant@reproducible-builds.org>]

On 2021-11-22, Xiang W. wrote:
> ? 2021-11-22???? 10:13 +0530?Anup Patel???
>> On Mon, Nov 22, 2021 at 10:02 AM Vagrant Cascadian
>> <vagrant@reproducible-builds.org> wrote:
>> > 
>> > On 2021-11-22, Xiang W. wrote:
>> > > ? 2021-11-21???? 11:20 -0800?Vagrant Cascadian???
>> > > > of the directories below, I built using the same toolchain from
>> > > > the same git commit...
>> > > > 
>> > > > $ cd /home/vagrant/src/opensbi/opensbi1
>> > > > $ CROSS_COMPILE=riscv64-linux-gnu- make V=1 FW_PAYLOAD=n
>> > > > PLATFORM=generic
>> > > > ...
>> > > > $ strings build/platform/generic/firmware/fw_dynamic.bin | grep
>> > > > /home/vagrant
>> > > > /home/vagrant/src/opensbi/opensbi1/lib/sbi/riscv_asm.c
>> > ...
>> > > This is because the source file uses the absolute path when
>> > > compiling,
>> > > you can use the relative path by modifying the Makefile
>> > > 
>> > > diff --git a/Makefile b/Makefile
>> > > index 8623c1c..d017534 100644
>> > > --- a/Makefile
>> > > +++ b/Makefile
>> > > @@ -361,7 +361,7 @@ compile_cc_dep = $(CMD_PREFIX)mkdir -p
>> > > `dirname
>> > > $(1)`; \
>> > > ???????????? -MM $(2) >> $(1) || rm -f $(1)
>> > > ?compile_cc = $(CMD_PREFIX)mkdir -p `dirname $(1)`; \
>> > > ?????????? echo " CC??????? $(subst $(build_dir)/,,$(1))"; \
>> > > -????????? $(CC) $(CFLAGS) $(call dynamic_flags,$(1),$(2)) -c
>> > > $(2) -
>> > > o $(1)
>> > > +????????? $(CC) $(CFLAGS) $(call dynamic_flags,$(1),$(2)) -c
>> > > $(subst $(src_dir)/,,$(2)) -o $(1)
>> > > ?compile_as_dep = $(CMD_PREFIX)mkdir -p `dirname $(1)`; \
>> > > ?????????? echo " AS-DEP??? $(subst $(build_dir)/,,$(1))"; \
>> > > ?????????? printf %s `dirname $(1)`/ > $(1) && \
>> > 
>> > That solves the issue and is probably better than passing more
>> > compiler
>> > arguments, thanks!
>> 
>> This will only work if we are compiling from the OpenSBI source
>> directory
>> itself. What if users compile OpenSBI with a different current
>> directory
>> using "make -C <opensbi_source_path>". I guess passing compiler
>> argument will allow "make -C <opensbi_source_path>".
>
> make -C <directory> will switch the path to <directory> first, so the
> result is the same.

Any outstanding concerns with proposing the patch by Xiang W to pass
relative directories instead of the original patch I submitted?

Should it be submitted by Xiang W or should I merge the commit message
from the original patch and submit it myself?

Thanks!


live well,
  vagrant
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 227 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/opensbi/attachments/20211126/7eb1c7fd/attachment.sig>