diff options
author | Richard Purdie <richard@openedhand.com> | 2006-11-20 16:52:05 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-11-20 16:52:05 +0000 |
commit | c4f7ddc546efde9ffb53d2be4604150ba2737aca (patch) | |
tree | 4908291270178d73e17cc61dfaf02915fa6b1bb8 | |
parent | c6eae2fd67673639013006f32442e974243bc81e (diff) | |
download | poky-c4f7ddc546efde9ffb53d2be4604150ba2737aca.tar.gz |
linux-nokia770: Update kernel to osso26 release
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@890 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r-- | meta/packages/linux/linux-nokia770-2.6.16-osso26/nokia770/defconfig (renamed from meta/packages/linux/linux-nokia770-2.6.16-osso15/nokia770/defconfig) | 0 | ||||
-rw-r--r-- | meta/packages/linux/linux-nokia770_2.6.12.3-osso14.bb | 30 | ||||
-rw-r--r-- | meta/packages/linux/linux-nokia770_2.6.16-osso15.bb | 43 |
3 files changed, 0 insertions, 73 deletions
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 index 813d07d055..813d07d055 100644 --- a/meta/packages/linux/linux-nokia770-2.6.16-osso15/nokia770/defconfig +++ b/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 @@ | |||
1 | SECTION = "kernel" | ||
2 | DESCRIPTION = "Linux kernel for Nokia 770" | ||
3 | LICENSE = "GPL" | ||
4 | PR = "r4" | ||
5 | |||
6 | SRC_URI = "http://ewi546.ewi.utwente.nl/OE/source/kernel-source-2.6.12.3_2.6.12.3-osso14.tar.gz \ | ||
7 | file://defconfig" | ||
8 | |||
9 | S = "${WORKDIR}/linux-2.6" | ||
10 | |||
11 | KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}" | ||
12 | |||
13 | inherit kernel | ||
14 | |||
15 | COMPATIBLE_HOST = "arm.*-linux" | ||
16 | COMPATIBLE_MACHINE = "nokia770" | ||
17 | |||
18 | do_configure_prepend() { | ||
19 | install -m 0644 ${WORKDIR}/defconfig ${S}/.config | ||
20 | oe_runmake oldconfig | ||
21 | } | ||
22 | |||
23 | do_deploy() { | ||
24 | install -d ${DEPLOY_DIR}/images | ||
25 | install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin | ||
26 | } | ||
27 | |||
28 | do_deploy[dirs] = "${S}" | ||
29 | |||
30 | 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 @@ | |||
1 | SECTION = "kernel" | ||
2 | DESCRIPTION = "Linux kernel for Nokia 770" | ||
3 | LICENSE = "GPL" | ||
4 | PR = "r0" | ||
5 | |||
6 | 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 \ | ||
7 | file://defconfig" | ||
8 | |||
9 | S = "${WORKDIR}/kernel-source-2.6.16-2.6.16.rel" | ||
10 | |||
11 | KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}" | ||
12 | |||
13 | inherit kernel | ||
14 | |||
15 | COMPATIBLE_MACHINE = "nokia770" | ||
16 | |||
17 | do_configure_prepend() { | ||
18 | install -m 0644 ${WORKDIR}/defconfig ${S}/.config | ||
19 | |||
20 | if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then | ||
21 | echo "CONFIG_AEABI=y" >> ${S}/.config | ||
22 | echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config | ||
23 | else | ||
24 | echo "# CONFIG_AEABI is not set" >> ${S}/.config | ||
25 | echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config | ||
26 | fi | ||
27 | |||
28 | sed -e '/CONFIG_AEABI/d' \ | ||
29 | -e '/CONFIG_OABI_COMPAT=/d' \ | ||
30 | '${WORKDIR}/defconfig' >>'${S}/.config' | ||
31 | |||
32 | yes '' | oe_runmake oldconfig | ||
33 | |||
34 | } | ||
35 | |||
36 | do_deploy() { | ||
37 | install -d ${DEPLOY_DIR}/images | ||
38 | install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} | ||
39 | } | ||
40 | |||
41 | do_deploy[dirs] = "${S}" | ||
42 | |||
43 | addtask deploy before do_build after do_compile | ||