conf/distro/oplinux.conf : Various changes

2 files changed, 91 insertions, 66 deletions

diff --git a/conf/distro/include/oplinux.inc b/conf/distro/include/oplinux.inc
index 2bf3e616d7..843f8e18ba 100644
--- a/conf/distro/include/oplinux.inc
+++ b/conf/distro/include/oplinux.inc
@@ -1,9 +1,11 @@
-#
+# 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.3"
+BB_MIN_VERSION = "1.6.7"
+
 #OPLinux and OPLinux-uclibc source mirrors
 INHERIT += "oplinux-mirrors"
 
@@ -14,34 +16,25 @@ INHERIT += "multimachine"
 INHERIT += "sanity"
 
 
-#
+
 # Naming schemes
-#
-PARALLEL_INSTALL_MODULES = "1"
 INHERIT += "package_ipk debian"
+PARALLEL_INSTALL_MODULES = "1"
 
-#
-# Packaging and output format
-
-IMAGE_FSTYPES = "tar jffs2 ext2 cramfs squashfs squashfs-lzma cpio.gz"
 
+#
+# Maintainer email
+MAINTAINER = "Digital OPSiS Developers Team <oplinux-developers@digital-opsis.com>"
 
 
+#
+# Packaging and output format
+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/source/current/"
+CVS_TARBALL_STASH = "http://www.digital-opsis.com/oplinux/sources/current/"
 
-#INHERIT += "owmnr-mirrors"
-
-#Uncommend this is if you are using bitbake multithread and you have multiple cpu's or cores you are running on
-#BB_NUMBER_THREADS = "5"
-
-#Uncommend this if you hava icecc installed
-#INHERIT += "icecc"
-#PARALLEL_MAKE = "-j6"
-#ICECC_PATH = "/usr/bin/icecc"
-#ICECC_ENV_EXEC = "/home/stelios/icecc-create-env"
 
 #
 # Bootstrap & Init
@@ -51,12 +44,54 @@ PREFERRED_PROVIDER_task-bootstrap = "task-base"
 DISTRO_FEATURES = "nfs smbfs ext2 pcmcia usbgadget usbhost pci"
 
 
-OPLINUX_URI = "http://www.ifaistos.awmn/oplinux"
-OPLINUX-uCLIBC_URI = "http://www.ifaistos.awmn/oplinux-uclibc"
+#We need to set this to avoid problems when building for if host=target
+TARGET_VENDOR = "-oplinux"
+
+#URI for base feeds
+OPLINUX_URI = "http://www.digital-opsis.com/oplinux"
+OPLINUX-uCLIBC_URI = "http://www.digital-opsis.com/oplinux-uclibc"
 
 #Dir config
 IMAGE_ROOTFS = "${TMPDIR}/rootfs/${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}"
+
+
+
+
+
+#
+#feed definitions
+#i32 machines
+#i486 machines
+FEED_ARCH_x86           ="i486"
+FEED_ARCH_wrap          ="i486"
+
+#i586 machines
+FEED_ARCH_i586-generic  = "i586"
+FEED_ARCH_epia          = "i586"
+
+#i686 machines
+FEED_ARCH_i686-generic  = "i686"
+FEED_ARCH_guinness      = "i686"
+FEED_ARCH_progear       = "i686"
+
+
+#powerpc machines
+#ppc405
+FEED_ARCH_dht-walnut    = "ppc405"
+FEED_ARCH_magicbox      = "ppc405"
+FEED_ARCH_xilinx-ml403  = "ppc405"
+
+#ppc440e
+FEED_ARCH_sequoia       = "ppc440e"
+
+#ppc603e
+FEED_ARCH_efika         = "ppc603e"
+
+
 #
 #Preferred versions of packages we need
 #
@@ -65,4 +100,9 @@ PREFERRED_VERSION_u-boot ?= "1.1.4"
 # Latest linphone supports yeaphone
 PREFERRED_VERSION_linphone ?= "1.6.0"
 
+#
+#SSH daemon
+#
+DISTRO_SSH_DAEMON ?= "dropbear"
+
 
diff --git a/conf/distro/oplinux.conf b/conf/distro/oplinux.conf
index d3e6c0344d..03e56b0148 100644
--- a/conf/distro/oplinux.conf
+++ b/conf/distro/oplinux.conf
@@ -1,17 +1,20 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
 #-----------------------------------------------------------------------------
 #@TYPE: Distribution
