summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-05-17 11:22:00 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-05-17 11:22:00 +0000
commit8985190874cae3947bd246e70ab469ba49ddd9e4 (patch)
tree5e637c98285ddb0c6345d4303e6940795c7c37c1
parent61dd043c038dd4eaa20f2c1e12a620c963775c68 (diff)
parentea2939302bb9fef0b4dc014ae9395d7ab05ee729 (diff)
merge of 93f6aca0335dace467591d3dbba7c7852abfd438
and 95448ac3b9d96ecd3141adff3929eb344db65a93
-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"
+