merge of '1c81965a2b4441230dcc780cb75b714800217cf4'

     and 'd61da5b80e9dd6d9c4abeb4bdba7558079f3ccdf'

1 files changed, 29 insertions, 9 deletions

diff --git a/conf/distro/include/oplinux.inc b/conf/distro/include/oplinux.inc
index 843f8e18ba..a7eac524bc 100644
--- a/conf/distro/include/oplinux.inc
+++ b/conf/distro/include/oplinux.inc
@@ -1,10 +1,10 @@
 # Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
+
 # extra checking for needed tools
 #
-
 # set minimal version of BitBake needed
-BB_MIN_VERSION = "1.6.7"
+BB_MIN_VERSION = "1.8.10"
 
 #OPLinux and OPLinux-uclibc source mirrors
 INHERIT += "oplinux-mirrors"
@@ -33,15 +33,16 @@ IMAGE_FSTYPES = "tar.gz jffs2 ext2.gz cramfs squashfs squashfs-lzma cpio.gz"
 
 # Specifies a location to search for pre-generated tarballs when fetching
 # a cvs:// URI. Outcomment this, if you always want to pull directly from CVS.
-CVS_TARBALL_STASH = "http://www.digital-opsis.com/oplinux/sources/current/"
+#CVS_TARBALL_STASH = "http://www.digital-opsis.com/oplinux/sources/"
 
+PREMIRRORS = "(ftp|http)://.*/.*/ http://source.digital-opsis.com/"
 
 #
 # Bootstrap & Init
 PREFERRED_PROVIDER_task-bootstrap = "task-base"
 
 # We want images supporting the following features (for task-base
-DISTRO_FEATURES = "nfs smbfs ext2 pcmcia usbgadget usbhost pci"
+DISTRO_FEATURES = "nfs smbfs ext2 usbhost pci"
 
 
 #We need to set this to avoid problems when building for if host=target
@@ -53,17 +54,21 @@ OPLINUX-uCLIBC_URI = "http://www.digital-opsis.com/oplinux-uclibc"
 
 #Dir config
 IMAGE_ROOTFS = "${TMPDIR}/rootfs/${MACHINE}"
+DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
 
 #Set the name of the generated images
 IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${MACHINE}-${DATE}-${SVN_REV}"
-DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
 
 
+#Do not ship kernel image with the rootfs
+IMAGE_PREPROCESS_COMMAND_append = "if [ -f ${IMAGE_ROOTFS}/boot/bzImage ]; then rm \
+${IMAGE_ROOTFS}/boot/bzImage*;fi;"
 
 
 
 #
-#feed definitions
+#Feed definitions
+#
 #i32 machines
 #i486 machines
 FEED_ARCH_x86           ="i486"
@@ -75,9 +80,6 @@ FEED_ARCH_epia          = "i586"
 
 #i686 machines
 FEED_ARCH_i686-generic  = "i686"
-FEED_ARCH_guinness      = "i686"
-FEED_ARCH_progear       = "i686"
-
 
 #powerpc machines
 #ppc405
@@ -91,12 +93,27 @@ FEED_ARCH_sequoia       = "ppc440e"
 #ppc603e
 FEED_ARCH_efika         = "ppc603e"
 
+#ppce300c2
+FEED_ARCH_mpc8323e-rdb  = "ppce300c2"
+
+#avr32
+FEED_ARCH_atngw100      = "avr32"
+FEED_ARCH_at32stk100    = "avr32"
+
+
 
 #
 #Preferred versions of packages we need
 #
 PREFERRED_VERSION_busybox = "1.2.1"
 PREFERRED_VERSION_u-boot ?= "1.1.4"
+PREFERRED_VERSION_fakeroot ?= "1.7.1"
+PREFERRED_VERSION_fakeroot-native ?= "1.7.1"
+PREFERRED_VERSION_makedev ?= "2.3.1"
+PREFERRED_VERSION_makedevs ?= "1.0.0"
+PREFERRED_VERSION_makedevs-native ?= "1.0.0"
+
+
 # Latest linphone supports yeaphone
 PREFERRED_VERSION_linphone ?= "1.6.0"
 
@@ -106,3 +123,6 @@ PREFERRED_VERSION_linphone ?= "1.6.0"
 DISTRO_SSH_DAEMON ?= "dropbear"
 
 
+#PREFERRED_VERSION_opsis-asterisk-bri_dht-walnut = "1.2.17"
+#PREFERRED_VERSION_zaptel-bri_dht-walnut = "1.2.19"
+#PREFERRED_VERSION_libpri_dht-walnut = "1.2.4"