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

12 files changed, 71 insertions, 12 deletions

diff --git a/recipes/bison/bison_2.3.bb b/recipes/bison/bison_2.3.bb
index edf549f442..729756b0fd 100644
--- a/recipes/bison/bison_2.3.bb
+++ b/recipes/bison/bison_2.3.bb
@@ -4,7 +4,17 @@ LICENSE = "GPL"
 SECTION = "devel"
 PRIORITY = "optional"
 
+PR = "r1"
+
 SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
 	   file://m4.patch;patch=1"
 
 inherit autotools
+
+# >> bison-2.3-r0: /usr/lib/liby.a
+# That one is a special case: it wants to stay in the main bison package,
+# since bison itself is a development tool.  I'm not sure why it is a
+# static-only library; that might be an error.
+
+FILES_${PN} += "${libdir}/liby.a"
+
diff --git a/recipes/flex/flex.inc b/recipes/flex/flex.inc
index 048b3cb47d..4ebd44a61b 100644
--- a/recipes/flex/flex.inc
+++ b/recipes/flex/flex.inc
@@ -9,3 +9,9 @@ S = "${WORKDIR}/flex-${PV}"
 
 inherit autotools
 
+# >> flex-2.5.31-r4: /usr/lib/libfl.a
+# That one is a special case: it wants to stay in the main flex package,
+# since flex itself is a development tool.  I'm not sure why it is a
+# static-only library; that might be an error
+
+FILES_${PN} += "${libdir}/libfl.a"
diff --git a/recipes/flex/flex_2.5.31.bb b/recipes/flex/flex_2.5.31.bb
index 3062e2d8dc..e247a03ee8 100644
--- a/recipes/flex/flex_2.5.31.bb
+++ b/recipes/flex/flex_2.5.31.bb
@@ -1,5 +1,5 @@
 require flex.inc
-PR = "r4"
+PR = "r5"
 
 SRC_URI += "file://include.patch;patch=1"
 
diff --git a/recipes/glibc/glibc-package.bbclass b/recipes/glibc/glibc-package.bbclass
index 1d7f5cd309..179e41f734 100644
--- a/recipes/glibc/glibc-package.bbclass
+++ b/recipes/glibc/glibc-package.bbclass
@@ -29,7 +29,7 @@ BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc"
 # Set this to zero if you don't want ldconfig in the output package
 USE_LDCONFIG ?= "1"
 
-PACKAGES = "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile"
+PACKAGES = "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-static glibc-doc glibc-locale libcidn libmemusage libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile"
 PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* locale-base-* glibc-binary-localedata-*"
 
 INSANE_SKIP_glibc-dbg = True
