]> code.ossystems Code Review - openembedded-core.git/commitdiff
Merge changes from mainline OE to try and keep us in sync.
authorRichard Purdie <richard@openedhand.com>
Mon, 10 Oct 2005 10:41:35 +0000 (10:41 +0000)
committerRichard Purdie <richard@openedhand.com>
Mon, 10 Oct 2005 10:41:35 +0000 (10:41 +0000)
git-svn-id: https://svn.o-hand.com/repos/poky@127 311d38ba-8fff-0310-9ca6-ca027cbcb966

41 files changed:
openembedded/classes/autotools.bbclass
openembedded/classes/binconfig.bbclass
openembedded/classes/efl.bbclass
openembedded/classes/kernel.bbclass
openembedded/classes/qt3x11.bbclass
openembedded/classes/qt4x11.bbclass
openembedded/classes/sourcepkg.bbclass
openembedded/conf/bitbake.conf
openembedded/conf/distro/maemo-1.0.conf
openembedded/conf/distro/preferred-gpe-versions-2.6.inc [deleted file]
openembedded/conf/machine/ipaq-pxa270.conf
openembedded/conf/machine/nokia770.conf
openembedded/packages/base-files/base-files/nokia770/fstab
openembedded/packages/base-files/base-files/simpad/fstab
openembedded/packages/hostap/files/hostap_cs.conf
openembedded/packages/hostap/hostap-modules_0.3.9.bb
openembedded/packages/linux/linux-openzaurus.inc
openembedded/packages/linux/linux-openzaurus_2.6.14-rc1.bb
openembedded/packages/matchbox-common/matchbox-common_svn.bb
openembedded/packages/ncurses/ncurses.inc
openembedded/packages/netbase/netbase_4.21.bb
openembedded/packages/orinoco/orinoco-modules_0.15rc2.bb
openembedded/packages/pcmcia-cs/files/arm/pcmcia
openembedded/packages/pcmcia-cs/files/network.conf
openembedded/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
openembedded/packages/perl/perl-5.8.7/config.sh-armeb-linux
openembedded/packages/readline/readline_4.3.bb
openembedded/packages/recordext/recordext_cvs.bb
openembedded/packages/tslib/tslib/h3900/tslib.sh
openembedded/packages/tslib/tslib/simpad/tslib.sh
openembedded/packages/tslib/tslib/ts.conf-simpad [new file with mode: 0644]
openembedded/packages/tslib/tslib/ts.conf-simpad-2.4 [new file with mode: 0644]
openembedded/packages/tslib/tslib_cvs.bb
openembedded/packages/udev/files/init
openembedded/packages/udev/files/udev.rules
openembedded/packages/udev/udev_070.bb
openembedded/packages/update-rc.d/update-rc.d-0.6/copyright.patch
openembedded/packages/xcalibrateext/xcalibrateext_cvs.bb
openembedded/packages/xserver/xserver-kdrive/no-serial-probing.patch [new file with mode: 0644]
openembedded/packages/xserver/xserver-kdrive_20050207.bb
openembedded/packages/xserver/xserver-kdrive_20050624.bb

index ec1d4af1a455369190b46db4f38eb1a5f73e09ee..8d448ce0d3906a15c4098e4cf78a3b626e0f9eec 100644 (file)
@@ -150,4 +150,16 @@ autotools_stage_includes() {
        fi
 }
 
+autotools_stage_all() {
+       if [ "${INHIBIT_AUTO_STAGE}" != "1" ]
+       then
+               rm -rf ${STAGE_TEMP}
+               mkdir -p ${STAGE_TEMP}
+               oe_runmake DESTDIR="${STAGE_TEMP}" install
+               cp -pPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
+               cp -pPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
+               rm -rf ${STAGE_TEMP}
+       fi
+}
+
 EXPORT_FUNCTIONS do_configure do_install
