explicit_merge of 'ff8f93bf075f5225452de6de0f7feb3aa1174889'

              and 'c47b56a3ef9d7d425411c60ff6fef2a174b20ea6'
   using ancestor ''
        to branch 'org.openembedded.dev'

9 files changed, 54 insertions, 12 deletions

diff --git a/packages/binutils/binutils-cross-sdk_2.15.91.0.2.bb b/packages/binutils/binutils-cross-sdk_2.15.91.0.2.bb
index 65130e6345..7b51227cde 100644
--- a/packages/binutils/binutils-cross-sdk_2.15.91.0.2.bb
+++ b/packages/binutils/binutils-cross-sdk_2.15.91.0.2.bb
@@ -1,5 +1,5 @@
 SECTION = "devel"
-PR = "r2"
+PR = "r1"
 include binutils_${PV}.bb
 inherit sdk
 DEPENDS += "flex-native bison-native"
diff --git a/packages/binutils/binutils.inc b/packages/binutils/binutils.inc
index 938fc5754e..680e579a06 100644
--- a/packages/binutils/binutils.inc
+++ b/packages/binutils/binutils.inc
@@ -63,7 +63,15 @@ do_configure () {
 }
 
 do_stage () {
-	autotools_stage_all
+	oe_libinstall -so -a -C opcodes libopcodes ${STAGING_LIBDIR}/
+	oe_libinstall -a -C libiberty libiberty ${STAGING_LIBDIR}/
+	oe_libinstall -so -a -C bfd libbfd ${STAGING_LIBDIR}/
+	install -m 0644 ${S}/include/dis-asm.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/symcat.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/libiberty.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/ansidecl.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/bfdlink.h ${STAGING_INCDIR}/
+	install -m 0644 bfd/bfd.h ${STAGING_INCDIR}/
 }
 
 do_install () {
diff --git a/packages/binutils/binutils_2.16.bb b/packages/binutils/binutils_2.16.bb
index d852a2b658..bb66ca6741 100644
--- a/packages/binutils/binutils_2.16.bb
+++ b/packages/binutils/binutils_2.16.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/"
 SECTION = "devel"
 LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
-PR = "r4"
+PR = "r3"
 
 SRC_URI = \
     "http://ftp.gnu.org/gnu/binutils/binutils-${PV}.tar.bz2 \
@@ -19,7 +19,18 @@ SRC_URI += "file://binutils-2.16-linux-uclibc.patch;patch=1"
 SRC_URI += "file://binutils-2.16-thumb-trampoline.patch;patch=1"
 SRC_URI += "file://binutils-2.16-thumb-glue.patch;patch=1"
 
+#to be removed:
+# this patch does not seem to do anything any longer
+#SRC_URI += "file://binutils-2.15.90.0.3-uclibc-200-build_modules.patch;patch=1"
+
 S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
 include binutils.inc
+
+#to be removed:
+# This was not doing anything because it used the ${B} directory and there
+# was no configure.ac or configure.in in there.
+#do_configure_prepend() {
+#	for dir in bfd gas ld; do ( cd $dir; autoreconf ); done
+#}
diff --git a/packages/ipkg/ipkg.inc b/packages/ipkg/ipkg.inc
index 7f30ba17b8..f535cfbef0 100644
--- a/packages/ipkg/ipkg.inc
+++ b/packages/ipkg/ipkg.inc
@@ -36,7 +36,14 @@ update-alternatives --remove ipkg ${bindir}/ipkg-cl
 }
 
 do_stage() {
-	autotools_stage_all
+	oe_libinstall -so libipkg ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/replace/
+	install -m 0644 replace/replace.h ${STAGING_INCDIR}/replace/
+	install -d ${STAGING_INCDIR}/libipkg/
+	for f in *.h
+	do
+		install -m 0644 $f ${STAGING_INCDIR}/libipkg/
+	done
 }
 
 #
diff --git a/packages/ipkg/ipkg_0.99.152.bb b/packages/ipkg/ipkg_0.99.152.bb
index 89a7dbc953..1898c6656e 100644
--- a/packages/ipkg/ipkg_0.99.152.bb
+++ b/packages/ipkg/ipkg_0.99.152.bb
@@ -1,2 +1 @@
 include ipkg.inc
-PR = "r1"
diff --git a/packages/ipkg/ipkg_0.99.153.bb b/packages/ipkg/ipkg_0.99.153.bb
index 10a606d2e9..99249a8d55 100644
--- a/packages/ipkg/ipkg_0.99.153.bb
+++ b/packages/ipkg/ipkg_0.99.153.bb
@@ -2,7 +2,7 @@ DEFAULT_PREFERENCE = "-1"
 
 include ipkg.inc
 
-PR = "r2"
+PR = "r1"
 
 SRC_URI += "file://fix-bug1393.patch;patch=1"
 
diff --git a/packages/ipkg/ipkg_0.99.154.bb b/packages/ipkg/ipkg_0.99.154.bb
index 89a7dbc953..1898c6656e 100644
--- a/packages/ipkg/ipkg_0.99.154.bb
+++ b/packages/ipkg/ipkg_0.99.154.bb
@@ -1,2 +1 @@
 include ipkg.inc
-PR = "r1"
diff --git a/packages/libgphoto2/libgphoto2_2.1.6.bb b/packages/libgphoto2/libgphoto2_2.1.6.bb
index 2b7913ec5f..b814f9a469 100644
--- a/packages/libgphoto2/libgphoto2_2.1.6.bb
+++ b/packages/libgphoto2/libgphoto2_2.1.6.bb
@@ -2,7 +2,7 @@ SECTION = "libs"
 DEPENDS = "jpeg libusb libexif"
 RPEDENDS = "libusb"
 DESCRIPTION = "libgphoto2 allows you to access digital cameras"
-PR = "r5"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz"
 
@@ -12,9 +12,25 @@ LICENSE = "GPL"
 inherit autotools pkgconfig
 
 do_stage() {
-	autotools_stage_all
-}
+	install -d ${STAGING_LIBDIR}
+	mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true
+	oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR}
+	oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR}
+
+	install -d ${STAGING_LIBDIR}/gphoto2/2.0
+	oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0
 
+        install -d ${STAGING_INCDIR}/gphoto2
+        for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h
+        do
+                install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X
+        done
+        for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h
+        do
+                install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X
+        done
+}
 PACKAGES =+ "libgphoto2-camlibs"
 FILES_libgphoto2-camlibs = "/usr/lib/gphoto2_port/ /usr/lib/gphoto2/"
 RDEPENDS_libgphoto2 = "libgphoto2-camlibs"
+
diff --git a/packages/sysfsutils/sysfsutils_1.3.0.bb b/packages/sysfsutils/sysfsutils_1.3.0.bb
index ec8499020f..82af8d353d 100644
--- a/packages/sysfsutils/sysfsutils_1.3.0.bb
+++ b/packages/sysfsutils/sysfsutils_1.3.0.bb
@@ -1,4 +1,3 @@
-PR = "r1"
 SECTION = "base"
 DESCRIPTION = "System Utilities Based on Sysfs"
 HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html"
@@ -15,5 +14,8 @@ PACKAGES_prepend = "libsysfs "
 FILES_libsysfs = "${libdir}/*.so.1.0.3"
 
 do_stage () {
-	autotools_stage_all
+	oe_libinstall -a -so -C lib libsysfs ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/sysfs
+	install -m 0644 ${S}/include/dlist.h ${STAGING_INCDIR}/sysfs
+	install -m 0644 ${S}/include/libsysfs.h ${STAGING_INCDIR}/sysfs
 }