autofs: fix ldflags issue, missing debug info, duplicate opt flags.

Signed-off-by: Chris Larson <clarson@kergoth.com>

diff --git a/recipes/autofs/autofs-4.1.4/Makefile.rules-cross.patch b/recipes/autofs/autofs-4.1.4/Makefile.rules-cross.patch
index d8b3692..dd54dc1 100644 (file)
--- a/recipes/autofs/autofs-4.1.4/Makefile.rules-cross.patch
+++ b/recipes/autofs/autofs-4.1.4/Makefile.rules-cross.patch
@@ -6,15 +6,15 @@
  ifdef DEBUG
 -CFLAGS    = -O2 -g -DDEBUG
 -LDFLAGS   = -g
-+CFLAGS    += -O2 -g -DDEBUG
-+LDFLAGS   += -g
++CFLAGS    ?= -O2 -g -DDEBUG
++LDFLAGS   ?= -g
  STRIP     = :
  else
 -CFLAGS    = -O3 -fomit-frame-pointer -Wall
 -LDFLAGS   = -s
 -STRIP     = strip --strip-debug
-+CFLAGS    += -O3 -fomit-frame-pointer -Wall
-+LDFLAGS   += -s
++CFLAGS    ?= -O3 -fomit-frame-pointer -Wall
++LDFLAGS   ?= -s
 +STRIP     = ${TARGET_PREFIX}strip --strip-debug
  endif
  

diff --git a/recipes/autofs/autofs_4.1.4.bb b/recipes/autofs/autofs_4.1.4.bb
index d9863ad..2f998ab 100644 (file)
--- a/recipes/autofs/autofs_4.1.4.bb
+++ b/recipes/autofs/autofs_4.1.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Kernel based automounter for linux."
 SECTION = "base"
 LICENSE = "GPL"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-${PV}.tar.bz2 \
            ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-misc-fixes.patch;patch=1 \
@@ -20,7 +20,9 @@ inherit autotools update-rc.d
 INITSCRIPT_NAME = "autofs"
 INITSCRIPT_PARAMS = "defaults"
 
-EXTRA_OEMAKE="TARGET_PREFIX=${TARGET_PREFIX}"
+# FIXME: modules/Makefile has crappy rules that don't obey LDFLAGS
+CFLAGS += "${LDFLAGS}"
+EXTRA_OEMAKE = "STRIP=/bin/true"
 PARALLEL_MAKE = ""
 
 do_configure_prepend () {