summaryrefslogtreecommitdiffstats
path: root/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot/0003-gard-Fix-Makefile-race-condition.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot/0003-gard-Fix-Makefile-race-condition.patch')
-rw-r--r--meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot/0003-gard-Fix-Makefile-race-condition.patch43
1 files changed, 0 insertions, 43 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot/0003-gard-Fix-Makefile-race-condition.patch b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot/0003-gard-Fix-Makefile-race-condition.patch
deleted file mode 100644
index 703874ec0..000000000
--- a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot/0003-gard-Fix-Makefile-race-condition.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 7355feb27c79c406cc57e03da29e8f7a28f38c7e Mon Sep 17 00:00:00 2001
-From: Patrick Williams <patrick@stwcx.xyz>
-Date: Fri, 16 Sep 2016 15:41:02 -0500
-Subject: [PATCH] gard: Fix Makefile race condition
-
-Commit fd599965 added some dependencies in 'external/pflash'
-for libflash files that are created via symlink. Replicate
-that same behavior in 'external/gard' to prevent race conditions
-where we attempt to compile files from libflash before they are
-symlink'd.
-
-Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
----
- external/gard/rules.mk | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/external/gard/rules.mk b/external/gard/rules.mk
-index dfe93d5..3a7f6d9 100644
---- a/external/gard/rules.mk
-+++ b/external/gard/rules.mk
-@@ -2,7 +2,9 @@
-
- override CFLAGS += -O2 -Wall -Werror -I.
- OBJS = version.o gard.o
--LIBFLASH_OBJS += libflash-file.o libflash-libflash.o libflash-libffs.o libflash-ecc.o libflash-blocklevel.o
-+LIBFLASH_FILES := libflash.c libffs.c ecc.c blocklevel.c file.c
-+LIBFLASH_OBJS := $(addprefix libflash-, $(LIBFLASH_FILES:.c=.o))
-+LIBFLASH_SRC := $(addprefix libflash/,$(LIBFLASH_FILES))
- OBJS += $(LIBFLASH_OBJS)
- OBJS += common-arch_flash.o
- EXE = gard
-@@ -24,6 +26,8 @@ version.c: make_version.sh .version
- %.o : %.c
- $(CC) $(CFLAGS) -c $< -o $@
-
-+$(LIBFLASH_SRC): | links
-+
- $(LIBFLASH_OBJS): libflash-%.o : libflash/%.c
- $(CC) $(CFLAGS) -c $< -o $@
-
---
-2.7.3
-
OpenPOWER on IntegriCloud