index a599dec3f27cfeebce6e74ae2e0315c22a6e28b9..bf15ebcdf98b6354527aacb3bbd00c74f9164e8f 100644 (file)
@@ -24,8 +24,10 @@ def is_native(d):
        import bb.data
        return ["","-native"][bb.data.inherits_class('native', d)]
 
+BINCONFIG_GLOB ?= "*-config"
+
 do_stage_append() {
-       for config in `find ${S} -name '*-config'`; do
+       for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do
                configname=`basename $config`${@is_native(d)}
                install -d ${STAGING_BINDIR}
                cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR}/$configname
index 16c2dba0b87f4162b5dcbfe9f8636afd2fe28272..964748e85ccaa45e9e1d5b6ac4308a5d4de3cc5a 100644 (file)
@@ -38,6 +38,10 @@ export ESMART_CONFIG         = "${STAGING_BINDIR}/esmart-config${@binconfig_suffix(d)}"
 export FREETYPE_CONFIG         = "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}"
 export IMLIB2_CONFIG           = "${STAGING_BINDIR}/imlib2-config${@binconfig_suffix(d)}"
 
+do_compile_prepend() {
+       find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
+}
+
 do_stage_append () {
        for i in ${libraries}
        do
index ff9aeeab7800d507c9f434fd47752978a6c2c1c2..df676c5a8dd3008e2b04e5f8ee8792fd62f8da36 100644 (file)
@@ -60,7 +60,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 kernel_do_compile() {
        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
        oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}"
-       oe_runmake dep CC="${KERNEL_CC}" LD="${KERNEL_LD}"
+       if ${KERNEL_MAJOR_VERSION} != "2.6"; then
+               oe_runmake dep CC="${KERNEL_CC}" LD="${KERNEL_LD}"
+       fi
        oe_runmake ${KERNEL_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}"
        if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
                oe_runmake modules  CC="${KERNEL_CC}" LD="${KERNEL_LD}"
index 1023a1f800a1880c6e553e78df7ea1df02643b4f..09b9cbac96129c8f7ced430f9fe64a11f99b918d 100644 (file)
@@ -1,4 +1,3 @@
-DEPENDS += "qt3-x11"
 #
 # override variables set by qmake-base to compile Qt/X11 apps
 #
index 92885aa7eeb345b7a8f0dee6782ee4c737d7d4f6..d4ca0073df607d27fd9a835dbbdda715080d38a5 100644 (file)
@@ -1,4 +1,3 @@
-DEPENDS += "qt4-x11"
 #
 # override variables set by qmake-base to compile Qt/X11 apps
 #
index 3eeff91333f322d167f3e9c5aee33e8d75562008..390d3684d46b7b73c1560be99552035f8de735b6 100644 (file)
@@ -1,5 +1,5 @@
 DEPLOY_DIR_SRC ?= "${DEPLOY_DIR}/source"
-EXCLUDE_FROM ?= ".pc"
+EXCLUDE_FROM ?= ".pc autom4te.cache"
 
 # used as part of a path. make sure it's set
 DISTRO ?= "openembedded"
@@ -42,7 +42,7 @@ sourcepkg_do_create_orig_tgz(){
        
        echo $src_tree
        oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz"
-       tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz  $src_tree --exclude-from temp/exclude-from-file
+       tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree
        cp -pPR $src_tree $src_tree.orig
 }
 
index 7008ce9940dacaf886c150f73b1e2547fdd31241..3ad1b703f54e8a7f7bbd2bc41b141479d744098b 100644 (file)
@@ -294,6 +294,7 @@ SOURCEFORGE_MIRROR = "http://heanet.dl.sourceforge.net/sourceforge"
 GPE_MIRROR = "http://ftp.handhelds.org/pub/projects/gpe/source"
 XLIBS_MIRROR = "http://xlibs.freedesktop.org/release"
 GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
+FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/"
 HANDHELDS_CVS = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs"
 
 # You can use the mirror of your country to get faster downloads by putting
index f8211dc3c7ebdd78e32482ba72b48fe6acb5bed8..15ec45f34e7b3c2565057b6cd58e337f6a492017 100644 (file)
@@ -28,7 +28,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
 #
 
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
-#PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
+PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
 PREFERRED_PROVIDER_x11 = "diet-x11"
 
 include conf/distro/preferred-gpe-versions.inc
diff --git a/openembedded/conf/distro/preferred-gpe-versions-2.6.inc b/openembedded/conf/distro/preferred-gpe-versions-2.6.inc
deleted file mode 100644 (file)
index 504d495..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# Specify which versions of GPE (and related) applications to build
-#
-
-#work around some breakages
-CVSDATE_xserver-kdrive=20050207
-CVSDATE_minimo=20050401
-CVSDATE_cairo=20050330
-CVSDATE_xext=20050222
-
-#set some preferred providers:
-#PREFERRED_PROVIDER_gconf=gconf-dbus
-
-#specify versions, as the header says :)
-PREFERRED_VERSION_libmatchbox ?= "1.6"
-PREFERRED_VERSION_matchbox ?= "0.9.1"
-PREFERRED_VERSION_matchbox-common ?= "0.9.1"
-PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
-PREFERRED_VERSION_matchbox-wm ?= "0.9.3"
-PREFERRED_VERSION_matchbox-panel ?= "0.9.1"
-PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
-PREFERRED_VERSION_gtk+ ?= "2.6.3"
-PREFERRED_VERSION_libgpewidget ?= "0.97"
-PREFERRED_VERSION_libgpepimc ?= "0.4"
-PREFERRED_VERSION_libgpevtype ?= "0.11"
-PREFERRED_VERSION_libschedule ?= "0.14"
-PREFERRED_VERSION_gpe-icons ?= "0.24"
-PREFERRED_VERSION_libgsm ?= "1.0.10"
-PREFERRED_VERSION_diet-x11 ?= "6.2.1"
-PREFERRED_VERSION_xproto ?= "6.6.2"
-PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
-PREFERRED_VERSION_rxvt-unicode ?= "5.3"
-PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
-PREFERRED_VERSION_xst ?= "0.14"
-#PREFERRED_VERSION_xextensions ?= "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" 
-PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
-PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_gpe-login ?= "0.76"
-PREFERRED_VERSION_gpe-session-scripts ?= "0.62"
-PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
-PREFERRED_VERSION_gpe-todo ?= "0.50"
-PREFERRED_VERSION_gpe-calendar ?= "0.61"
-PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8"
-PREFERRED_VERSION_gpe-contacts ?= "0.36"
-PREFERRED_VERSION_gpe-today ?= "0.08"
-PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
-PREFERRED_VERSION_dbus ?= "0.23"
-PREFERRED_VERSION_gpe-bluetooth ?= "0.38"
-PREFERRED_VERSION_gpe-su ?= "0.18"
-PREFERRED_VERSION_gpe-conf ?= "0.1.23"
-PREFERRED_VERSION_gpe-clock ?= "0.20"
-PREFERRED_VERSION_gpe-mininet ?= "0.5"
-PREFERRED_VERSION_gpe-mixer ?= "0.40"
-PREFERRED_VERSION_gpe-shield ?= "0.7"
-PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6"
-PREFERRED_VERSION_gpe-taskmanager ?= "0.17"
-PREFERRED_VERSION_keylaunch ?= "2.0.7"
-PREFERRED_VERSION_minilite ?= "0.47"
-PREFERRED_VERSION_xmonobut ?= "0.4"
-PREFERRED_VERSION_gpe-edit ?= "0.28"
-PREFERRED_VERSION_gpe-gallery ?= "0.95"
-PREFERRED_VERSION_gpe-calculator ?= "0.2"
-PREFERRED_VERSION_gpe-package ?= "0.2"
-PREFERRED_VERSION_gpe-soundbite ?= "1.0.5"
-PREFERRED_VERSION_gpe-terminal ?= "1.1"
-PREFERRED_VERSION_gpe-watch ?= "0.10"
-PREFERRED_VERSION_gpe-what ?= "0.33"
-PREFERRED_VERSION_gpe-filemanager ?= "0.20"
-PREFERRED_VERSION_gpe-go ?= "0.05"
-PREFERRED_VERSION_gpe-irc ?= "0.07"
-PREFERRED_VERSION_gpe-lights ?= "0.13"
-#PREFERRED_VERSION_gpe-nmf ?= "0.19"
-PREFERRED_VERSION_gpe-othello ?= "0.2-1"
-PREFERRED_VERSION_gpe-plucker ?= "0.2"
-PREFERRED_VERSION_gpe-tetris ?= "0.6-2"
-PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
-PREFERRED_VERSION_xdemineur ?= "2.1.1"
-PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
-PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_dillo2 ?= "0.6.6"
-PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
-PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
-PREFERRED_VERSION_linphone ?= "0.12.2"
-PREFERRED_VERSION_firefox ?= "1.0"
-
index ec2b1beb020a479675c404d58dfc39ccaa19106e..b9925852e58c1e334e690732a23341c35f84f98e 100644 (file)
@@ -12,6 +12,8 @@ PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params"
 BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev module-init-tools"
 
+ROOT_FLASH_SIZE = "80"
+
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}"
 BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
 
