diff options
| author |   Armin Kuster <akuster808@gmail.com> | 2018-04-07 23:04:26 -0700 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2018-04-13 12:43:39 -0700 |
| commit | 24af0456caceb4bc7f78812a0c7d3a02df8e2e4a (patch) | |
| tree | d7ae342b986ea4cc89798cfc12bfd2dd63fe804d /meta-networking | |
| parent | d46d50c5756a7f0666b3744782d8c01944edd28f (diff) | |
| download | meta-openembedded-24af0456caceb4bc7f78812a0c7d3a02df8e2e4a.tar.gz | |
ctdb: refresh patches
WARNING: ctdb-2.5.6-r0 do_patch:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
Applying patch 02-link-rep_snprintf-for-ltdbtool.patch
patching file Makefile.in
Hunk #1 succeeded at 176 with fuzz 2 (offset 6 lines).
Now at patch 02-link-rep_snprintf-for-ltdbtool.patch
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch b/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch index 1dd9b93a5a..1294fe41b5 100644 --- a/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch +++ b/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch @@ -2,15 +2,16 @@ link rep_snprintf from lib/replace/snprintf.o for ltdbtool Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> -diff -Nurp ctdb-2.5.1.orig/Makefile.in ctdb-2.5.1/Makefile.in ---- ctdb-2.5.1.orig/Makefile.in 2015-05-07 16:43:39.276000236 +0900 -+++ ctdb-2.5.1/Makefile.in 2015-05-07 16:44:09.627000237 +0900 -@@ -170,7 +170,7 @@ bin/ctdb: $(CTDB_CLIENT_OBJ) tools/ctdb. +Index: ctdb-2.5.6/Makefile.in +=================================================================== +--- ctdb-2.5.6.orig/Makefile.in ++++ ctdb-2.5.6/Makefile.in +@@ -176,7 +176,7 @@ bin/ctdb: $(CTDB_CLIENT_OBJ) tools/ctdb. @echo Linking $@ $(WRAPPER) $(CC) $(CFLAGS) -o $@ tools/ctdb.o tools/ctdb_vacuum.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) -bin/ltdbtool: tools/ltdbtool.o $(TDB_OBJ) +bin/ltdbtool: tools/ltdbtool.o $(TDB_OBJ) lib/replace/snprintf.o @echo Linking $@ - $(WRAPPER) $(CC) $(CFLAGS) -o $@ $+ $(TDB_LIBS) $(LIB_FLAGS) + $(WRAPPER) $(CC) $(CFLAGS) -o $@ $+ $(LIB_FLAGS) |