summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMatthias Hentges <oe@hentges.net>2006-05-18 11:53:05 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-05-18 11:53:05 +0000
commitc199c1193e678b2657af0aaf9d0446799f9962f4 (patch)
treea5ee3d15915e22562de903aff23e9dd5b0f44434 /conf
parent0d2dfbd66a736fa2cc5ef5f0cf31203d95463958 (diff)
parent5c2b9eec4c66370c8e287766d522c168ceb28fc2 (diff)
merge of b9b66b086ae9b09598a4e46d6864d9ef07f3cc0d
and f46af8d8602581214b59314f71fbd9fcdfda0fef
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/generic.conf8
-rw-r--r--conf/machine/native.conf5
2 files changed, 11 insertions, 2 deletions
diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf
index 768f88d243..59e003f9b3 100644
--- a/conf/distro/generic.conf
+++ b/conf/distro/generic.conf
@@ -6,3 +6,11 @@ INHERIT += " package_ipk debian"
TARGET_OS = "linux"
# TARGET_FPU = "soft"
IMAGE_FSTYPES = "ext2.gz"
+
+DISTRO_NAME = "GenericDistribution"
+DISTRO_VERSION = ".dev-snapshot-${SRCDATE}"
+
+require conf/distro/preferred-gpe-versions.inc
+require conf/distro/preferred-opie-versions.inc
+require conf/distro/preferred-e-versions.inc
+
diff --git a/conf/machine/native.conf b/conf/machine/native.conf
index b28565316f..4817b2e3f1 100644
--- a/conf/machine/native.conf
+++ b/conf/machine/native.conf
@@ -1,6 +1,6 @@
#@TYPE: Machine
#@NAME: Build Station
-#@DESCRIPTION: Machine configuration for your build station.
+#@DESCRIPTION: Machine configuration for your build station
TARGET_ARCH = "${BUILD_ARCH}"
IPKG_ARCHS = "all ${TARGET_ARCH}"
@@ -8,5 +8,6 @@ TARGET_PREFIX = ""
VENDOR = "-oe"
PREFERRED_PROVIDER_virtual/kernel = "native-kernel"
-ASSUME_PROVIDED = "virtual/gcc-initial virtual/gcc virtual/g++"
+ASSUME_PROVIDED += "virtual/gcc-initial virtual/gcc virtual/g++"
ASSUME_PROVIDED += "binutils-cross"
+