diff options
author | Armin Kuster <akuster808@gmail.com> | 2018-04-07 15:49:45 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-04-13 12:43:40 -0700 |
commit | 268e9ef7206b8fb959099510da960f54639a0be0 (patch) | |
tree | e467741ef4459b85248272d44f60ebd7c9819619 /meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/top-autoconf.patch | |
parent | 68c8fe1aba92ca2ed5e1156fa0050609ab4f73af (diff) | |
download | meta-openembedded-contrib-268e9ef7206b8fb959099510da960f54639a0be0.tar.gz |
rp-pppoe: refresh patches
WARNING:
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:
checking file src/discovery.c
Hunk #1 succeeded at 472 with fuzz 1 (offset 96 lines)
among others
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/top-autoconf.patch')
-rw-r--r-- | meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/top-autoconf.patch | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/top-autoconf.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/top-autoconf.patch index 4fe73d0171..f64da4fa2f 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/top-autoconf.patch +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/top-autoconf.patch @@ -1,3 +1,8 @@ +From 0b62f71eb5d44d4a57103566ba58022b6304fa4f Mon Sep 17 00:00:00 2001 +From: Tom Rini <tom_rini@mentor.com> +Date: Wed, 27 Jul 2011 03:46:52 +0000 +Subject: [PATCH] rp-pppoe: Port from oe.dev + The autoconf stuff is all in a subdirectory, which is rather annoying as OE expects patches to be applied and autoconf stuff to be done in S. This adds enough autoconf at the top level to allow it to be @@ -6,20 +11,29 @@ directory. Upstream-Status: Inappropriate [build system specific change] -Index: rp-pppoe-3.8/Makefile.am -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rp-pppoe-3.8/Makefile.am 2007-06-08 15:58:16.000000000 +1000 +--- + Makefile.am | 5 +++++ + configure.in | 4 ++++ + 2 files changed, 9 insertions(+) + create mode 100644 Makefile.am + create mode 100644 configure.in + +diff --git a/Makefile.am b/Makefile.am +new file mode 100644 +index 0000000..eff6977 +--- /dev/null ++++ b/Makefile.am @@ -0,0 +1,5 @@ +PACKAGE = rp-pppoe +VERSION = 3.8 + +dnl AM_CFLAGS = -Wall -DDEBUG +SUBDIRS = src -Index: rp-pppoe-3.8/configure.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rp-pppoe-3.8/configure.in 2007-06-08 15:58:16.000000000 +1000 +diff --git a/configure.in b/configure.in +new file mode 100644 +index 0000000..ac1a7e4 +--- /dev/null ++++ b/configure.in @@ -0,0 +1,4 @@ +AC_INIT(src/pppoe.c) +AM_INIT_AUTOMAKE([rp-pppoe], [3.8]) |