From c4f7ddc546efde9ffb53d2be4604150ba2737aca Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Mon, 20 Nov 2006 16:52:05 +0000
Subject: [PATCH] linux-nokia770: Update kernel to osso26 release

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@890 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../nokia770/defconfig                        |  0
 .../linux/linux-nokia770_2.6.12.3-osso14.bb   | 30 -------------
 .../linux/linux-nokia770_2.6.16-osso15.bb     | 43 -------------------
 3 files changed, 73 deletions(-)
 rename meta/packages/linux/{linux-nokia770-2.6.16-osso15 => linux-nokia770-2.6.16-osso26}/nokia770/defconfig (100%)
 delete mode 100644 meta/packages/linux/linux-nokia770_2.6.12.3-osso14.bb
 delete mode 100644 meta/packages/linux/linux-nokia770_2.6.16-osso15.bb

diff --git a/meta/packages/linux/linux-nokia770-2.6.16-osso15/nokia770/defconfig b/meta/packages/linux/linux-nokia770-2.6.16-osso26/nokia770/defconfig
similarity index 100%
rename from meta/packages/linux/linux-nokia770-2.6.16-osso15/nokia770/defconfig
rename to meta/packages/linux/linux-nokia770-2.6.16-osso26/nokia770/defconfig
diff --git a/meta/packages/linux/linux-nokia770_2.6.12.3-osso14.bb b/meta/packages/linux/linux-nokia770_2.6.12.3-osso14.bb
deleted file mode 100644
index ff2f1a05b1..0000000000
--- a/meta/packages/linux/linux-nokia770_2.6.12.3-osso14.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-SECTION = "kernel"
-DESCRIPTION = "Linux kernel for Nokia 770"
-LICENSE = "GPL"
-PR = "r4"
-
-SRC_URI = "http://ewi546.ewi.utwente.nl/OE/source/kernel-source-2.6.12.3_2.6.12.3-osso14.tar.gz \
-	   file://defconfig"
-
-S = "${WORKDIR}/linux-2.6"
-
-KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}"
-
-inherit kernel
-
-COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = "nokia770"
-
-do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
-        oe_runmake oldconfig
-}
-
-do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
diff --git a/meta/packages/linux/linux-nokia770_2.6.16-osso15.bb b/meta/packages/linux/linux-nokia770_2.6.16-osso15.bb
deleted file mode 100644
index e0c823a80c..0000000000
--- a/meta/packages/linux/linux-nokia770_2.6.16-osso15.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-SECTION = "kernel"
-DESCRIPTION = "Linux kernel for Nokia 770"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "http://repository.maemo.org/pool/mistral/non-free/source/k/kernel-source-2.6.16/kernel-source-2.6.16_2.6.16.rel-osso15.tar.gz \
-	   file://defconfig"
-
-S = "${WORKDIR}/kernel-source-2.6.16-2.6.16.rel"
-
-KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}"
-
-inherit kernel
-
-COMPATIBLE_MACHINE = "nokia770"
-
-do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
-
-        if [ "${TARGET_OS}" == "linux-gnueabi" -o  "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
-                echo "CONFIG_AEABI=y"                   >> ${S}/.config
-                echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.config
-        else
-                echo "# CONFIG_AEABI is not set"        >> ${S}/.config
-                echo "# CONFIG_OABI_COMPAT is not set"  >> ${S}/.config
-        fi
-
-        sed     -e '/CONFIG_AEABI/d' \
-                -e '/CONFIG_OABI_COMPAT=/d' \
-                '${WORKDIR}/defconfig' >>'${S}/.config'
-
-        yes '' | oe_runmake oldconfig
-
-}
-
-do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-- 
2.40.1