]> git.openpandora.org Git - openembedded.git/commitdiff
slugos and unslung distro: move distro-related variables out of machine config
authorMustafa Yuecel <yuecelm@ee.ethz.ch>
Fri, 29 Sep 2006 11:41:01 +0000 (11:41 +0000)
committerMustafa Yuecel <yuecelm@ee.ethz.ch>
Fri, 29 Sep 2006 11:41:01 +0000 (11:41 +0000)
  - changes discussed in mailinglist (thread: Cosmetic changes in SlugOS ...)

conf/distro/include/slugos.inc
conf/distro/unslung.conf
conf/machine/include/ixp4xx.conf

index 3993bf6ec06c7e6cc7835aed517fc0355fd945c4..e015314d92722fdffd7dc2e64ab0d1dcf6af402e 100644 (file)
@@ -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 = ""
index da1efa9cc40be1f76f5e873151e65914a6fe90ef..541eaef852ddde3a5b8d13f8d32c121123f8b65f 100644 (file)
@@ -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"
+
index 93befb92cec37a96184ac22130612c5ab206721e..541d350f21271a0e08c82fbe3f6d999454c17983 100644 (file)
@@ -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
 #-------------------------------------------------------------------------------