-#@NAME: OPLinux uClibC
-#@DESCRIPTION: OPLinux uClibC Embedded Linux Distribution Configuration
+#@NAME: OPLinux
+#@DESCRIPTION: OPLinux Embedded Linux Distribution Configuration
 #
 #@COMMENT: This is a distribution for a number of embedded targets
 #@COMMENT: currently supported are
-#@COMMENT: generic x86
-#@COMMENT: wrap (x86)
-#@COMMENT: dht-walnut (ppc405)
+#@COMMENT: x86 wrap   (i486)
+#@COMMENT: i586-generic epia (i586)
+#@COMMENT: i686-generic  (i686)
+#@COMMENT: dht-walnut magicbox (ppc405)
+#@COMMENT: sequoia (ppc440)
 #@COMMENT: efika (ppc603)
-#@COMMENT: rb5xx (mips)
 #@COMMENT:
-#@COMMENT: for additional info please check www.digital-opsis.com
+#@COMMENT: for additional info please check www.digital-opsis.com/oplinux
 #-----------------------------------------------------------------------------
 
 require conf/distro/include/oplinux.inc
@@ -22,7 +25,7 @@ require conf/distro/include/sane-srcdates.inc
 # Header
 #
 DISTRO_NAME = "OPLinux"
-DISTRO_VERSION = ".dev-snapshot-${SRCDATE}"
+DISTRO_VERSION ?= ".dev-snapshot-${SRCDATE}"
 #DISTRO_TYPE = "release"
 DISTRO_TYPE = "debug"
 
@@ -31,23 +34,31 @@ DISTRO_TYPE = "debug"
 #
 TARGET_OS = "linux"
 
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+
 PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
 PREFERRED_PROVIDER_virtual/libsdl       ?= "libsdl-x11"
 PREFERRED_PROVIDER_virtual/libxine      ?= "libxine-x11"
 PREFERRED_PROVIDER_esound 		?= "pulseaudio"
-PREFERRED_PROVIDER_virtual/libiconv     ?= "libiconv"
-PREFERRED_PROVIDER_virtual/libintl      ?= "libintl"
 
 
-
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
+# glibc:
+PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
+PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
+PREFERRED_PROVIDER_virtual/libc ?= "glibc"
 
 
-#EABI stuff
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/powerpc-linux-libc-for-gcc ="glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-oplinux-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/armeb-oplinux-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/powerpc-oplinux-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/mipsel-oplinux-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/sparc-oplinux-linux-libc-for-gcc = "glibc-intermediate"
 
 
 
@@ -81,21 +92,14 @@ PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.5"
 PREFERRED_VERSION_linux-libc-headers_i486 ?= "2.6.18"
 PREFERRED_VERSION_linux-libc-headers_i586 ?= "2.6.18"
 PREFERRED_VERSION_linux-libc-headers_i686 ?= "2.6.18"
-
 PREFERRED_VERSION_linux-libc-headers_powerpc ?= "2.6.18"
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.18"
 
-PREFERRED_VERSION_glibc ?= "2.5"
-PREFERRED_VERSION_glibc_efika ?= "2.5"
-
-PREFERRED_VERSION_glibc-intermediate_i686 ?= "2.4"
-PREFERRED_VERSION_glibc-intermediate ?= "2.5"
-PREFERRED_VERSION_glibc-intermediate ?= "2.5"
 PREFERRED_VERSION_glibc-initial ?= "2.5"
-
+PREFERRED_VERSION_glibc-intermediate ?= "2.5"
+PREFERRED_VERSION_glibc ?= "2.5"
 
 PCMCIA_MANAGER = "pcmciautils"
-
 PREFERRED_VERSION_dbus ?= "1.0.2"
 PREFERRED_VERSION_dbus-glib ?= "0.71"
 
@@ -114,25 +118,6 @@ DISTRO_EXTRA_RDEPENDS += "\
                          nano pciutils"
 
 
-
-
-FEED_ARCH ?= "${TARGET_ARCH}"
-
-#i486 machines          
-FEED_ARCH_x86		="i486"
-
-#i586 machines
-FEED_ARCH_epia          = "i586"
-
-#i686 machines
-FEED_ARCH_guinness      = "i686"
-FEED_ARCH_progear       = "i686"
-
-#powerpc machines
-FEED_ARCH_efika         = "ppc603e"
-FEED_ARCH_dht-walnut    = "ppc405"
-
-
 FEED_URIS += " \
                 no-arch##${OPLINUX_URI}/unstable/feed/all \
                 base##${OPLINUX_URI}/unstable/feed/${FEED_ARCH}/base \