Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

9 files changed, 38 insertions, 10 deletions

diff --git a/conf/distro/include/glibc.inc b/conf/distro/include/glibc.inc
index 1d6b22d8b5..5499dc1d39 100644
--- a/conf/distro/include/glibc.inc
+++ b/conf/distro/include/glibc.inc
@@ -1,5 +1,5 @@
 # Add glibc to the overrides.
-OVERRIDES .= ":glibc"
+#OVERRIDES .= ":glibc"
 
 # The things glibc can provide.  We default to wanting glibc to provide them.
 PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
diff --git a/recipes/logrotate/logrotate_3.7.1.bb b/recipes/logrotate/logrotate_3.7.1.bb
index 0a1647e81d..61a130683d 100644
--- a/recipes/logrotate/logrotate_3.7.1.bb
+++ b/recipes/logrotate/logrotate_3.7.1.bb
@@ -5,7 +5,7 @@ DEPENDS = "popt"
 RDEPENDS = "cron"
 SECTION = "admin"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://ftp.debian.org/debian/pool/main/l/logrotate/logrotate_${PV}.orig.tar.gz \
 	   file://logrotate-3.7.1.patch;patch=1 \
@@ -21,7 +21,7 @@ do_compile() {
 
 do_install () {
     # Install the binary and conf file
-    install -D -s -m 0755 ${S}/logrotate ${D}${base_sbindir}/logrotate
+    install -D -m 0755 ${S}/logrotate ${D}${base_sbindir}/logrotate
     install -D -m 0644 ${WORKDIR}/logrotate.conf ${D}${sysconfdir}/logrotate.conf
     install -m 0755 -d ${D}${sysconfdir}/logrotate.d
 }
diff --git a/recipes/madwifi/madwifi-ng_r3878-20081204.bb b/recipes/madwifi/madwifi-ng_r3878-20081204.bb
index 3db8244158..f4bd6aae3c 100644
--- a/recipes/madwifi/madwifi-ng_r3878-20081204.bb
+++ b/recipes/madwifi/madwifi-ng_r3878-20081204.bb
@@ -14,7 +14,7 @@ require madwifi-ng_r.inc
 SRCNAME = "madwifi-trunk"
 
 # PR set after the include, to override what's set in the included file.
-PR = "r0"
+PR = "r1"
 
 # It's not clear that we even need the wackelf patches any longer; certainly
 # they are not required for ixp4xx builds.  This needs testing on pxa270.
@@ -23,3 +23,9 @@ WACKELF_SRC_URI_compulab-pxa270 = ""
 
 # This works for EABI as well as the original OABI IXP4xx.
 EXTRA_OEMAKE = "V=1 KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX}"
+
+# We really must clear out LDFLAGS to get this to link.
+do_compile() {
+	unset LDFLAGS
+	oe_runmake all
+}
\ No newline at end of file
diff --git a/recipes/meta/slugos-packages.bb b/recipes/meta/slugos-packages.bb
index 9ccc143823..0129ffce79 100644
--- a/recipes/meta/slugos-packages.bb
+++ b/recipes/meta/slugos-packages.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r63"
+PR = "r64"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2|ixp4xx"
@@ -47,7 +47,6 @@ SLUGOS_PACKAGES = "\
 	bind \
 	binutils \
 	bison \
-	bluez-utils \
 	bluez-hcidump \
 	bluez4 \
 	bogofilter \
diff --git a/recipes/monit/monit-4.10.1/no-strip-in-makefile.patch b/recipes/monit/monit-4.10.1/no-strip-in-makefile.patch
new file mode 100644
index 0000000000..26f5108a2d
--- /dev/null
+++ b/recipes/monit/monit-4.10.1/no-strip-in-makefile.patch
@@ -0,0 +1,11 @@
+--- monit-4.10.1/Makefile.in.orig	2009-05-10 21:19:00.000000000 -0500
++++ monit-4.10.1/Makefile.in	2009-05-10 21:19:11.000000000 -0500
+@@ -39,7 +39,7 @@ MODE_CONF       = 600
+ MODE_DIRS       = 755
+ 
+ INSTALL         = @INSTALL@ 
+-INSTALL_PROG    = $(INSTALL) -m $(MODE_PROGS) -s
++INSTALL_PROG    = $(INSTALL) -m $(MODE_PROGS)
+ INSTALL_FILE    = $(INSTALL) -m $(MODE_FILES)
+ INSTALL_DIR     = $(INSTALL) -m $(MODE_DIRS) -d
+ 
diff --git a/recipes/monit/monit_4.10.1.bb b/recipes/monit/monit_4.10.1.bb
index bb18491c5d..06d382f1e5 100644
--- a/recipes/monit/monit_4.10.1.bb
+++ b/recipes/monit/monit_4.10.1.bb
@@ -1,7 +1,9 @@
 LICENSE = "GPL"
 DEPENDS = "openssl"
+PR = "r1"
 
 SRC_URI = "http://www.tildeslash.com/monit/dist/monit-${PV}.tar.gz\
+	file://no-strip-in-makefile.patch;patch=1 \
 	file://init"
 
 INITSCRIPT_NAME = "monit"
diff --git a/recipes/netpbm/netpbm_10.28.bb b/recipes/netpbm/netpbm_10.28.bb
index cceac41541..8469074fbd 100644
--- a/recipes/netpbm/netpbm_10.28.bb
+++ b/recipes/netpbm/netpbm_10.28.bb
@@ -25,7 +25,7 @@ RDEPENDS = "perl\
 RDEPENDS += "perl-module-exporter-heavy"
 RDEPENDS += "perl-module-file-spec-unix"
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/netpbm/netpbm-${PV}.tgz \
 	   file://ppmtojpeg.patch;patch=42 \
@@ -34,7 +34,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/netpbm/netpbm-${PV}.tgz \
 
 PARALLEL_MAKE = ""
 
-EXTRA_OEMAKE = "ENDIANGEN=${S}/buildtools/oeendiangen TARGET_LD=${LD}"
+EXTRA_OEMAKE = "ENDIANGEN=${S}/buildtools/oeendiangen TARGET_LD=${LD} 'STRIPFLAG='"
 
 do_configure() {
 	install -c -m 644 ../Makefile.config .
diff --git a/recipes/openobex/openobex_1.5.bb b/recipes/openobex/openobex_1.5.bb
index ab69cf18e9..faa6c066ec 100644
--- a/recipes/openobex/openobex_1.5.bb
+++ b/recipes/openobex/openobex_1.5.bb
@@ -5,6 +5,7 @@ SECTION = "libs"
 PROVIDES = "openobex-apps"
 DEPENDS = "libusb-compat bluez4"
 LICENSE = "GPL"
+PR = "r1"
 
 SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/openobex-${PV}.tar.gz \
            file://disable-cable-test.patch;patch=1 \
@@ -15,6 +16,11 @@ inherit autotools_stage binconfig pkgconfig
 EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump \
                 --with-usb=${STAGING_LIBDIR}/.. --with-bluez=${STAGING_LIBDIR}/.."
 
+do_stage_append() {
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 0644 ${S}/openobex.m4 ${STAGING_DATADIR}/aclocal
+}
+
 PACKAGES += "openobex-apps"
 FILES_${PN} = "${libdir}/lib*.so.*"
 FILES_${PN}-dev += "${bindir}/openobex-config"
diff --git a/recipes/tasks/task-mokogateway.bb b/recipes/tasks/task-mokogateway.bb
index 1575b41780..b0214dc388 100644
--- a/recipes/tasks/task-mokogateway.bb
+++ b/recipes/tasks/task-mokogateway.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "MokoGateway: Tasks for a companion server for the Openmoko Linux Distribution"
 LICENSE = "MIT"
 PROVIDES = "task-mokogateway-everything"
-PR = "r5"
+PR = "r6"
 
 inherit task
 
@@ -33,7 +33,7 @@ RRECOMMENDS_task-mokogateway-usbnet = "\
 
 DESCRIPTION_task-mokogateway-bluetooth = "MokoGateway: Bluetooth"
 RDEPENDS_task-mokogateway-bluetooth = "\
-	bluez-utils \
+	bluez4 \
 "
 RRECOMMENDS_task-mokogateway-bluetooth = "\
 	kernel-module-bluetooth \
@@ -84,5 +84,9 @@ RDEPENDS_task-mokogateway-debug = "\
 # will, at least, get the feeds working again.
 #	dfu-util \
 #	openocd \
+#
+# The following packages are obsolete, and have been replaced.
+#	bluez-utils \
+
 RRECOMMENDS_task-mokogateway-debug = "\
 "