index 8690348fa9dde3933d7aefe272e9bfa4e1cc50ba..9f49f245632c78e837d7a3bb43f8a998cb844d47 100644 (file)
@@ -57,3 +57,4 @@ pcmcia-cs apm  ppp wireless-tools console-tools"
 ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
 
 include conf/machine/handheld-common.conf
+
index 4b6a5e1e17adef7f1410c9104a8c85f704121b9e..68b56b63e3637fad91410c04d71d6188692317b0 100644 (file)
@@ -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
index f946c50c6ca7682882bd6f7bd5ef4e7aa7359358..99b87714e53a928a92e56dbc70a97bea70319d68 100644 (file)
@@ -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
index 0b1bcf1a58c3a93603b8a7b8bcfffa53d3fe0d17..c5f46d8e71196118b99e7835d7515c976ff471e3 100644 (file)
@@ -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"
index 1be1e6a77e338896bd631d637f4858ef2878a0dc..435054c07c7baa1918a2a22bbdd6fb87f8f4ce13 100644 (file)
@@ -3,7 +3,7 @@ SECTION = "kernel/modules"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-PR = "r4"
+PR = "r6"
 
 SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
            file://hostap_cs.conf \
index 68a90b290ea3ec11ccd827c5b46abf7de9ca96a3..907801a38288310ff55d02f2131c5eef7be44a6c 100644 (file)
@@ -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
                        ;;
                *)
