diff options
| author | Mustafa Yuecel <yuecelm@ee.ethz.ch> | 2006-09-29 11:41:01 +0000 |
|---|---|---|
| committer | Mustafa Yuecel <yuecelm@ee.ethz.ch> | 2006-09-29 11:41:01 +0000 |
| commit | 5413782b08e9f71457065e5c6bb4afec7536d319 (patch) | |
| tree | cf7a2715de09110cbb22bb2e2385f19f0e44cb75 | |
| parent | 1019f758770bcd17ac4db999b3f7815451873511 (diff) | |
slugos and unslung distro: move distro-related variables out of machine config
- changes discussed in mailinglist (thread: Cosmetic changes in SlugOS ...)
| -rw-r--r-- | conf/distro/include/slugos.inc | 11 | ||||
| -rw-r--r-- | conf/distro/unslung.conf | 12 | ||||
| -rw-r--r-- | conf/machine/include/ixp4xx.conf | 16 |
3 files changed, 23 insertions, 16 deletions
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 @@ -149,22 +149,6 @@ IPKG_EXTRA_ARCHS = "ixp4xx ${MACHINE} \ 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 |