Patchwork autofs: two fixes

login
register
mail settings
Submitter rongqing.li@windriver.com
Date June 18, 2013, 6:32 a.m.
Message ID <1371537142-19210-1-git-send-email-rongqing.li@windriver.com>
Download mbox | patch
Permalink /patch/51879/
State Accepted
Headers show

Comments

rongqing.li@windriver.com - June 18, 2013, 6:32 a.m.
From: "Roy.Li" <rongqing.li@windriver.com>

autofs's lib sources have a dependency on a number of files that are
generated by rpcgen during buildtime.

fix a typo in configure.in

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
---
 .../autofs-5.0.7/autofs-5.0.7-fix-lib-deps.patch      |   17 +++++++++++++++++
 .../recipes-daemons/autofs/autofs_5.0.7.bb            |    2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-fix-lib-deps.patch
Joe MacDonald - June 18, 2013, 2:11 p.m.
Merged.  I re-generated your autofs-5.0.7-fix-lib-deps.patch just to
pretty it up a bit.  Please try to avoid sending patches with timestamps
in the diff.

Thanks, Roy.
-J.

[[PATCH] autofs: two fixes] On 13.06.18 (Tue 14:32) rongqing.li@windriver.com wrote:

> From: "Roy.Li" <rongqing.li@windriver.com>
> 
> autofs's lib sources have a dependency on a number of files that are
> generated by rpcgen during buildtime.
> 
> fix a typo in configure.in
> 
> Signed-off-by: Roy.Li <rongqing.li@windriver.com>
> ---
>  .../autofs-5.0.7/autofs-5.0.7-fix-lib-deps.patch      |   17 +++++++++++++++++
>  .../recipes-daemons/autofs/autofs_5.0.7.bb            |    2 ++
>  2 files changed, 19 insertions(+)
>  create mode 100644 meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-fix-lib-deps.patch
> 
> diff --git a/meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-fix-lib-deps.patch b/meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-fix-lib-deps.patch
> new file mode 100644
> index 0000000..eff49f1
> --- /dev/null
> +++ b/meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-fix-lib-deps.patch
> @@ -0,0 +1,17 @@
> +Fix the dependency issue
> +
> +Upstream-Status: Pending
> +
> +autofs's lib sources have a dependency on a number of files that are
> +generated by rpcgen during buildtime
> +
> +Signed-off-by: Roy.Li <rongqing.li@windriver.com>
> +
> +diff -uNr autofs-5.0.7.orig/lib/Makefile autofs-5.0.7/lib/Makefile
> +--- autofs-5.0.7.orig/lib/Makefile	2013-02-04 13:41:49.946341454 -0800
> ++++ autofs-5.0.7/lib/Makefile	2013-02-04 13:42:19.954107635 -0800
> +@@ -75,3 +75,4 @@
> + clean:
> + 	rm -f $(LIB) $(RPCS) $(OBJS) $(YACCSRC) *.output *~
> + 
> ++$(OBJS): $(RPCS)
> diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
> index 74a4e68..0c66ebc 100644
> --- a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
> +++ b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
> @@ -59,6 +59,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.bz2 \
>             file://libtirpc-name-clash-backout.patch \
>             file://autofs-5.0.7-do-not-check-for-modprobe.patch \
>             file://fix_disable_ldap.patch \
> +           file://autofs-5.0.7-fix-lib-deps.patch \
>  "
>  
>  SRC_URI[md5sum] = "bc46838dece83c02d800ff144ed9f431"
> @@ -87,6 +88,7 @@ CACHED_CONFIGUREVARS = "ac_cv_path_RANLIB=${RANLIB} \
>  "
>  
>  do_configure_prepend () {
> +    sed -e "s:filagdir:flagdir:" -i configure.in
>      if [ ! -e acinclude.m4 ]; then
>          cp aclocal.m4 acinclude.m4
>      fi

Patch

diff --git a/meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-fix-lib-deps.patch b/meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-fix-lib-deps.patch
new file mode 100644
index 0000000..eff49f1
--- /dev/null
+++ b/meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-fix-lib-deps.patch
@@ -0,0 +1,17 @@ 
+Fix the dependency issue
+
+Upstream-Status: Pending
+
+autofs's lib sources have a dependency on a number of files that are
+generated by rpcgen during buildtime
+
+Signed-off-by: Roy.Li <rongqing.li@windriver.com>
+
+diff -uNr autofs-5.0.7.orig/lib/Makefile autofs-5.0.7/lib/Makefile
+--- autofs-5.0.7.orig/lib/Makefile	2013-02-04 13:41:49.946341454 -0800
++++ autofs-5.0.7/lib/Makefile	2013-02-04 13:42:19.954107635 -0800
+@@ -75,3 +75,4 @@
+ clean:
+ 	rm -f $(LIB) $(RPCS) $(OBJS) $(YACCSRC) *.output *~
+ 
++$(OBJS): $(RPCS)
diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
index 74a4e68..0c66ebc 100644
--- a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
+++ b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
@@ -59,6 +59,7 @@  SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.bz2 \
            file://libtirpc-name-clash-backout.patch \
            file://autofs-5.0.7-do-not-check-for-modprobe.patch \
            file://fix_disable_ldap.patch \
+           file://autofs-5.0.7-fix-lib-deps.patch \
 "
 
 SRC_URI[md5sum] = "bc46838dece83c02d800ff144ed9f431"
@@ -87,6 +88,7 @@  CACHED_CONFIGUREVARS = "ac_cv_path_RANLIB=${RANLIB} \
 "
 
 do_configure_prepend () {
+    sed -e "s:filagdir:flagdir:" -i configure.in
     if [ ! -e acinclude.m4 ]; then
         cp aclocal.m4 acinclude.m4
     fi