From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [1/1] fs/cpio: sort 'find' utility output (reproducible builds)
Date: Mon, 29 Jun 2020 18:05:56 +0200 [thread overview]
Message-ID: <20200629160556.GE20645@scaer> (raw)
In-Reply-To: <20200629153701.7c2c5ca4@monakov-y.xu>
Yurii, All,
On 2020-06-29 15:37 +0300, Yurii Monakov spake thusly:
> Order of find utility results are not sorted and depend on items
> attributes, so cpio produces different results across machines.
>
> This patch sorts find output before piping to cpio to make
> builds reproducible.
>
> Signed-off-by: Yurii Monakov <monakov.y@gmail.com>
Thanks for the ptatch, but see below...
> ---
> fs/cpio/cpio.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk
> index 28a435dd5e..73837ddecb 100644
> --- a/fs/cpio/cpio.mk
> +++ b/fs/cpio/cpio.mk
> @@ -37,7 +37,7 @@ ROOTFS_CPIO_OPTS += --reproducible
> endif
>
> define ROOTFS_CPIO_CMD
> - cd $(TARGET_DIR) && find . | cpio $(ROOTFS_CPIO_OPTS) --quiet -o -H newc > $@
> + cd $(TARGET_DIR) && find . | sort | cpio $(ROOTFS_CPIO_OPTS) --quiet -o -H newc > $@
sort order depends on the locale, so you also have to enforce the locale
to guarantee reproducibility; this is usually done with:
... |LC_ALL=C sort |...
So I've fixed that, wrapped the line that is now too long, and reworded
the commit log slightly.
Applied to master, thanks.
Regards,
Yann E. MORIN.
> endef
>
> ifeq ($(BR2_TARGET_ROOTFS_CPIO_UIMAGE),y)
> --
> 2.17.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2020-06-29 16:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-29 12:37 [Buildroot] [1/1] fs/cpio: sort 'find' utility output (reproducible builds) Yurii Monakov
2020-06-29 16:05 ` Yann E. MORIN [this message]
2020-06-29 17:23 ` Yurii Monakov
2020-07-16 16:33 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200629160556.GE20645@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox