diff options
| author |   Andrea Adami <andrea.adami@gmail.com> | 2018-08-14 16:38:16 +0200 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2018-08-19 16:09:28 -0700 |
| commit | 6b92e3e81b30bcf858eda443c20f9f4ff5673c8b (patch) | |
| tree | a273dabf8c586dfea164ce2d3111bdd4e77e6aec /meta-oe/recipes-bsp/pcmciautils | |
| parent | db36d53cc58ec5253166e1cb3e112308a47506e2 (diff) | |
| download | meta-openembedded-6b92e3e81b30bcf858eda443c20f9f4ff5673c8b.tar.gz | |
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@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-bsp/pcmciautils')
| -rw-r--r-- | meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_race.patch | 14 |
1 files changed, 0 insertions, 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 f5a518ff73..4c5eba7951 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) $@ |