From 51be1fad9c2889755787f94f07174f854d23f8db Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Tue, 4 Nov 2008 11:43:33 +0000
Subject: linux-simtec: Update simtec1 -> simtec3 and add COMPATIBLE_MACHINE
---
meta/classes/base.bbclass | 3 ++-
.../depicture-defconfig-append | 18 ------------------
.../depicture-defconfig-append | 18 ++++++++++++++++++
meta/packages/linux/linux-simtec_2.6.26-simtec1.bb | 15 ---------------
meta/packages/linux/linux-simtec_2.6.26-simtec3.bb | 17 +++++++++++++++++
5 files changed, 37 insertions(+), 34 deletions(-)
delete mode 100644 meta/packages/linux/linux-simtec-2.6.26-simtec1/depicture-defconfig-append
create mode 100644 meta/packages/linux/linux-simtec-2.6.26-simtec3/depicture-defconfig-append
delete mode 100644 meta/packages/linux/linux-simtec_2.6.26-simtec1.bb
create mode 100644 meta/packages/linux/linux-simtec_2.6.26-simtec3.bb
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 824ce05fc..9cf3863ff 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -743,11 +743,12 @@ def generate_git_config(e):
ignore_count = 1
ignore_host = data.getVar('GIT_PROXY_IGNORE_1', e.data, True)
while (ignore_host):
- f.write(" gitproxy = non for %s" % ignore_host)
+ f.write(" gitproxy = none for %s\n" % ignore_host)
ignore_count += 1
ignore_host = data.getVar('GIT_PROXY_IGNORE_%s' % ignore_count, e.data, True)
f.write(proxy_command)
f.close
+ if
METADATA_REVISION ?= "${@base_get_metadata_monotone_revision(d)}"
diff --git a/meta/packages/linux/linux-simtec-2.6.26-simtec1/depicture-defconfig-append b/meta/packages/linux/linux-simtec-2.6.26-simtec1/depicture-defconfig-append
deleted file mode 100644
index fc1af85be..000000000
--- a/meta/packages/linux/linux-simtec-2.6.26-simtec1/depicture-defconfig-append
+++ /dev/null
@@ -1,18 +0,0 @@
-# The Depicture needs the S3C24xx's Framebuffer and LCD stuff
-CONFIG_FB_S3C2410=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_S3C2410=y
-CONFIG_LCD_PLATFORM=y
-CONFIG_BACKLIGHT_PWM=y
-CONFIG_SIMTEC_LCD=y
-# And also the touchscreen interface
-CONFIG_TOUCHSCREEN_S3C2410=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_SENSORS_S3C_ADC=y
-# And the MMC makes sense to compile in.
-CONFIG_MMC=y
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_S3C=y
-# IPv6 is needed for the X server
-CONFIG_IPV6=y
diff --git a/meta/packages/linux/linux-simtec-2.6.26-simtec3/depicture-defconfig-append b/meta/packages/linux/linux-simtec-2.6.26-simtec3/depicture-defconfig-append
new file mode 100644
index 000000000..fc1af85be
--- /dev/null
+++ b/meta/packages/linux/linux-simtec-2.6.26-simtec3/depicture-defconfig-append
@@ -0,0 +1,18 @@
+# The Depicture needs the S3C24xx's Framebuffer and LCD stuff
+CONFIG_FB_S3C2410=y
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_S3C2410=y
+CONFIG_LCD_PLATFORM=y
+CONFIG_BACKLIGHT_PWM=y
+CONFIG_SIMTEC_LCD=y
+# And also the touchscreen interface
+CONFIG_TOUCHSCREEN_S3C2410=y
+CONFIG_INPUT_EVDEV=y
+CONFIG_SENSORS_S3C_ADC=y
+# And the MMC makes sense to compile in.
+CONFIG_MMC=y
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_S3C=y
+# IPv6 is needed for the X server
+CONFIG_IPV6=y
diff --git a/meta/packages/linux/linux-simtec_2.6.26-simtec1.bb b/meta/packages/linux/linux-simtec_2.6.26-simtec1.bb
deleted file mode 100644
index 9eb2c88d3..000000000
--- a/meta/packages/linux/linux-simtec_2.6.26-simtec1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require linux-simtec.inc
-
-PR = "r1"
-
-PROVIDES += "virtual/kernel"
-
-DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_depicture = "1"
-
-SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2 \
- http://www.simtec.co.uk/products/SWLINUX/files/patch-2.6.26-simtec1.bz2;patch=1 \
- file://${MACHINE}-defconfig-append \
- "
-
-S = "${WORKDIR}/linux-2.6.26"
diff --git a/meta/packages/linux/linux-simtec_2.6.26-simtec3.bb b/meta/packages/linux/linux-simtec_2.6.26-simtec3.bb
new file mode 100644
index 000000000..9a7d95ab9
--- /dev/null
+++ b/meta/packages/linux/linux-simtec_2.6.26-simtec3.bb
@@ -0,0 +1,17 @@
+require linux-simtec.inc
+
+PR = "r1"
+
+PROVIDES += "virtual/kernel"
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_depicture = "1"
+
+COMPATIBLE_MACHINE = "depicture"
+
+SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2 \
+ http://www.simtec.co.uk/products/SWLINUX/files/patch-2.6.26-simtec3.bz2;patch=1 \
+ file://${MACHINE}-defconfig-append \
+ "
+
+S = "${WORKDIR}/linux-2.6.26"
--
cgit v1.2.3