[oe-commits] [meta-openembedded] 03/34: pcmciautils: drop duplicate chunk from pcmciautils-018/makefile_race.patch

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 0e7c69ee8a67240017fb219d673cbcda4c551359
Author: Andrea Adami <andrea.adami at gmail.com>
AuthorDate: Tue Aug 14 16:38:16 2018 +0200

    pcmciautils: drop duplicate chunk from pcmciautils-018/makefile_race.patch
    
    The new rule was patched into the makefile twice.
    
    Backport of oe-core commit c52228f4d071
    
    Signed-off-by: Alexander Kanavin <alexander.kanavin at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../pcmciautils/pcmciautils/makefile_race.patch            | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_race.patch b/meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_race.patch
index f5a518f..4c5eba7 100644
--- a/meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_race.patch
+++ b/meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_race.patch
@@ -16,20 +16,6 @@ Index: pcmciautils-018/Makefile
 ===================================================================
 --- pcmciautils-018.orig/Makefile
 +++ pcmciautils-018/Makefile
-@@ -249,6 +249,9 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/st
- yacc_config.o lex_config.o: %.o: %.c src/yacc_config.h
- 	$(CC) -c -MD -O -pipe $(CPPFLAGS) $<
- 
-+src/lex_config.o : src/lex_config.c src/yacc_config.h
-+	$(QUIET) $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
-+
- debugtools: ccdv $(CBDUMP) $(CISDUMP)
- 
- $(CBDUMP): $(LIBC) debug/cbdump.o
-Index: pcmciautils-018/Makefile
-===================================================================
---- pcmciautils-018.orig/Makefile
-+++ pcmciautils-018/Makefile
 @@ -246,8 +246,8 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/st
  	$(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/startup.o src/yacc_config.o src/lex_config.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
  	$(QUIET) $(STRIPCMD) $@

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.