(Finally) Merged, thanks.

-J.

[[meta-networking][PATCH] radvd: change scanner.* file dependency] On 12.12.26 (Wed 15:11) rongqing.li@windriver.com wrote:

> From: "Roy.Li" <rongqing.li@windriver.com>
> 
> generation of scanner.c needs gram.h, not just scanner.o
> 
> Signed-off-by: Roy.Li <rongqing.li@windriver.com>
> ---
>  .../radvd/files/change-scanner-dependency.patch    |   24 ++++++++++++++++++++
>  recipes-daemons/radvd/radvd_1.9.1.bb               |    5 +++-
>  2 files changed, 28 insertions(+), 1 deletion(-)
>  create mode 100644 recipes-daemons/radvd/files/change-scanner-dependency.patch
> 
> diff --git a/recipes-daemons/radvd/files/change-scanner-dependency.patch b/recipes-daemons/radvd/files/change-scanner-dependency.patch
> new file mode 100644
> index 0000000..b190866
> --- /dev/null
> +++ b/recipes-daemons/radvd/files/change-scanner-dependency.patch
> @@ -0,0 +1,24 @@
> +scanner.c is generated by flex using scanner.l, scanner.l needs gram.h
> +when produce scanner.c, so redefine the dependency relation
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Roy.Li <rongqing.li@windriver.com>
> +---
> + Makefile.am |    3 +--
> + 1 files changed, 1 insertions(+), 2 deletions(-)
> +
> +diff --git a/Makefile.am b/Makefile.am
> +index 04b834b..2da986c 100644
> +--- a/Makefile.am
> ++++ b/Makefile.am
> +@@ -131,5 +131,4 @@ dist-hook:
> + 	rm -f $(distdir)/gram.h
> + 	rm -f $(distdir)/scanner.c
> + 
> +-scanner.o: gram.h
> +-
> ++scanner.c: gram.h
> +-- 
> +1.7.4.1
> +
> diff --git a/recipes-daemons/radvd/radvd_1.9.1.bb b/recipes-daemons/radvd/radvd_1.9.1.bb
> index 26d21ce..37c224b 100644
> --- a/recipes-daemons/radvd/radvd_1.9.1.bb
> +++ b/recipes-daemons/radvd/radvd_1.9.1.bb
> @@ -1,6 +1,9 @@
> -PR = "r0"
> +PR = "r1"
>  
>  require radvd.inc
>  
>  SRC_URI[md5sum] = "e807ad7e9a76d46b6133df391385cd31"
>  SRC_URI[sha256sum] = "54eb5704a2b710ba946fa30d2bca811fa23b1b3bfab322c38cb0c2a9619aa933"
> +
> +SRC_URI += "\
> +	file://change-scanner-dependency.patch"
-- 
-Joe MacDonald.
:wq