merge of '0737af91de87534a67944bad4308b43b04d675db'

     and 'a4130542b7ace1980eb68dfc893a72e142cbce80'

15 files changed, 15 insertions, 9 deletions

diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass
index 801f30c8e6..7fdfa65e5b 100644
--- a/packages/glibc/glibc-package.bbclass
+++ b/packages/glibc/glibc-package.bbclass
@@ -26,7 +26,7 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "0"
 BINARY_LOCALE_ARCHES ?= "arm.*"
 
 PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile"
-PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-*"
+PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* libc6*"
 
 libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*"
 
diff --git a/packages/ipkg/ipkg-collateral.bb b/packages/ipkg/ipkg-collateral.bb
index a4f7bb7e3a..b0e2a2ed06 100644
--- a/packages/ipkg/ipkg-collateral.bb
+++ b/packages/ipkg/ipkg-collateral.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "ipkg configuration files"
 SECTION = "base"
 LICENSE = "MIT"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = " \
 file://ipkg.conf.comments	\
diff --git a/packages/ipkg/ipkg-native_0.99.152.bb b/packages/ipkg/ipkg-native_0.99.152.bb
index 64868b1e1f..f2deb33fba 100644
--- a/packages/ipkg/ipkg-native_0.99.152.bb
+++ b/packages/ipkg/ipkg-native_0.99.152.bb
@@ -1,2 +1,3 @@
 require ipkg_${PV}.bb
 require ipkg-native.inc
+PR = "r1"
diff --git a/packages/ipkg/ipkg-native_0.99.153.bb b/packages/ipkg/ipkg-native_0.99.153.bb
index 64868b1e1f..f2deb33fba 100644
--- a/packages/ipkg/ipkg-native_0.99.153.bb
+++ b/packages/ipkg/ipkg-native_0.99.153.bb
@@ -1,2 +1,3 @@
 require ipkg_${PV}.bb
 require ipkg-native.inc
+PR = "r1"
diff --git a/packages/ipkg/ipkg-native_0.99.154.bb b/packages/ipkg/ipkg-native_0.99.154.bb
index 64868b1e1f..f2deb33fba 100644
--- a/packages/ipkg/ipkg-native_0.99.154.bb
+++ b/packages/ipkg/ipkg-native_0.99.154.bb
@@ -1,2 +1,3 @@
 require ipkg_${PV}.bb
 require ipkg-native.inc
+PR = "r1"
diff --git a/packages/ipkg/ipkg-native_0.99.159.bb b/packages/ipkg/ipkg-native_0.99.159.bb
index 64868b1e1f..f2deb33fba 100644
--- a/packages/ipkg/ipkg-native_0.99.159.bb
+++ b/packages/ipkg/ipkg-native_0.99.159.bb
@@ -1,2 +1,3 @@
 require ipkg_${PV}.bb
 require ipkg-native.inc
+PR = "r1"
diff --git a/packages/ipkg/ipkg-native_0.99.163.bb b/packages/ipkg/ipkg-native_0.99.163.bb
index bb480f0c99..bf060f89fe 100644
--- a/packages/ipkg/ipkg-native_0.99.163.bb
+++ b/packages/ipkg/ipkg-native_0.99.163.bb
@@ -2,6 +2,7 @@ S = "${WORKDIR}/ipkg-${PV}"
 
 #require ipkg_${PV}.bb
 require ipkg-native.inc
+PR = "r1"
 
 inherit autotools pkgconfig native
 
diff --git a/packages/ipkg/ipkg.inc b/packages/ipkg/ipkg.inc
index 8fc6c9efe0..adc7714bea 100644
--- a/packages/ipkg/ipkg.inc
+++ b/packages/ipkg/ipkg.inc
@@ -6,7 +6,7 @@ PROVIDES = "virtual/ipkg libipkg"
 
 PACKAGES =+ "libipkg-dev libipkg"
 FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
-FILES_libipkg = "${libdir}"
+FILES_libipkg = "${libdir}/*.so.*"
 AUTO_LIBNAME_PKGS = "libipkg"
 
 SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \
diff --git a/packages/ipkg/ipkg_0.99.152.bb b/packages/ipkg/ipkg_0.99.152.bb
index d76673e5c9..0d10a29c3f 100644
--- a/packages/ipkg/ipkg_0.99.152.bb
+++ b/packages/ipkg/ipkg_0.99.152.bb
@@ -1,2 +1,2 @@
 require ipkg.inc
-PR = "r2"
+PR = "r3"
diff --git a/packages/ipkg/ipkg_0.99.153.bb b/packages/ipkg/ipkg_0.99.153.bb
index 5a91e09f9b..5852b6afc4 100644
--- a/packages/ipkg/ipkg_0.99.153.bb
+++ b/packages/ipkg/ipkg_0.99.153.bb
@@ -2,7 +2,7 @@ DEFAULT_PREFERENCE = "-1"
 
 require ipkg.inc
 
-PR = "r3"
+PR = "r4"
 
 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 0d10a29c3f..20a1996658 100644
--- a/packages/ipkg/ipkg_0.99.154.bb
+++ b/packages/ipkg/ipkg_0.99.154.bb
@@ -1,2 +1,2 @@
 require ipkg.inc
-PR = "r3"
+PR = "r4"
diff --git a/packages/ipkg/ipkg_0.99.155.bb b/packages/ipkg/ipkg_0.99.155.bb
index eb7c48e9ac..e5ff6dc4c2 100644
--- a/packages/ipkg/ipkg_0.99.155.bb
+++ b/packages/ipkg/ipkg_0.99.155.bb
@@ -1,3 +1,3 @@
 require ipkg.inc
-PR = "r1"
+PR = "r2"
 SRC_URI += "file://upgrade-message-garbage.patch;patch=1"
diff --git a/packages/ipkg/ipkg_0.99.159.bb b/packages/ipkg/ipkg_0.99.159.bb
index 87fadac287..8455050622 100644
--- a/packages/ipkg/ipkg_0.99.159.bb
+++ b/packages/ipkg/ipkg_0.99.159.bb
@@ -1 +1,2 @@
 require ipkg.inc
+PR = "r1"
diff --git a/packages/ipkg/ipkg_0.99.163.bb b/packages/ipkg/ipkg_0.99.163.bb
index 71c2ffaa82..5d8a834b20 100644
--- a/packages/ipkg/ipkg_0.99.163.bb
+++ b/packages/ipkg/ipkg_0.99.163.bb
@@ -1,4 +1,5 @@
 include ipkg.inc
+PR = "r1"
 
 S = "${WORKDIR}/ipkg-${PV}"
 
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index db8e87e6ea..ec42c59c64 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -6,14 +6,13 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r10"
+PR = "r11"
 CONFLICTS = "db3"
 PROVIDES += "${SLUGOS_IMAGENAME}-packages"
 
 EXCLUDE_FROM_WORLD = "1"
 INHIBIT_DEFAULT_DEPS = "1"
 ALLOW_EMPTY = 1
-PACKAGES = "${PN}"
 
 # The list of packages to build for the ucslugc DISTRO.
 # KEEP IN ALPHABETICAL ORDER