6 files changed, 34 insertions, 7 deletions
diff --git a/conf/distro/openslug-native.conf b/conf/distro/openslug-native.conf
new file mode 100644
index 0000000000..f946afe216
--- /dev/null
+++ b/conf/distro/openslug-native.conf
@@ -0,0 +1,17 @@
+include conf/distro/openslug.conf
+
+# Corresponting packages should be in openslug-native.bb,
+# currently missing: ipkg-utils libtool quilt pkgconfig
+ASSUME_PROVIDED = "libtool-cross libtool-native automake-native autoconf-native \
+		   quilt-native ipkg-utils-native gnu-config-native pkgconfig-native \
+		   virtual/armeb-linux-gcc virtual/libc update-rc.d"
+
+# Our build host is armeb, not armv5eb that the kernel reports
+BUILD_ARCH = armeb
+
+# I don't know of any packages we currently need to compile nativly, so here are two examples
+BBFILES = "\
+${PKGDIR}/packages/vlan/*.bb \
+${PKGDIR}/packages/gzip/*.bb \
+${OPENSLUG_EXTRA_BBFILES}"
+				      
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index 50b4daf26d..8719894e6a 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -15,7 +15,9 @@ ${PKGDIR}/packages/bluez-utils/*.bb \
 ${PKGDIR}/packages/boost/*.bb \
 ${PKGDIR}/packages/bridge-utils/*.bb \
 ${PKGDIR}/packages/busybox/*.bb \
+${PKGDIR}/packages/bwmon/*.bb \
 ${PKGDIR}/packages/bzip2/*.bb \
+${PKGDIR}/packages/ccxstream/*.bb \
 ${PKGDIR}/packages/coreutils/*.bb \
 ${PKGDIR}/packages/cpio/*.bb \
 ${PKGDIR}/packages/cron/*.bb \
@@ -45,6 +47,7 @@ ${PKGDIR}/packages/glibc/*.bb \
 ${PKGDIR}/packages/gnu-config/*.bb \
 ${PKGDIR}/packages/gphoto2/*.bb \
 ${PKGDIR}/packages/grep/*.bb \
+${PKGDIR}/packages/groff/*.bb \
 ${PKGDIR}/packages/gtk-doc/*.bb \
 ${PKGDIR}/packages/gzip/*.bb \
 ${PKGDIR}/packages/hotplug-ng/*.bb \
@@ -148,6 +151,7 @@ ${PKGDIR}/packages/tar/*.bb \
 ${PKGDIR}/packages/thttpd/*.bb \
 ${PKGDIR}/packages/timezones/*.bb \
 ${PKGDIR}/packages/tinylogin/*.bb \
+${PKGDIR}/packages/udev/*.bb \
 ${PKGDIR}/packages/unionfs/*.bb \
 ${PKGDIR}/packages/unzip/*.bb \
 ${PKGDIR}/packages/update-modules/*.bb \
diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf
index b76d352b8a..8b428e2d2d 100644
--- a/conf/distro/ucslugc-packages.conf
+++ b/conf/distro/ucslugc-packages.conf
@@ -14,7 +14,9 @@ ${PKGDIR}/packages/bluez-utils/*.bb \
 ${PKGDIR}/packages/boost/*.bb \
 ${PKGDIR}/packages/bridge-utils/*.bb \
 ${PKGDIR}/packages/busybox/*.bb \
+${PKGDIR}/packages/bwmon/*.bb \
 ${PKGDIR}/packages/bzip2/*.bb \
+${PKGDIR}/packages/ccxstream/*.bb \
 ${PKGDIR}/packages/coreutils/*.bb \
 ${PKGDIR}/packages/cpio/*.bb \
 ${PKGDIR}/packages/cron/*.bb \
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index af812922be..34bc39a3a3 100644
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -37,13 +37,13 @@ include conf/distro/freeze.conf
 #  (such as a local feed) can be defined in local.conf
 #----------------------------------------------------------------------------------
 # Add to the user's feeds from local.conf (there may be none)
-FEED_URIS_append_linux += "cross##http://ipkg.nslu2-linux.org/feeds/ucslugc/cross/${DISTRO_VERSION}"
-FEED_URIS_append_linux += "native##http://ipkg.nslu2-linux.org/feeds/ucslugc/native/${DISTRO_VERSION}"
+FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/ucslugc/cross/${DISTRO_VERSION}"
+FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/ucslugc/native/${DISTRO_VERSION}"
 
 #
 # Uncomment the following to get the unstable feeds
-#FEED_URIS_append_linux += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/ucslugc/cross/unstable"
-#FEED_URIS_append_linux += "unstable_native##http://ipkg.nslu2-linux.org/feeds/ucslugc/native/unstable"
+#FEED_URIS_append += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/ucslugc/cross/unstable"
+#FEED_URIS_append += "unstable_native##http://ipkg.nslu2-linux.org/feeds/ucslugc/native/unstable"
 
 #----------------------------------------------------------------------------------
 # FIRMWARE CONFIGURATION
diff --git a/conf/machine/ipaq-common.conf b/conf/machine/ipaq-common.conf
index 24a1e202f1..791abd2103 100644
--- a/conf/machine/ipaq-common.conf
+++ b/conf/machine/ipaq-common.conf
@@ -1,7 +1,9 @@
 IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd atmelwlandriver sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs keybdev" 
 
-BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules mipv6 atmelwlandriver"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs mipv6 atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}"
+BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules atmelwlandriver"
+BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 += "mipv6"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RRECOMMENDS_append_kernel24 += "mipv6"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 
diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf
index 567cee8ba1..fc61ba4f6a 100644
--- a/conf/machine/netvista.conf
+++ b/conf/machine/netvista.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the IBM Netvista thin client
 
 TARGET_ARCH = "i386"
-IPKG_ARCHS = "all i386 ${MACHINE}"
+IPKG_ARCHS = "all i386"
 PREFERRED_PROVIDER_xserver = "xserver-xorg"
 PREFERRED_PROVIDER_virtual/kernel = "linux-netvista"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils module-init-tools strace"
@@ -17,6 +17,8 @@ TARGET_VENDOR = "-oe"
 PREFERRED_PROVIDERS_append = " virtual/kernel:linux-netvista"
 IMAGE_FSTYPE = "ext2"
 GUI_MACHINE_CLASS = "bigscreen"
+GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser"
+GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser"
 
 #BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev module-init-tools strace"
 #BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules strace