From 94635d3eb436f61757288e9f5e815174f3d1cd19 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 14 Oct 2004 22:23:33 +0000 Subject: Merge openembedded@openembedded.bkbits.net:packages into handhelds.org:/home/kergoth/code/packages 2004/10/14 17:16:13-05:00 handhelds.org!kergoth Update the omap kernel build to 2.6.9-rc4-omap1, apply a minor patch to add SCHEDSTATS config item to its Kconfig, and enable SCHEDSTATS by default for omap1610h2. 2004/10/14 11:59:07-05:00 handhelds.org!kergoth Merge http://nslu2-linux.bkbits.net/packages into handhelds.org:/home/kergoth/code/packages 2004/10/14 08:41:25+09:30 (none)!rwhitby Made the openslug image basename handling compatible with unslung 2004/10/13 18:40:16-04:00 rant-central.com!CodeWhacker Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages into rant-central.com:/home/roy/workspace/NSLU2/oe/packages 2004/10/13 18:38:38-04:00 rant-central.com!CodeWhacker Adjusting the staged kernel image filename and adding an "openslug-image" target. (openslug-image is currently a clone of bootstrap-image, but this gives us some room to adjust further without frobbing other OE projects) This clears up the filename conflict that was preventing builds from completing. BKrev: 416efc655jry-rBphLv6yhPqGPRRkw --- linux/linux-omap-2.6-2.6.5-omap1/defconfig | 0 linux/linux-omap-2.6-2.6.5-omap1/helen2/defconfig | 0 .../innovator1510/defconfig | 0 .../innovator1610/defconfig | 0 .../linux-omap-2.6-2.6.5-omap1/omap1510/defconfig | 0 .../linux-omap-2.6-2.6.5-omap1/omap1610/defconfig | 0 .../linux-omap-2.6-2.6.5-omap1/perseus2/defconfig | 0 .../omap1610h2/defconfig | 0 .../schedstats-arm.patch | 0 linux/linux-omap-2.6_2.6.5-omap1.oe | 24 ---------------------- linux/linux-omap-2.6_2.6.9-rc4-omap1.oe | 0 linux/nslu2-openslug_2.6.7.oe | 4 +++- meta/openslug-image.oe | 0 13 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 linux/linux-omap-2.6-2.6.5-omap1/defconfig delete mode 100644 linux/linux-omap-2.6-2.6.5-omap1/helen2/defconfig delete mode 100644 linux/linux-omap-2.6-2.6.5-omap1/innovator1510/defconfig delete mode 100644 linux/linux-omap-2.6-2.6.5-omap1/innovator1610/defconfig delete mode 100644 linux/linux-omap-2.6-2.6.5-omap1/omap1510/defconfig delete mode 100644 linux/linux-omap-2.6-2.6.5-omap1/omap1610/defconfig delete mode 100644 linux/linux-omap-2.6-2.6.5-omap1/perseus2/defconfig create mode 100644 linux/linux-omap-2.6-2.6.9-rc4-omap1/omap1610h2/defconfig create mode 100644 linux/linux-omap-2.6-2.6.9-rc4-omap1/schedstats-arm.patch delete mode 100644 linux/linux-omap-2.6_2.6.5-omap1.oe create mode 100644 linux/linux-omap-2.6_2.6.9-rc4-omap1.oe create mode 100644 meta/openslug-image.oe diff --git a/linux/linux-omap-2.6-2.6.5-omap1/defconfig b/linux/linux-omap-2.6-2.6.5-omap1/defconfig deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/linux/linux-omap-2.6-2.6.5-omap1/helen2/defconfig b/linux/linux-omap-2.6-2.6.5-omap1/helen2/defconfig deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/linux/linux-omap-2.6-2.6.5-omap1/innovator1510/defconfig b/linux/linux-omap-2.6-2.6.5-omap1/innovator1510/defconfig deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/linux/linux-omap-2.6-2.6.5-omap1/innovator1610/defconfig b/linux/linux-omap-2.6-2.6.5-omap1/innovator1610/defconfig deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/linux/linux-omap-2.6-2.6.5-omap1/omap1510/defconfig b/linux/linux-omap-2.6-2.6.5-omap1/omap1510/defconfig deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/linux/linux-omap-2.6-2.6.5-omap1/omap1610/defconfig b/linux/linux-omap-2.6-2.6.5-omap1/omap1610/defconfig deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/linux/linux-omap-2.6-2.6.5-omap1/perseus2/defconfig b/linux/linux-omap-2.6-2.6.5-omap1/perseus2/defconfig deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/linux/linux-omap-2.6-2.6.9-rc4-omap1/omap1610h2/defconfig b/linux/linux-omap-2.6-2.6.9-rc4-omap1/omap1610h2/defconfig new file mode 100644 index 0000000000..e69de29bb2 diff --git a/linux/linux-omap-2.6-2.6.9-rc4-omap1/schedstats-arm.patch b/linux/linux-omap-2.6-2.6.9-rc4-omap1/schedstats-arm.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/linux/linux-omap-2.6_2.6.5-omap1.oe b/linux/linux-omap-2.6_2.6.5-omap1.oe deleted file mode 100644 index 40471ec935..0000000000 --- a/linux/linux-omap-2.6_2.6.5-omap1.oe +++ /dev/null @@ -1,24 +0,0 @@ -SECTION = "kernel" -DESCRIPTION = "Linux kernel for OMAP processors" -LICENSE = "GPL" - -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.5.tar.bz2 \ - http://www.muru.com/linux/omap/patches/patch-2.6.5-omap1.bz2;patch=1 \ - file://defconfig" -S = "${WORKDIR}/linux-2.6.5" - -inherit kernel - -KERNEL_IMAGETYPE = "zImage" - -do_configure_prepend() { - install -m 0644 ${WORKDIR}/defconfig ${S}/.config || die "no default configuration for ${MACHINE} available." - oe_runmake oldconfig -} - -python __anonymous () { - import re - host = oe.data.getVar('HOST_SYS', d, 1) - if not re.match('arm.*-linux', host): - raise oe.parse.SkipPackage("incompatible with host %s" % host) -} diff --git a/linux/linux-omap-2.6_2.6.9-rc4-omap1.oe b/linux/linux-omap-2.6_2.6.9-rc4-omap1.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/linux/nslu2-openslug_2.6.7.oe b/linux/nslu2-openslug_2.6.7.oe index 9da953f26f..8d6c797144 100644 --- a/linux/nslu2-openslug_2.6.7.oe +++ b/linux/nslu2-openslug_2.6.7.oe @@ -4,6 +4,8 @@ LICENSE = "GPL" MAINTAINER = "Chris Larson " PR = "r1" +KERNEL_SUFFIX = "openslug" + SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.7.tar.bz2 \ file://arm-Makefile.patch;patch=1 \ file://ipx4xx-pci.patch;patch=1 \ @@ -30,7 +32,7 @@ do_configure_prepend() { do_deploy() { install -d ${DEPLOY_DIR}/images - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}.bin-${DATETIME} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX} } do_deploy[dirs] = "${S}" diff --git a/meta/openslug-image.oe b/meta/openslug-image.oe new file mode 100644 index 0000000000..e69de29bb2 -- cgit v1.2.3