index 3b374340ccccbd2a828a8cbf561410efa7b01d8f..18eb8bb4a06d2c545d2e5cf7093f8cdb778959a6 100644 (file)
@@ -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 
index de1e20b87a21abf92ebd971ae61002106d06fb97..d951678551a76041d3efd57f293cbd03280c7e4b 100644 (file)
@@ -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 \
index f400617dcb96865170763701ef18b145efee9c2d..96679db0cb12db424700f85b0f851a619e4334bb 100644 (file)
@@ -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
index 3426d1ae976a971dcc8ccbe0c57be6c3d83792bb..4046e64d793d75f014670ac67633fb340ea2f4e5 100644 (file)
@@ -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
 
index 60cae878575e626a6706165cfcc3948b5e84e44f..8093e7d2469e80c525ea1384c4ff5a91e5c9efa8 100644 (file)
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 PROVIDES = "spectrum-modules"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz \
            file://makefile_fix.patch;patch=1 \
index d42bc84e77c3b4b70b19a5322389dc8884a5074e..05b381a5f9ee8b0784fddabd75b44a874f81e837 100644 (file)
@@ -1,12 +1,19 @@
+module_id() {
+    awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
+}
+
+
 case `awk 'BEGIN { FS=":" } /Processor/ { gsub(/ /, "", $2) ; print $2 } ' </proc/cpuinfo` in
   *XScale-PXA2*)
 
     case "`uname -r`" in
         2.4*)
                PCIC=pxa_cs
