diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-01 00:12:37 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-01 11:12:12 +0000 |
| commit | c43ae151f572786818fe048233b4bbfd6b0ba2cf (patch) | |
| tree | 93fad62ec3cc6fb968498e04da1b5627e99a2d79 | |
| parent | 7ed28ae9717ea9dad4e131012186d5f08e8f0bec (diff) | |
| download | openembedded-core-contrib-c43ae151f572786818fe048233b4bbfd6b0ba2cf.tar.gz | |
efivar: Fix reproducibility issue
Add sorting to the globbing within the Makefile to make the output
reproducible.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/reproducible.py | 1 | ||||
| -rw-r--r-- | meta/recipes-bsp/efivar/efivar/determinism.patch | 18 | ||||
| -rw-r--r-- | meta/recipes-bsp/efivar/efivar_37.bb | 1 |
3 files changed, 19 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index e8ef7d93f8..bf2d28e508 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -28,7 +28,6 @@ import datetime # ruby-ri-docs, meson: #https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20210215-0_td9la2/packages/diff-html/ exclude_packages = [ - 'efivar', 'glide', 'go-dep', 'go-helloworld', diff --git a/meta/recipes-bsp/efivar/efivar/determinism.patch b/meta/recipes-bsp/efivar/efivar/determinism.patch new file mode 100644 index 0000000000..bdf6bfc4a8 --- /dev/null +++ b/meta/recipes-bsp/efivar/efivar/determinism.patch @@ -0,0 +1,18 @@ +Fix reproducibility issue caused by unsorted wildcard expansion. + +Upstream-Status: Pending +RP 2021/3/1 + +Index: git/src/Makefile +=================================================================== +--- git.orig/src/Makefile ++++ git/src/Makefile +@@ -15,7 +15,7 @@ TARGETS=$(LIBTARGETS) $(BINTARGETS) $(PC + STATICTARGETS=$(STATICLIBTARGETS) $(STATICBINTARGETS) + + LIBEFIBOOT_SOURCES = crc32.c creator.c disk.c gpt.c loadopt.c path-helpers.c \ +- linux.c $(wildcard linux-*.c) ++ linux.c $(sort $(wildcard linux-*.c)) + LIBEFIBOOT_OBJECTS = $(patsubst %.c,%.o,$(LIBEFIBOOT_SOURCES)) + LIBEFIVAR_SOURCES = dp.c dp-acpi.c dp-hw.c dp-media.c dp-message.c \ + efivarfs.c error.c export.c guid.c guids.S guid-symbols.c \ diff --git a/meta/recipes-bsp/efivar/efivar_37.bb b/meta/recipes-bsp/efivar/efivar_37.bb index 9b95721a4e..5bf121ff6e 100644 --- a/meta/recipes-bsp/efivar/efivar_37.bb +++ b/meta/recipes-bsp/efivar/efivar_37.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6626bb1e20189cfa95f2c508ba286393" COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" SRC_URI = "git://github.com/rhinstaller/efivar.git \ + file://determinism.patch \ file://no-werror.patch" SRCREV = "c1d6b10e1ed4ba2be07f385eae5bceb694478a10" |