summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-02-06 15:29:46 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-02-06 15:29:46 +0000
commitf5718978fcba5fc4ef6294d16e40dba0c75be661 (patch)
treeb9adcdb50a5b6f32c72ee0da7fa716518270457b /meta
parent0f2c51155fced19180781e179fa5f35b76c2ea4a (diff)
downloadpoky-f5718978fcba5fc4ef6294d16e40dba0c75be661.tar.gz
linux: removed deploy task - kernel.bbclass has own version now
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3678 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/linux/linux.inc34
-rw-r--r--meta/packages/linux/linux_2.6.23.bb2
2 files changed, 1 insertions, 35 deletions
diff --git a/meta/packages/linux/linux.inc b/meta/packages/linux/linux.inc
index 7b483686f4..4c24f7a2b1 100644
--- a/meta/packages/linux/linux.inc
+++ b/meta/packages/linux/linux.inc
@@ -100,37 +100,3 @@ do_install_prepend() {
100 ln -f arch/${ARCH}/kernel/vmlinux.lds arch/${ARCH}/boot/vmlinux 100 ln -f arch/${ARCH}/kernel/vmlinux.lds arch/${ARCH}/boot/vmlinux
101 fi 101 fi
102} 102}
103
104UBOOT_ENTRYPOINT ?= "20008000"
105
106KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
107KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}"
108
109do_deploy() {
110 install -d ${DEPLOY_DIR_IMAGE}
111 install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
112 tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE}.tgz -C ${D} lib
113
114 if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
115 if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
116 ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
117 uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
118 rm -f linux.bin
119 else
120 ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
121 rm -f linux.bin.gz
122 gzip -9 linux.bin
123 uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
124 rm -f linux.bin.gz
125 fi
126 fi
127
128 cd ${DEPLOY_DIR_IMAGE}
129 rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
130 ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin
131}
132
133do_deploy[dirs] = "${S}"
134
135addtask deploy before do_package after do_install
136
diff --git a/meta/packages/linux/linux_2.6.23.bb b/meta/packages/linux/linux_2.6.23.bb
index 70d771383d..b99d29788b 100644
--- a/meta/packages/linux/linux_2.6.23.bb
+++ b/meta/packages/linux/linux_2.6.23.bb
@@ -7,7 +7,7 @@ DEFAULT_PREFERENCE_em-x270 = "1"
7DEFAULT_PREFERENCE_mpc8313e-rdb = "1" 7DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
8DEFAULT_PREFERENCE_mpc8323e-rdb = "1" 8DEFAULT_PREFERENCE_mpc8323e-rdb = "1"
9 9
10PR = "r3" 10PR = "r4"
11 11
12SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \ 12SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
13 file://binutils-buildid-arm.patch;patch=1 \ 13 file://binutils-buildid-arm.patch;patch=1 \