From cbf3ef91305558fb8a59e19c5987a9e9ca22013a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 10 Oct 2005 10:41:35 +0000 Subject: Merge changes from mainline OE to try and keep us in sync. git-svn-id: https://svn.o-hand.com/repos/poky@127 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../packages/base-files/base-files/nokia770/fstab | 14 ++++++-------- .../packages/base-files/base-files/simpad/fstab | 2 +- openembedded/packages/hostap/files/hostap_cs.conf | 16 ++++++++++++++++ .../packages/hostap/hostap-modules_0.3.9.bb | 2 +- openembedded/packages/linux/linux-openzaurus.inc | 11 +++++++++-- .../packages/linux/linux-openzaurus_2.6.14-rc1.bb | 6 +++--- .../matchbox-common/matchbox-common_svn.bb | 4 ++-- openembedded/packages/ncurses/ncurses.inc | 10 ++-------- openembedded/packages/netbase/netbase_4.21.bb | 2 +- .../packages/orinoco/orinoco-modules_0.15rc2.bb | 2 +- openembedded/packages/pcmcia-cs/files/arm/pcmcia | 21 ++++++++++++--------- openembedded/packages/pcmcia-cs/files/network.conf | 7 +++++++ openembedded/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb | 2 +- .../packages/perl/perl-5.8.7/config.sh-armeb-linux | 2 +- openembedded/packages/readline/readline_4.3.bb | 22 +++++----------------- openembedded/packages/recordext/recordext_cvs.bb | 2 +- openembedded/packages/tslib/tslib/h3900/tslib.sh | 10 +--------- openembedded/packages/tslib/tslib/simpad/tslib.sh | 14 ++++++++++++-- openembedded/packages/tslib/tslib/ts.conf-simpad | 5 +++++ .../packages/tslib/tslib/ts.conf-simpad-2.4 | 5 +++++ openembedded/packages/tslib/tslib_cvs.bb | 16 ++++++++++++---- openembedded/packages/udev/files/init | 4 +++- openembedded/packages/udev/files/udev.rules | 2 ++ openembedded/packages/udev/udev_070.bb | 2 +- .../update-rc.d/update-rc.d-0.6/copyright.patch | 2 +- .../packages/xcalibrateext/xcalibrateext_cvs.bb | 2 +- .../xserver/xserver-kdrive/no-serial-probing.patch | 13 +++++++++++++ .../packages/xserver/xserver-kdrive_20050207.bb | 20 ++++++++++++-------- .../packages/xserver/xserver-kdrive_20050624.bb | 4 +++- 29 files changed, 140 insertions(+), 84 deletions(-) create mode 100644 openembedded/packages/tslib/tslib/ts.conf-simpad create mode 100644 openembedded/packages/tslib/tslib/ts.conf-simpad-2.4 create mode 100644 openembedded/packages/xserver/xserver-kdrive/no-serial-probing.patch (limited to 'openembedded/packages') diff --git a/openembedded/packages/base-files/base-files/nokia770/fstab b/openembedded/packages/base-files/base-files/nokia770/fstab index 4b6a5e1e17..68b56b63e3 100644 --- a/openembedded/packages/base-files/base-files/nokia770/fstab +++ b/openembedded/packages/base-files/base-files/nokia770/fstab @@ -1,8 +1,6 @@ -rootfs / rootfs defaults,errors=remount-ro,noatime 0 0 -/dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,exec,suid 0 0 -tmpfs /var tmpfs defaults 0 0 -tmpfs /media/ram tmpfs defaults 0 0 -rootfs / auto defaults 1 1 -proc /proc proc defaults 0 0 -devpts /dev/pts devpts mode=0620,gid=5 0 0 -usbdevfs /proc/bus/usb usbdevfs noauto 0 0 +rootfs / rootfs defaults,errors=remount-ro,noatime 0 0 +/dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,exec,suid 0 0 +tmpfs /var tmpfs defaults 0 0 +tmpfs /media/ram tmpfs defaults 0 0 +proc /proc proc defaults 0 0 +usbdevfs /proc/bus/usb usbdevfs noauto 0 0 diff --git a/openembedded/packages/base-files/base-files/simpad/fstab b/openembedded/packages/base-files/base-files/simpad/fstab index f946c50c6c..99b87714e5 100644 --- a/openembedded/packages/base-files/base-files/simpad/fstab +++ b/openembedded/packages/base-files/base-files/simpad/fstab @@ -4,4 +4,4 @@ devpts /dev/pts devpts mode=0620,gid=5 0 0 usbdevfs /proc/bus/usb usbdevfs noauto 0 0 tmpfs /var tmpfs defaults 0 0 /dev/mtdblock/2 /home jffs2 defaults 1 1 - +/dev/hda1 /mnt/cf auto noauto,owner 0 0 diff --git a/openembedded/packages/hostap/files/hostap_cs.conf b/openembedded/packages/hostap/files/hostap_cs.conf index 0b1bcf1a58..c5f46d8e71 100644 --- a/openembedded/packages/hostap/files/hostap_cs.conf +++ b/openembedded/packages/hostap/files/hostap_cs.conf @@ -167,3 +167,19 @@ card "ZCOMAX AirRunner/XI-300" manfid 0xd601, 0x0002 bind "hostap_cs" +card "Zonet ZCF1100" + manfid 0x000b, 0x7100 + bind "hostap_cs" + +card "Wireless LAN Adapter Version 01.02" + version "Wireless", "LAN Adapter", "Version 01.02" +# manfid 0x0156, 0x0002 + bind "hostap_cs" + +card "Ambicom WL1100C 11Mbs Card 802.11b" + manfid 0xd601,0x0002 + bind "hostap_cs" + +card "Sandisk Connect SDWCFB-000" + manfid 0xd601,0x0005 + bind "hostap_cs" diff --git a/openembedded/packages/hostap/hostap-modules_0.3.9.bb b/openembedded/packages/hostap/hostap-modules_0.3.9.bb index 1be1e6a77e..435054c07c 100644 --- a/openembedded/packages/hostap/hostap-modules_0.3.9.bb +++ b/openembedded/packages/hostap/hostap-modules_0.3.9.bb @@ -3,7 +3,7 @@ SECTION = "kernel/modules" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" -PR = "r4" +PR = "r6" SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \ file://hostap_cs.conf \ diff --git a/openembedded/packages/linux/linux-openzaurus.inc b/openembedded/packages/linux/linux-openzaurus.inc index 68a90b290e..907801a382 100644 --- a/openembedded/packages/linux/linux-openzaurus.inc +++ b/openembedded/packages/linux/linux-openzaurus.inc @@ -45,7 +45,14 @@ module_autoload_pxaficp_ir = "pxaficp_ir" do_configure() { - install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available." + case ${MACHINE} in + akita | spitz | borzoi ) + install -m 0644 ${WORKDIR}/defconfig-cxx00 ${S}/.config || die "No default configuration for cxx00 available." + ;; + *) + install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available." + ;; + esac if [ "${MACHINE}" == "collie" ]; then mempos=`echo "obase=16; $mem * 1024 * 1024" | bc` @@ -86,7 +93,7 @@ do_compile_append() { size=`ls arch/${ARCH}/boot/${KERNEL_IMAGETYPE} -s | cut -d ' ' -f 1` if [ $size -ge 1271 ]; then rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE} - die "This kernel is too big for the c7x0 and will destroy your machine if you flash it!!!" + 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." fi ;; *) diff --git a/openembedded/packages/linux/linux-openzaurus_2.6.14-rc1.bb b/openembedded/packages/linux/linux-openzaurus_2.6.14-rc1.bb index 3b374340cc..18eb8bb4a0 100644 --- a/openembedded/packages/linux/linux-openzaurus_2.6.14-rc1.bb +++ b/openembedded/packages/linux/linux-openzaurus_2.6.14-rc1.bb @@ -32,7 +32,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ ${RPSRC}/sharpsl_pm-r8.patch;patch=1 \ ${RPSRC}/corgi_pm-r3.patch;patch=1 \ ${RPSRC}/spitz_base_extras-r2.patch;patch=1 \ - ${RPSRC}/spitz_pm-r3.patch;patch=1 \ + ${RPSRC}/spitz_pm-r4.patch;patch=1 \ ${RPSRC}/spitz_kbd_fix1-r0.patch;patch=1 \ ${RPSRC}/spitzcf-r3.patch;patch=1 \ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ @@ -73,10 +73,10 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ file://dtl1_cs-add-socket-revE.patch;patch=1 \ file://connectplus-remove-ide-HACK.patch;patch=1 \ file://defconfig-c7x0 \ - file://defconfig-ipaq-pxa-2.6 \ + file://defconfig-ipaq-pxa270 \ file://defconfig-collie \ file://defconfig-poodle \ - file://defconfig-spitz \ + file://defconfig-cxx00 \ file://defconfig-tosa " # These patches would really help collie/poodle but we diff --git a/openembedded/packages/matchbox-common/matchbox-common_svn.bb b/openembedded/packages/matchbox-common/matchbox-common_svn.bb index de1e20b87a..d951678551 100644 --- a/openembedded/packages/matchbox-common/matchbox-common_svn.bb +++ b/openembedded/packages/matchbox-common/matchbox-common_svn.bb @@ -8,9 +8,9 @@ DEFAULT_PREFERENCE = "-1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-common;proto=http" -inherit autotools pkgconfig +inherit autotools pkgconfig -EXTRA_OECONF = "--enable-pda-folders" +EXTRA_OECONF = " --enable-pda-folders " FILES_${PN} = "${bindir} \ ${datadir}/matchbox/vfolders \ diff --git a/openembedded/packages/ncurses/ncurses.inc b/openembedded/packages/ncurses/ncurses.inc index f400617dcb..96679db0cb 100644 --- a/openembedded/packages/ncurses/ncurses.inc +++ b/openembedded/packages/ncurses/ncurses.inc @@ -33,14 +33,8 @@ export BUILD_CCFLAGS = "-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}" export BUILD_LDFLAGS = "" export EXTRA_OEMAKE = '"BUILD_LDFLAGS=" "BUILD_CCFLAGS=${BUILD_CCFLAGS}"' -do_stage () { - for i in libncurses libpanel libform libmenu; do - oe_libinstall -so -a -C lib $i ${STAGING_LIBDIR} - done - for h in ncurses_*.h curses.h eti.h form.h menu.h panel.h \ - termcap.h term.h unctrl.h; do - install -m 0644 include/$h ${STAGING_INCDIR}/ - done +do_stage() { + autotools_stage_all ln -sf curses.h ${STAGING_INCDIR}/ncurses.h ln -sf libncurses.so ${STAGING_LIBDIR}/libtermcap.so ln -sf libncurses.a ${STAGING_LIBDIR}/libtermcap.a diff --git a/openembedded/packages/netbase/netbase_4.21.bb b/openembedded/packages/netbase/netbase_4.21.bb index 3426d1ae97..4046e64d79 100644 --- a/openembedded/packages/netbase/netbase_4.21.bb +++ b/openembedded/packages/netbase/netbase_4.21.bb @@ -2,7 +2,7 @@ SECTION = "base" DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." LICENSE = "GPL" -PR = "r6" +PR = "r7" inherit update-rc.d diff --git a/openembedded/packages/orinoco/orinoco-modules_0.15rc2.bb b/openembedded/packages/orinoco/orinoco-modules_0.15rc2.bb index 60cae87857..8093e7d246 100644 --- a/openembedded/packages/orinoco/orinoco-modules_0.15rc2.bb +++ b/openembedded/packages/orinoco/orinoco-modules_0.15rc2.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" PROVIDES = "spectrum-modules" MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" -PR = "r7" +PR = "r8" SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz \ file://makefile_fix.patch;patch=1 \ diff --git a/openembedded/packages/pcmcia-cs/files/arm/pcmcia b/openembedded/packages/pcmcia-cs/files/arm/pcmcia index d42bc84e77..05b381a5f9 100644 --- a/openembedded/packages/pcmcia-cs/files/arm/pcmcia +++ b/openembedded/packages/pcmcia-cs/files/arm/pcmcia @@ -1,12 +1,19 @@ +module_id() { + awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' 2003-06-26 +-# Phil Blundell 2003-06-26 +# (c) 2003, 2004 Phil Blundell # +# This program is free software; you can redistribute it and/or modify diff --git a/openembedded/packages/xcalibrateext/xcalibrateext_cvs.bb b/openembedded/packages/xcalibrateext/xcalibrateext_cvs.bb index b6ee79a19f..33cda47f39 100644 --- a/openembedded/packages/xcalibrateext/xcalibrateext_cvs.bb +++ b/openembedded/packages/xcalibrateext/xcalibrateext_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0cvs${CVSDATE}" SECTION = "x11/libs" LICENSE = "BSD-X" -MAINTAINER = "Phil Blundell " +MAINTAINER = "Phil Blundell " DESCRIPTION = "XCalibrate extension headers" SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XCalibrateExt" diff --git a/openembedded/packages/xserver/xserver-kdrive/no-serial-probing.patch b/openembedded/packages/xserver/xserver-kdrive/no-serial-probing.patch new file mode 100644 index 0000000000..35ccadaa8d --- /dev/null +++ b/openembedded/packages/xserver/xserver-kdrive/no-serial-probing.patch @@ -0,0 +1,13 @@ +--- xserver/hw/kdrive/linux/mouse.c.orig 2004-05-13 14:25:51.000000000 -0700 ++++ xserver/hw/kdrive/linux/mouse.c 2005-09-22 12:20:47.000000000 -0700 +@@ -927,8 +927,10 @@ char *kdefaultMouse[] = { + "/dev/psaux", + "/dev/input/mice", + "/dev/adbmouse", ++#ifdef BREAK_MY_SERIAL_CONSOLE + "/dev/ttyS0", + "/dev/ttyS1", ++#endif + }; + + #define NUM_DEFAULT_MOUSE (sizeof (kdefaultMouse) / sizeof (kdefaultMouse[0])) diff --git a/openembedded/packages/xserver/xserver-kdrive_20050207.bb b/openembedded/packages/xserver/xserver-kdrive_20050207.bb index 53b704e362..65f1420096 100644 --- a/openembedded/packages/xserver/xserver-kdrive_20050207.bb +++ b/openembedded/packages/xserver/xserver-kdrive_20050207.bb @@ -20,7 +20,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep DESCRIPTION_xserver-kdrive-fake = "Fake X server" DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" -PR = "r2" +PR = "r4" FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" FILES_xserver-kdrive-ati = "${bindir}/Xati" @@ -35,18 +35,22 @@ FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDCVSDATE} \ file://kmode.patch;patch=1 \ - file://fbdev-not-fix.patch;patch=1" + file://fbdev-not-fix.patch;patch=1 " -SRC_URI_append_mnci = " file://onlyfb.patch;patch=1 \ - file://devfs.patch;patch=1 \ - file://disable-apm.patch;patch=1" -SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" -SRC_URI_append_c7x0 = " file://disable-apm.patch;patch=1" -SRC_URI_append_ipaq-pxa270 = " file://disable-apm.patch;patch=1" +SRC_URI_append_mnci = " file://onlyfb.patch;patch=1 \ + file://devfs.patch;patch=1 \ + file://disable-apm.patch;patch=1" +SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" +SRC_URI_append_c7x0 = " file://disable-apm.patch;patch=1" +SRC_URI_append_ipaq-pxa270= " file://disable-apm.patch;patch=1" +SRC_URI_append_h3900 = " file://disable-apm.patch;patch=1" +SRC_URI_append_h2200 = " file://disable-apm.patch;patch=1" PACKAGE_ARCH_poodle = "poodle" PACKAGE_ARCH_c7x0 = "c7x0" PACKAGE_ARCH_ipaq-pxa270 = "ipaq-pxa270" +PACKAGE_ARCH_h3900 = "h3900" +PACKAGE_ARCH_h2200 = "h2200" S = "${WORKDIR}/xserver" diff --git a/openembedded/packages/xserver/xserver-kdrive_20050624.bb b/openembedded/packages/xserver/xserver-kdrive_20050624.bb index 4031db9c2b..78e77a23a5 100644 --- a/openembedded/packages/xserver/xserver-kdrive_20050624.bb +++ b/openembedded/packages/xserver/xserver-kdrive_20050624.bb @@ -19,7 +19,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep DESCRIPTION_xserver-kdrive-fake = "Fake X server" DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" -PR = "r10" +PR = "r12" FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" FILES_xserver-kdrive-ati = "${bindir}/Xati" @@ -34,12 +34,14 @@ FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDCVSDATE} \ file://kmode.patch;patch=1 \ + file://no-serial-probing.patch;patch=1 \ file://fbdev-not-fix.patch;patch=1" SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" PACKAGE_ARCH_poodle = "poodle" + S = "${WORKDIR}/xserver" inherit autotools pkgconfig -- cgit v1.2.3-54-g00ecf