@@ -39,9 +39,11 @@ libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${ba
 FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${datadir}/zoneinfo ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig', '', d)}"
 FILES_ldd = "${bindir}/ldd"
 FILES_libsegfault = "${base_libdir}/libSegFault*"
+FILES_libcidn = "${base_libdir}/libcidn*.so"
+FILES_libmemusage = "${base_libdir}/libmemusage.so"
 FILES_glibc-extra-nss = "${base_libdir}/libnss*"
 FILES_sln = "${base_sbindir}/sln"
-FILES_glibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen"
+FILES_glibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen ${libdir}/*nonshared.a"
 FILES_nscd = "${sbindir}/nscd* ${sysconfdir}/nscd* ${sysconfdir}/init.d/nscd*"
 FILES_glibc-utils = "${bindir}/* ${sbindir}/*"
 FILES_glibc-gconv = "${libdir}/gconv/*"
diff --git a/recipes/libsdl/ballfield_1.0.bb b/recipes/libsdl/ballfield_1.0.bb
index 9b44be5516..9cb361add2 100644
--- a/recipes/libsdl/ballfield_1.0.bb
+++ b/recipes/libsdl/ballfield_1.0.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "This is a cute little "3D" sprite demo using SDL and SDL_image."
-DEPENDS = "vrtual/libsdl libsdl-image"
+DEPENDS = "virtual/libsdl libsdl-image"
 LICENSE = "GPLv2"
 
 SRC_URI = "http://olofson.net/download/ballfield-${PV}.tar.gz"
diff --git a/recipes/libxml/libxml2.inc b/recipes/libxml/libxml2.inc
index f7ecaff977..bc31123e7c 100644
--- a/recipes/libxml/libxml2.inc
+++ b/recipes/libxml/libxml2.inc
@@ -5,6 +5,8 @@ LICENSE = "MIT"
 
 SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz"
 
+PR = "r1"
+
 inherit autotools pkgconfig binconfig
 
 EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n"
@@ -23,7 +25,14 @@ do_stage() {
 
 DEBIANNAME_${PN} = "libxml2"
 
-PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
+PACKAGES =+ "${PN}-utils"
+FILES_${PN} = "${libexecdir}/* ${libdir}/lib*${SOLIBS} \
+            ${sysconfdir} ${sharedstatedir} ${localstatedir} \
+            ${base_libdir}/*${SOLIBS} \
+            ${datadir}/${PN} ${libdir}/${PN}/* \
+            ${datadir}/pixmaps ${datadir}/applications \
+            ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
+            ${libdir}/bonobo/servers"
 
 FILES_${PN}-dev += "${bindir}/*-config"
-FILES_${PN}-utils += "${bindir}/* ${libdir}/*.sh"
+FILES_${PN}-utils = "${bindir}/xmllint ${bindir}/xmlcatalog ${libdir}/*.sh"
diff --git a/recipes/libxml/libxml2_2.7.3.bb b/recipes/libxml/libxml2_2.7.3.bb
index 555a436a63..fa80f36f2f 100644
--- a/recipes/libxml/libxml2_2.7.3.bb
+++ b/recipes/libxml/libxml2_2.7.3.bb
@@ -1,4 +1,2 @@
 require libxml2.inc
 
-PR = "r0"
-
diff --git a/recipes/netbase/netbase/igep0020/interfaces b/recipes/netbase/netbase/igep0020/interfaces
new file mode 100644
index 0000000000..d7409f7a64
--- /dev/null
+++ b/recipes/netbase/netbase/igep0020/interfaces
@@ -0,0 +1,5 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+
+# The loopback interface
+auto lo
+iface lo inet loopback
diff --git a/recipes/netbase/netbase_4.21.bb b/recipes/netbase/netbase_4.21.bb
index 403ca191b1..0ce40ba93e 100644
--- a/recipes/netbase/netbase_4.21.bb
+++ b/recipes/netbase/netbase_4.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \
 infrastructure for basic TCP/IP based networking."
 SECTION = "base"
 LICENSE = "GPL"
-PR = "r38"
+PR = "r39"
 
 inherit update-rc.d
 
diff --git a/recipes/tzcode/tzcode-native_2009k.bb b/recipes/tzcode/tzcode-native_2009k.bb
index 868b85418d..632dc8456d 100644
--- a/recipes/tzcode/tzcode-native_2009k.bb
+++ b/recipes/tzcode/tzcode-native_2009k.bb
@@ -1,5 +1,5 @@
 require tzcode-native.inc
 SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzcode${PV}.tar.gz \
-	   ftp://elsie.nci.nih.gov/pub/tzdata2009o.tar.gz \
+           ftp://elsie.nci.nih.gov/pub/tzdata2009p.tar.gz \
 	  "
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
diff --git a/recipes/xorg-xserver/xserver-xorg-conf/igep0020/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/igep0020/xorg.conf
new file mode 100644
index 0000000000..07d849d705
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-conf/igep0020/xorg.conf
@@ -0,0 +1,29 @@
+Section "Module"
+        Load    "extmod"
+        Load    "dbe"
+        Load    "glx"
+        Load    "freetype"
+        Load    "type1"
+        Load    "record"
+        Load    "dri"
+EndSection
+
+Section "Monitor"
+        Identifier      "Builtin Default Monitor"
+EndSection
+
+Section "Device"
+        Identifier      "Builtin Default fbdev Device 0"
+        Driver  "omapfb"
+EndSection
+
+Section "Screen"
+        Identifier      "Builtin Default fbdev Screen 0"
+        Device  "Builtin Default fbdev Device 0"
+        Monitor "Builtin Default Monitor"
+EndSection
+
+Section "ServerLayout"
+        Identifier      "Builtin Default Layout"
+        Screen  "Builtin Default fbdev Screen 0"
+EndSection
diff --git a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
index ba52376ab2..37d200ba5d 100644
--- a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Machine specific xorg.conf files"
-PR = "r11"
+PR = "r12"
 
 SRC_URI = "file://xorg.conf"