From: Mustafa Yuecel <yuecelm@ee.ethz.ch>
Date: Fri, 29 Sep 2006 11:41:01 +0000 (+0000)
Subject: slugos and unslung distro: move distro-related variables out of machine config
X-Git-Tag: Release-2010-05/1~9453^2~666^2~3^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5413782b08e9f71457065e5c6bb4afec7536d319;p=openembedded.git

slugos and unslung distro: move distro-related variables out of machine config
  - changes discussed in mailinglist (thread: Cosmetic changes in SlugOS ...)
---

diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 3993bf6ec0..e015314d92 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -185,5 +185,16 @@ PREFERRED_VERSION_wpa-supplicant ?= "0.5.1"
 PREFERRED_PROVIDER_virtual/db = "db"
 PREFERRED_PROVIDER_virtual/db-native = "db-native"
 
+SRCDATE_ipkg-utils ?= "20060106"
+SRCDATE_ipkg-utils-native ?= "20060106"
+SRCDATE_ipkg-link ?= "20060106"
+SRCDATE_irssi ?= "20050930"
+
+CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
+INHERIT += "nslu2-mirrors"
+
+PREFERRED_VERSION_ipkg ?= "0.99.154"
+PREFERRED_VERSION_ipkg-native ?= "0.99.154"
+
 #FIXME: HACK: REMOVE THIS
 IGNORE_STRIP_ERRORS = ""
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index da1efa9cc4..541eaef852 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -63,3 +63,15 @@ PREFERRED_VERSION_unslung-rootfs         ?= "2.3r63"
 PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63"
 PREFERRED_VERSION_nslu2-linksys-libs     ?= "2.3r63"
 PREFERRED_VERSION_nslu2-linksys-ramdisk  ?= "2.3r63"
+
+SRCDATE_ipkg-utils ?= "20060106"
+SRCDATE_ipkg-utils-native ?= "20060106"
+SRCDATE_ipkg-link ?= "20060106"
+SRCDATE_irssi ?= "20050930"
+
+CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
+INHERIT += "nslu2-mirrors"
+
+PREFERRED_VERSION_ipkg ?= "0.99.154"
+PREFERRED_VERSION_ipkg-native ?= "0.99.154"
+
diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf
index 93befb92ce..541d350f21 100644
--- a/conf/machine/include/ixp4xx.conf
+++ b/conf/machine/include/ixp4xx.conf
@@ -148,22 +148,6 @@ IPKG_EXTRA_ARCHS = "ixp4xx ${MACHINE} \
 #    versions.
 IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${IPKG_EXTRA_ARCHS}"
 
-#-------------------------------------------------------------------------------
-# Package versions
-#-------------------------------------------------------------------------------
-# Warning: these are shared across the different machine and distro
-# configurations but can be overridden therein if required.
-SRCDATE_ipkg-utils ?= "20060106"
-SRCDATE_ipkg-utils-native ?= "20060106"
-SRCDATE_ipkg-link ?= "20060106"
-SRCDATE_irssi ?= "20050930"
-
-CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
-INHERIT += "nslu2-mirrors"
-
-PREFERRED_VERSION_ipkg ?= "0.99.154"
-PREFERRED_VERSION_ipkg-native ?= "0.99.154"
-
 #-------------------------------------------------------------------------------
 # Board defaults
 #-------------------------------------------------------------------------------