From 5bcdb4abd61e4d64aec042d9bb27e8ff275530b3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 8 Apr 2006 17:46:55 +0000 Subject: Remove virutal/kernel-hostap as linux-openzaurus just needs to RPROVIDES hostap-modules. --- packages/linux/linux-openzaurus.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'packages/linux') diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc index 531833278c..d2a2e4a153 100644 --- a/packages/linux/linux-openzaurus.inc +++ b/packages/linux/linux-openzaurus.inc @@ -2,8 +2,9 @@ DESCRIPTION = "2.6 Linux Development Kernel for Zaurus devices and iPAQ hx2750." SECTION = "kernel" MAINTAINER = "Richard Purdie , Michael 'Mickey' Lauer " LICENSE = "GPL" -PROVIDES = "virtual/kernel-hostap" -RPROVIDES_kernel-module-hostap-cs = "virtual/kernel-hostap" + +PACKAGES += "kernel-module-hostap" +RPROVIDES_kernel-module-hostap = "hostap-modules" DOSRC = "http://www.do13.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches/archive" -- cgit v1.2.3 From 52dcccdfd31b0b0c9ac4725dd52a20b88a6b7b7c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 8 Apr 2006 19:18:40 +0000 Subject: * Remove 2.4 machine support for c7x0, akita, spitz and borzoi. * Remove borzoi machine entirely as its now equal to spitz. * For remaining 2.4/2.6 split machines use ZKERNEL_VERSION instead of KERNEL_VERSION to fix a long standing bug - people will need to update local.conf. * Add dummy terrier MACHINE to point at spitz. --- packages/linux/linux-openzaurus.inc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'packages/linux') diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc index d2a2e4a153..cb0c5291ec 100644 --- a/packages/linux/linux-openzaurus.inc +++ b/packages/linux/linux-openzaurus.inc @@ -26,7 +26,6 @@ COMPATIBLE_HOST = "arm.*-linux" CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd" CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2" CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rw" -CMDLINE_ROOT_borzoi = "root=/dev/hda1 rootfstype=ext3 rw" CMDLINE_OTHER = "dyntick=enable" CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}' @@ -39,7 +38,6 @@ export rd = ${@bb.data.getVar("COLLIE_RAMDISK_SIZE",d,1) or "32"} CMDLINE_MEM_collie = "mem=${mem}M" CMDLINE_ROTATE_spitz = "fbcon=rotate:1" CMDLINE_ROTATE_akita = "fbcon=rotate:1" -CMDLINE_ROTATE_borzoi = "fbcon=rotate:1" CMDLINE_ROTATE_collie = "fbcon=rotate:1" CMDLINE_ROTATE_poodle = "fbcon=rotate:1" CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}" @@ -56,13 +54,12 @@ module_autoload_pxaficp_ir = "pxaficp_ir" module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-soc-corgi_c7x0 = "snd-soc-corgi" module_autoload_snd-soc-spitz_akita = "snd-soc-spitz" -module_autoload_snd-soc-spitz_borzoi = "snd-soc-spitz" module_autoload_snd-soc-spitz_spitz = "snd-soc-spitz" do_configure() { case ${MACHINE} in - akita | spitz | borzoi ) + akita | spitz ) install -m 0644 ${WORKDIR}/defconfig-cxx00 ${S}/.config || die "No default configuration for cxx00 available." ;; *) @@ -105,7 +102,7 @@ do_configure() { # Check the kernel is below the 1272*1024 byte limit for the PXA Zaurii do_compile_append() { case ${MACHINE} in - c7x0 | akita | poodle | spitz | borzoi | tosa ) + c7x0 | akita | poodle | spitz | tosa ) size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'` if [ $size -ge 1302000 ]; then rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE} -- cgit v1.2.3 From a90f19506a2f346b0f482445ca46defb53f58548 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 8 Apr 2006 20:02:39 +0000 Subject: linux-openzaurus.inc: Correct the maximum zaurus kernel size (#816). --- packages/linux/linux-openzaurus.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/linux') diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc index cb0c5291ec..80ccdb4f85 100644 --- a/packages/linux/linux-openzaurus.inc +++ b/packages/linux/linux-openzaurus.inc @@ -99,12 +99,12 @@ do_configure() { yes '' | oe_runmake oldconfig } -# Check the kernel is below the 1272*1024 byte limit for the PXA Zaurii +# Check the kernel is below the 1264*1024 byte limit for the PXA Zaurii do_compile_append() { case ${MACHINE} in c7x0 | akita | poodle | spitz | tosa ) size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'` - if [ $size -ge 1302000 ]; then + if [ $size -ge 1294336 ]; then rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE} echo "Size is $size" die "This kernel is too big for your PXA Zaurus and will destroy data if you flash it. Please reduce the size of the kernel by making more of it modular." -- cgit v1.2.3