From 74a67d6d75456df40f9f24c1130d664064b43dac Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 17 May 2006 11:11:11 +0000
Subject: native.conf: append to ASSUME_PROVIDED, don't override it

---
 conf/machine/native.conf | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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"
+
-- 
cgit v1.2.3


From ea2939302bb9fef0b4dc014ae9395d7ab05ee729 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 17 May 2006 11:19:08 +0000
Subject: generic.conf: include preferred opie|gpe|e versions

---
 conf/distro/generic.conf | 8 ++++++++
 1 file changed, 8 insertions(+)

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
+
-- 
cgit v1.2.3