+               DS=ds
                ;;
        2.6*)
                PCIC=pxa2xx_core
+               DS=pcmcia
                ;;
     esac
     ;;
@@ -19,12 +26,8 @@ case `awk 'BEGIN { FS=":" } /Processor/ { gsub(/ /, "", $2) ; print $2 } ' </pro
     ;;
 esac
 
-if grep -q iPAQ /proc/cpuinfo; then
-  case `module_id` in
-    "HP iPAQ H2200")
-       ;;
-    *)
-       PCIC_EXTRA=h3600_generic_sleeve
-       ;;
-  esac
-fi
+case `module_id` in
+  "HP iPAQ H3"* | "HP iPAQ H5"*)
+    PCIC_EXTRA=h3600_generic_sleeve
+    ;;
+esac
index b35ec5c0fec9abd82908458dc4d15777a0e1d44e..51a38dd55bc334a62ada43fff65b89084f32c106 100644 (file)
@@ -3,4 +3,11 @@ manfid 0x0149, 0xc1ab
 version "Fast Ethernet", "CF Size PC Card", "1.0"
 bind "pcnet_cs"
 
+card "Hawking 10/100 CF Fast Ethernet"
+  manfid 0x0149, 0xc1ab
+  bind "pcnet_cs"
 
+card "Billionton CFLA-100N 10/100 FastEthernet"
+  version "CF", "100Base-Ethernet", "V", "1.0"
+  manfid 0x021b, 0x0202
+  bind "pcnet_cs"
index 2aa41a6c3251553065e9f010c4cdd7f6b007bc06..dadf830534c793b4e9ab3790cc471d3fdafd4cb5 100644 (file)
@@ -3,7 +3,7 @@ SECTION = "base"
 PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel"
-PR = "r19"
+PR = "r21"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \
           file://busybox.patch;patch=1 \
index 155b5237aa4fc8f0ed3c37706f49fcb16c2fa261..de17bbf28f9d244c6bdfb5611ac7ccaf2655d407 100644 (file)
@@ -801,7 +801,7 @@ perl5='hostperl'
 perl=''
 perl_patchlevel=''
 perladmin='slug@thg-slug1.thg.se'
-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc -lgcc_s'
+perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc -lgcc_s $$($(CC) -print-libgcc-file-name)'
 perlpath='hostperl'
 pg='pg'
 phostname='hostname'
index 234d697dfb56c4bd65604a3d5c2c4ef2a5d946dc..d0ff2a8d7c44093e15a3444ac709f3c26a5b5dda 100644 (file)
@@ -4,12 +4,11 @@ additional functions to maintain a list of previously-entered command lines, to
 lines, and perform csh-like history expansion on previous commands."
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 LICENSE = "GPLv2"
 DEPENDS += "ncurses"
 RPROVIDES_${PN} += "readline"
 LEAD_SONAME = "libreadline.so"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.cwru.edu/pub/bash/readline-${PV}.tar.gz \
           file://shlink-termcap.patch;patch=1 \
@@ -23,24 +22,13 @@ do_configure () {
        autotools_do_configure
 }
 
+do_stage() {
+       autotools_stage_all
+}
+
 do_install () {
        autotools_do_install
        # Make install doesn't properly install these
        oe_libinstall -so -C shlib libhistory ${D}${libdir}
        oe_libinstall -so -C shlib libreadline ${D}${libdir}
 }
-
-do_stage() {
-       oe_libinstall -a libhistory ${STAGING_LIBDIR}
-       oe_libinstall -a libreadline ${STAGING_LIBDIR}
-       oe_libinstall -so -C shlib libhistory ${STAGING_LIBDIR}
-       oe_libinstall -so -C shlib libreadline ${STAGING_LIBDIR}
-
-       install -d ${STAGING_INCDIR}/readline
-       for f in readline.h chardefs.h keymaps.h history.h tilde.h rlstdc.h \
-         rlconf.h rltypedefs.h
-       do
-               install -m 0644 $f ${STAGING_INCDIR}/readline/
-       done
-
-}
index 42acd1098825fa0c0b6e333ecf4f1ddd1e5c1a01..b6e6ecf882059f40a06cbe22c44b247144d5913e 100644 (file)
@@ -1,7 +1,7 @@
 PV = "0.0cvs${CVSDATE}"
 LICENSE = "BSD-X"
 SECTION = "libs"
-MAINTAINER = "Phil Blundell <pb@nexus.co.uk>"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DESCRIPTION = "XRecord extension protocol bits"
 
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=RecordExt"
index c885ccc9d2250ccf6a3e1ea82aa53fa9193fe499..be9448b1dc2093d8d34864c55cd8273f43ad4ffa 100644 (file)
@@ -11,15 +11,7 @@ case `uname -r` in
        ;;
 *)
        TSLIB_TSDEVICE=`detect-stylus --device`
-       case `module_id` in
-       "HP iPAQ H2200")
-               # h2200 needs special linearizing thing
-               TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h2200
-               ;;
-       *)
-               TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600
-               ;;
-       esac
+       TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600
        ;;
 esac
 
index e87a2095c48344ca39d55422732e110c8d84491c..8bb94a037f8cdc060e22d0d4cba79b7018fe01e9 100644 (file)
@@ -1,5 +1,15 @@
 #!/bin/sh
 
-TSLIB_TSDEVICE=/dev/input/event0
+case `uname -r` in
+2.4*)
+       TSLIB_TSDEVICE=/dev/touchscreen/ucb1x00
+       TSLIB_CONFFILE=/usr/share/tslib/ts.conf-simpad-2.4
+       ;;
+*)
+       TSLIB_TSDEVICE=/dev/input/event0
+       TSLIB_CONFFILE=/usr/share/tslib/ts.conf-simpad
+       ;;
+esac
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE
 
-export TSLIB_TSDEVICE
diff --git a/openembedded/packages/tslib/tslib/ts.conf-simpad b/openembedded/packages/tslib/tslib/ts.conf-simpad
new file mode 100644 (file)
index 0000000..0930971
--- /dev/null
@@ -0,0 +1,5 @@
+module_raw input
+module pthres pmin=1
+module variance delta=30
+module dejitter delta=100
+module linear
diff --git a/openembedded/packages/tslib/tslib/ts.conf-simpad-2.4 b/openembedded/packages/tslib/tslib/ts.conf-simpad-2.4
new file mode 100644 (file)
index 0000000..035e794
--- /dev/null
@@ -0,0 +1,5 @@
+module_raw ucb1x00
+module pthres pmin=1
+module variance delta=10
+module dejitter delta=150
+module linear
index 5c52147e1cb08a8e33127e7371cf792ebfd6d52c..0a79a492a31884528a215bdfb87910bf89c57714 100644 (file)
@@ -1,7 +1,7 @@
 SECTION = "base"
 DESCRIPTION = "tslib is a touchscreen access library."
 PV = "0.0cvs${CVSDATE}"
-PR = "r31"
+PR = "r32"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 PACKAGE_ARCH_tslib-conf = "${MACHINE}"
@@ -9,8 +9,9 @@ PACKAGE_ARCH_mnci = "${MACHINE}"
 
 SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \
           file://ts.conf \
-          file://ts.conf-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h2200 file://ts.conf-h6300 \
+          file://ts.conf-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h6300 \
           file://ts.conf-corgi file://ts.conf-corgi-2.4 \
+          file://ts.conf-simpad file://ts.conf-simpad-2.4 \
           file://tslib.sh"
 SRC_URI_append_mnci += " file://devfs.patch;patch=1"
 SRC_URI_append_mnci += " file://event1.patch;patch=1"
@@ -40,9 +41,9 @@ do_install_append() {
        install -d ${D}${sysconfdir}/profile.d/
        install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
        case ${MACHINE} in
-       h3600 | h3900 | h1940 | h6300 | ipaq-pxa270)
+       h3600 | h3900 | h1940 | h6300 | h2200 | ipaq-pxa270)
                install -d ${D}${datadir}/tslib
-               for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h2200 ts.conf-h6300; do
+               for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h6300; do
                        install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
                done
                rm -f ${D}${sysconfdir}/ts.conf
@@ -54,6 +55,13 @@ do_install_append() {
                done
                rm -f ${D}${sysconfdir}/ts.conf
                ;;
+       simpad )
+               install -d ${D}${datadir}/tslib
+               for f in ts.conf-simpad ts.conf-simpad-2.4; do
+                       install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
+               done
+               rm -f ${D}${sysconfdir}/ts.conf
+               ;;
        *)
                ;;
        esac
index c290661c72be2852cfef48ba6b1c1e07d8a0f1cf..6ad6fd5811cfd17338c9c01155aaa98b04a17b34 100755 (executable)
@@ -52,7 +52,9 @@ mount_tmpfs() {
 
   mkdir -p /dev/.static/dev
   chmod 700 /dev/.static/
-  mount -n -o move /etc/udev /dev/.static/dev
+  # Make sure it's busybox mount we're using. util-linux mount doesn't handle
+  # -o move. 
+  busybox mount -n -o move /etc/udev /dev/.static/dev
 }
 
 # I hate this hack.  -- Md
index 4fc82ba250c25e73e141aa8edf405a9ca8fb5223..044ababa7f2c34f0d30b4e3987292511c383342b 100644 (file)
@@ -54,6 +54,8 @@ KERNEL=="issm*",              NAME="infiniband/%k"
 KERNEL=="uverbs*",             NAME="infiniband/%k"
 KERNEL=="ucm",                 NAME="infiniband/%k"
 
+KERNEL=="buzzer",              NAME="misc/buzzer"
+
 # ALSA devices
 KERNEL=="controlC[0-9]*",      NAME="snd/%k"
 KERNEL=="hwC[D0-9]*",          NAME="snd/%k"
index dfc20eb5b43e1a8c96881e5e732c7ae1f804f0d5..e5f0409b17ec5d619b7a957157c047255bde26c7 100644 (file)
@@ -6,7 +6,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 
 include udev.inc
 
-PR = "r3"
+PR = "r5"
 
 UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"
 
index 3463247fef511c0e086e1407cc22059448749c01..bfe9cb818180a0f081c370690c1f03a33174b124 100644 (file)
@@ -10,7 +10,7 @@ diff -u -r1.6 -r1.7
  #
  # update-rc.d Update the links in /etc/rc[0-9S].d/
  #
--# Phil Blundell <pb@nexus.co.uk> 2003-06-26
+-# Phil Blundell <pb@handhelds.org> 2003-06-26
 +# (c) 2003, 2004 Phil Blundell <pb@handhelds.org>
  #
 +# This program is free software; you can redistribute it and/or modify
index b6ee79a19f74262524417b6a3d338b213c142e62..33cda47f3947303a3da1b8e78b3cb11e68dd6661 100644 (file)
@@ -1,7 +1,7 @@
 PV = "0.0cvs${CVSDATE}"
 SECTION = "x11/libs"
 LICENSE = "BSD-X"
-MAINTAINER = "Phil Blundell <pb@nexus.co.uk>"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 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 (file)
index 0000000..35ccada
--- /dev/null
@@ -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]))
index 53b704e36215e9591250a9873f855bc7949bad30..65f14200964cf6784330e917fb1a996d649a945e 100644 (file)
@@ -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"
 
index 4031db9c2b7dde9f0d453f8852dd884c5205f5f9..78e77a23a56e519c86fba3f37d6050d1986bb742 100644 (file)
@@ -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