[oe-commits] org.oe.dev slugos and unslung distro: move distro-related variables out of machine config

[yuecelm commit]

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

Author: yuecelm at nslu2-linux.org
Branch: org.openembedded.dev
Revision: a644f650f643e069a64d14a8170f70c47a0e7f8b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a644f650f643e069a64d14a8170f70c47a0e7f8b
Files:
1
conf/distro/include/slugos.inc
conf/distro/unslung.conf
conf/machine/include/ixp4xx.conf
Diffs:

#
# mt diff -ra2ec817a8f25ad1adffa3c3df93d4ca4892612be -ra644f650f643e069a64d14a8170f70c47a0e7f8b
#
# 
# 
# patch "conf/distro/include/slugos.inc"
#  from [f0b04e76971a4ba0667c74bbff9cb44adeb6fe93]
#    to [2029aa5bd39028d60359c108178cfdfced2cb2f7]
# 
# patch "conf/distro/unslung.conf"
#  from [a9a889d3925cad855f6b3be28b5ad0fa52b39f95]
#    to [ff83a015f410221e74442b2f60b99e002336fb76]
# 
# patch "conf/machine/include/ixp4xx.conf"
#  from [7ef6700d25aea56d2c10888650b7f93b867f80e9]
#    to [3a92c1dce772f7689c2e5b04fa596fe336719b81]
# 
============================================================
--- conf/distro/include/slugos.inc	f0b04e76971a4ba0667c74bbff9cb44adeb6fe93
+++ conf/distro/include/slugos.inc	2029aa5bd39028d60359c108178cfdfced2cb2f7
@@ -185,5 +185,16 @@ PREFERRED_PROVIDER_virtual/db-native = "
 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 = ""
============================================================
--- conf/distro/unslung.conf	a9a889d3925cad855f6b3be28b5ad0fa52b39f95
+++ conf/distro/unslung.conf	ff83a015f410221e74442b2f60b99e002336fb76
@@ -63,3 +63,15 @@ PREFERRED_VERSION_nslu2-linksys-ramdisk 
 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"
+
============================================================
--- conf/machine/include/ixp4xx.conf	7ef6700d25aea56d2c10888650b7f93b867f80e9
+++ conf/machine/include/ixp4xx.conf	3a92c1dce772f7689c2e5b04fa596fe336719b81
@@ -149,22 +149,6 @@ IPKG_ARCH_LIST = "all any noarch ixp4xx 
 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
 #-------------------------------------------------------------------------------
 # These values are board specific but they seem to be common to a large number