diff options
Diffstat (limited to 'packages')
32 files changed, 106 insertions, 55 deletions
diff --git a/packages/apmd/apmd_3.2.2.bb b/packages/apmd/apmd_3.2.2.bb index e335e20839..6aa91b0544 100644 --- a/packages/apmd/apmd_3.2.2.bb +++ b/packages/apmd/apmd_3.2.2.bb @@ -3,12 +3,11 @@ SECTION = "base" PRIORITY = "required" DEPENDS = "libtool-cross" LICENSE = "GPL" -PR = "r9" +PR = "r10" SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz; \ file://debian.patch;patch=1 \ file://workaround.patch;patch=1 \ - file://select-instead-of-sleep.patch;patch=1 \ file://init \ file://default \ file://apmd_proxy \ diff --git a/packages/base-files/base-files/h6300/fstab b/packages/base-files/base-files/h6300/fstab index 6884b4cc6d..7204361a75 100644 --- a/packages/base-files/base-files/h6300/fstab +++ b/packages/base-files/base-files/h6300/fstab @@ -1,8 +1,8 @@ -rootfs / auto defaults 1 1 -proc /proc proc defaults 0 0 -sys /sys sysfs defaults 0 0 -tmpfs /var tmpfs defaults 0 0 +rootfs / auto defaults 1 1 +proc /proc proc defaults 0 0 +sys /sys sysfs defaults 0 0 +tmpfs /var tmpfs defaults 0 0 #The devpts file system provides an interface to pseudo terminal (pty) devices. -devpts /dev/pts devpts mode=0620,gid=5 0 0 +devpts /dev/pts devpts mode=0620,gid=5 0 0 #Mount first partition from the mmc card. -/dev/mmcblk0p1 /media/card auto defaults,sync,noauto,noatime,exec,suid 0 0 +/dev/mmcblk0p1 /media/card auto defaults,sync,noauto,noatime,exec,suid 0 0 diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 6d5fb61dca..35357c93cd 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r45" +PR = "r46" LICENSE = "GPL" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/freetype/freetype_2.1.10.bb b/packages/freetype/freetype_2.1.10.bb index 772b316cc8..35c0d0cbd6 100644 --- a/packages/freetype/freetype_2.1.10.bb +++ b/packages/freetype/freetype_2.1.10.bb @@ -2,10 +2,11 @@ DESCRIPTION = "Freetype font rendering library" HOMEPAGE = "http://www.freetype.org" SECTION = "libs" LICENSE = "freetype" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ - file://configure.patch;patch=1" + file://configure.patch;patch=1 \ + file://no-hardcode.patch;patch=1" S = "${WORKDIR}/freetype-${PV}" inherit autotools pkgconfig binconfig diff --git a/packages/gnuz/gnuz_0.3.bb b/packages/gnuz/gnuz_0.3.bb index 9a164978ff..cf58ea6d7b 100644 --- a/packages/gnuz/gnuz_0.3.bb +++ b/packages/gnuz/gnuz_0.3.bb @@ -5,14 +5,14 @@ MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" LICENSE = "GPL" AUTHOR = "Lukas Fraser" HOMEPAGE = "http://gnuz.4cows.net/eraser/gnuz/" -PR = "r2" +PR = "r1" APPTYPE = "binary" APPNAME = "gnuz" APPDESKTOP = "${S}/data/" SRC_URI = "http://gnuz.4cows.net/eraser/gnuz/gnuz_0.3.tar.gz \ - http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/gnuz-levels-0.3-1.tar.bz2" + http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/gnuz-levels-0.3.tar.bz2" S = "${WORKDIR}/gnuz" diff --git a/packages/gpe-aerial/gpe-aerial_0.2.13.bb b/packages/gpe-aerial/gpe-aerial_0.2.13.bb index 987c6535f6..789c3d05f3 100644 --- a/packages/gpe-aerial/gpe-aerial_0.2.13.bb +++ b/packages/gpe-aerial/gpe-aerial_0.2.13.bb @@ -1,6 +1,6 @@ inherit gpe pkgconfig -PR = "r0" +PR = "r1" DESCRIPTION = "GPE wireless LAN communication applet" @@ -10,3 +10,4 @@ SECTION = "gpe" PRIORITY = "optional" LICENSE = "GPL" +SRC_URI += "file://iconlist.patch;patch=1;pnum=0" diff --git a/packages/gpe-filemanager/gpe-filemanager_0.25.bb b/packages/gpe-filemanager/gpe-filemanager_0.25.bb index 898ff6002b..2beee83596 100644 --- a/packages/gpe-filemanager/gpe-filemanager_0.25.bb +++ b/packages/gpe-filemanager/gpe-filemanager_0.25.bb @@ -1,12 +1,12 @@ inherit gpe -PR = "r1" +PR = "r0" LICENSE = "GPL" DESCRIPTION = "GPE file manager" DEPENDS = "libgpewidget gnome-vfs dbus" SECTION = "gpe" RDEPENDS = "gpe-icons" -RRECOMMENDS = "gnome-vfs-plugin-file gnome-vfs-plugin-smb gnome-vfs-plugin-ftp gnome-vfs-plugin-computer gnome-vfs-plugin-network gnome-vfs-plugin-sftp gnome-vfs-plugin-http" +RRECOMMENDS = "gnome-vfs-plugin-file" FILES_${PN} += " ${datadir}/gpe" diff --git a/packages/gpe-today/gpe-today_0.11.bb b/packages/gpe-today/gpe-today_0.11.bb index 2b02195388..204a21afbb 100644 --- a/packages/gpe-today/gpe-today_0.11.bb +++ b/packages/gpe-today/gpe-today_0.11.bb @@ -1,12 +1,9 @@ +LICENSE = "GPL" +inherit gpe + DESCRIPTION = "Displays a summary of appointments and tasks for the day ahead" DEPENDS = "gtk+ libxrandr libxsettings libxsettings-client libgpewidget libdisplaymigration libeventdb libgpepimc libtododb" SECTION = "gpe" PRIORITY = "optional" -MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" - -LICENSE = "GPL" -inherit gpe pkgconfig - - -SRC_URI = "http://www.kernelconcepts.de/~fuchs/files/${P}.tar.gz" +SRC_URI += "file://no-transparency.patch;patch=1" diff --git a/packages/ipkg/ipkg-native_0.99.154.bb b/packages/ipkg/ipkg-native_0.99.154.bb index d59eab3a61..35d654b07e 100644 --- a/packages/ipkg/ipkg-native_0.99.154.bb +++ b/packages/ipkg/ipkg-native_0.99.154.bb @@ -1,2 +1,6 @@ include ipkg_${PV}.bb include ipkg-native.inc + +PR = "r1" + +SRC_URI += "file://sw.patch;patch=1" diff --git a/packages/ipkg/ipkg_0.99.159.bb b/packages/ipkg/ipkg_0.99.159.bb index 47feccd27c..20e547d4b2 100644 --- a/packages/ipkg/ipkg_0.99.159.bb +++ b/packages/ipkg/ipkg_0.99.159.bb @@ -1,3 +1,6 @@ include ipkg.inc +PR = "r1" + #SRC_URI += "file://interceptor.patch;patch=1;pnum=1" +SRC_URI += "file://sw.patch;patch=1" diff --git a/packages/konqueror/konqueror-embedded_20030705.bb b/packages/konqueror/konqueror-embedded_20030705.bb index e3fc55a88f..3b2d5ea97c 100644 --- a/packages/konqueror/konqueror-embedded_20030705.bb +++ b/packages/konqueror/konqueror-embedded_20030705.bb @@ -1,7 +1,7 @@ DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition" SECTION = "opie/applications" PRIORITY = "optional" -DEPENDS = "libqpe-opie openssl pcre" +DEPENDS = "libqpe-opie pcre" LICENSE = "LGPL/GPL" PR = "r3" @@ -30,7 +30,7 @@ EXTRA_OECONF = '--prefix=${palmtopdir} --exec-prefix=${palmtopdir} --enable-static --disable-shared --disable-debug \ --with-javascript=static --enable-qpe --enable-qt-embedded \ --with-extra-includes=${STAGING_INCDIR} --with-extra-libs=${STAGING_LIBDIR} \ - --with-ssl-version=0.9.7c --with-ssl-dir=${STAGING_LIBDIR}/.. \ + --without-ssl \ --with-qt-dir=${QTDIR} --with-qtopia-dir=${OPIEDIR} \ --enable-libsuffix="" ' diff --git a/packages/libopie/libopie2_1.2.1.bb b/packages/libopie/libopie2_1.2.1.bb index dbda15360c..2938537b8b 100644 --- a/packages/libopie/libopie2_1.2.1.bb +++ b/packages/libopie/libopie2_1.2.1.bb @@ -1,7 +1,8 @@ include ${PN}.inc -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \ file://openzaurus-branding.patch;patch=1 \ + file://prelim-h191x-hx4700-supp.patch;patch=1;pnum=2 \ file://include.pro" diff --git a/packages/linux/handhelds-pxa-2.6_2.6.15-hh1.bb b/packages/linux/handhelds-pxa-2.6_2.6.15-hh1.bb index 983d59fd28..77c99bed89 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.15-hh1.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.15-hh1.bb @@ -2,6 +2,7 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel for PXA based devices." MAINTAINER = "Greg Gilbert <greg@treke.net>" LICENSE = "GPL" +PR = "r1" COMPATIBLE_HOST = "arm.*-linux" diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb index f87cffbc46..a2f19aa74a 100644 --- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb @@ -2,7 +2,7 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices." MAINTAINER = "Phil Blundell <pb@handhelds.org>" LICENSE = "GPL" -PR = "r0" +PR = "r1" KERNEL_CCSUFFIX = "-3.3.4" @@ -19,6 +19,8 @@ SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV' S = "${WORKDIR}/kernel" +KERNEL_PRESERVE_HH_MINOR_VER = "1" + inherit kernel update-rc.d K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}" diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb index 66d155f690..7d37c4f4fc 100644 --- a/packages/meta/gpe-image.bb +++ b/packages/meta/gpe-image.bb @@ -1,9 +1,17 @@ FEED_URIS_append_openzaurus = " x11##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 " FEED_URIS_append_opensimpad = " x11##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \ gpe##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe" -FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11" -PR = "r23" +DISTRO_FEEDS_append_familiar () { + +# x11 - additional packages specific to the x11 graphical environment +src/gz x11 ${DISTRO_FEED_PREFIX}/x11 +src/gz x11-${MACHINE} ${DISTRO_FEED_PREFIX}/x11/machine/${MACHINE} +} + +DISTRO_LOCALE_FEEDS_PREFIXES_append_familiar = " ${DISTRO_FEED_PREFIX}/x11" + +PR = "r21" export IMAGE_BASENAME = "gpe-image" @@ -23,6 +31,7 @@ GPE_EXTRA_INSTALL_smallscreen = "gpe-task-games ${GPE_EXTRA_THEMES}" #ship more stuff with devices with >16MB of flash GPE_BIGFLASH_DEPENDS := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\ gpe-theme-clearlooks \ + sylpheed \ figment \ ",d)}' @@ -54,7 +63,6 @@ export IPKG_INSTALL = "task-bootstrap gpe-task-base \ ${XSERVER} \ ${GPE_EXTRA_INSTALL}" -IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp " ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " inherit image_ipk diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb index ecbcbcec20..2c01c268bf 100644 --- a/packages/meta/meta-gpe.bb +++ b/packages/meta/meta-gpe.bb @@ -1,7 +1,7 @@ PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games gpe-task-connectivity DESCRIPTION = "Meta-package for GPE Palmtop Environment" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -PR = "r44" +PR = "r45" ALLOW_EMPTY = "1" @@ -91,8 +91,10 @@ gpe-task-apps = "\ gpe-what \ matchbox-panel-hacks \ gpe-aerial \ - gpe-soundbite \ - rosetta" + gpe-soundbite" + +# causes a >15 secs delay on initial boot +# rosetta" RDEPENDS_gpe-task-apps := "${gpe-task-apps}" DEPENDS += " ${gpe-task-apps}" diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb index f82a69f367..6cc4ccbf98 100644 --- a/packages/meta/meta-opie.bb +++ b/packages/meta/meta-opie.bb @@ -118,7 +118,7 @@ task-opie-apps = "opie-advancedfm opie-bartender opie-calculator \ opie-console opie-dagger opie-embeddedkonsole \ opie-euroconv opie-eye opie-ftp opie-gutenbrowser \ opie-helpbrowser opie-irc opie-keypebble opie-odict \ - opie-oxygen opie-rdesktop opie-reader opie-remote \ + opie-oxygen opie-reader opie-remote \ opie-sheet opie-tableviewer opie-tinykate \ opie-wellenreiter opie-write opie-zsafe" @@ -181,7 +181,7 @@ task-opie-irda = "irda-utils libopieobex0 obexftp obexpush" # task-opie-extra-apps = "opie-calculator opie-checkbook opie-mail opie-eye \ - opie-rdesktop opie-wellenreiter opie-irc \ + opie-wellenreiter opie-irc \ opie-mediaplayer2 \ konqueror-embedded qpdf2" diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb index e012b2c34f..5c30876dec 100644 --- a/packages/meta/opie-image.bb +++ b/packages/meta/opie-image.bb @@ -3,7 +3,15 @@ export IMAGE_LINGUAS = "" FEED_URIS_append_openzaurus = " opie##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie" FEED_URIS_append_opensimpad = " opie##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie" -FEED_URIS_append_familiar = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie" + +DISTRO_FEEDS_append_familiar () { + +# opie - additional packages specific to the opie graphical environment +src/gz opie ${DISTRO_FEED_PREFIX}/opie +src/gz opie-${MACHINE} ${DISTRO_FEED_PREFIX}/opie/machine/${MACHINE} +} + +DISTRO_LOCALE_FEEDS_PREFIXES_append_familiar = " ${DISTRO_FEED_PREFIX}/opie" LICENSE = "MIT" PR = "r19" @@ -66,6 +74,6 @@ merge_feeds() { } # merge feed-sources into ipkg.conf and create /etc/timestamp from build date -IMAGE_PREPROCESS_COMMAND = "merge_feeds; create_etc_timestamp" +IMAGE_PREPROCESS_COMMAND = "merge_feeds; " inherit image_ipk diff --git a/packages/meta/task-bootstrap.bb b/packages/meta/task-bootstrap.bb index 31920135d4..1583e9976c 100644 --- a/packages/meta/task-bootstrap.bb +++ b/packages/meta/task-bootstrap.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Core packages required for a basic installation" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -PR = "r25" +PR = "r26" # The BOOTSTRAP_EXTRA_ variables are often manipulated by the # MACHINE .conf files, so adjust PACKAGE_ARCH accordingly. diff --git a/packages/ppp-dialin/ppp-dialin_0.1.bb b/packages/ppp-dialin/ppp-dialin_0.1.bb index 815ed14d3b..0d0426790f 100644 --- a/packages/ppp-dialin/ppp-dialin_0.1.bb +++ b/packages/ppp-dialin/ppp-dialin_0.1.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Enables PPP dial-in through a serial connection" MAINTAINER = "Rene Wagner <rw@handhelds.org>" DEPENDS = "ppp" RDEPENDS = "ppp" -PR = "r4" +PR = "r5" LICENSE = "MIT" SRC_URI = "file://host-peer \ @@ -22,7 +22,11 @@ pkg_postinst() { if test "x$D" != "x"; then exit 1 else - adduser --system --home /dev/null --no-create-home --empty-password --ingroup nogroup -s ${sbindir}/ppp-dialin ppp + if grep -q '^ppp:' /etc/passwd; then + echo "ppp: login exists" + else + adduser --system --home /dev/null --no-create-home --empty-password --ingroup nogroup -s ${sbindir}/ppp-dialin ppp + fi fi } diff --git a/packages/qemu/qemu-native_0.7.0.bb b/packages/qemu/qemu-native_0.7.0.bb index caa6f6abc0..9e58b5f176 100644 --- a/packages/qemu/qemu-native_0.7.0.bb +++ b/packages/qemu/qemu-native_0.7.0.bb @@ -3,3 +3,13 @@ inherit native S = "${WORKDIR}/qemu-${PV}" prefix = "${STAGING_DIR}/${BUILD_SYS}" +python __anonymous() { + from bb import which, data + + path = data.getVar('PATH', d) + if len(which(path, 'gcc-3.4')) != 0: + data.setVar('EXTRA_OECONF', " --cc=gcc-3.4", d) + elif len(which(path, 'gcc-3.3')) != 0: + data.setVar('EXTRA_OECONF', " --cc=gcc-3.3", d) + +} diff --git a/packages/qpe-games/hexatrolic_1.0beta3.bb b/packages/qpe-games/hexatrolic_1.0beta3.bb index c1528165ce..8d83421dd6 100644 --- a/packages/qpe-games/hexatrolic_1.0beta3.bb +++ b/packages/qpe-games/hexatrolic_1.0beta3.bb @@ -1,11 +1,11 @@ DESCRIPTION = "Hexatrolic a Ball Game" SECTION = "opie/games" PRIORITY = "optional" -MAINTAINER = "none" LICENSE = "GPL" AUTHOR = "Helge Plehn" HOMEPAGE = "http://hexatrolic.i-networx.de/" APPNAME = "hexatrolic" +PR = "r1" SRC_URI = "http://handhelds.org/~zecke/oe_packages/hexatrolic-103beta3-zecke1.tar.bz2" diff --git a/packages/qpe-games/labyrinth_0.7.bb b/packages/qpe-games/labyrinth_0.7.bb index e7468b507b..40b2f73b80 100644 --- a/packages/qpe-games/labyrinth_0.7.bb +++ b/packages/qpe-games/labyrinth_0.7.bb @@ -1,11 +1,11 @@ DESCRIPTION = "A traditional (german?) boardgame" SECTION = "opie/games" PRIORITY = "optional" -MAINTAINER = "none" LICENSE = "GPL" AUTHOR = "Helge Plehn" HOMEPAGE = "http://hexatrolic.i-networx.de/" APPNAME = "labyrinth" +PR = "r1" SRC_URI = "http://handhelds.org/~zecke/oe_packages/labyrinth-0.7-zecke1.tar.gz" diff --git a/packages/totem/totem_1.0.4.bb b/packages/totem/totem_1.0.4.bb index 617b4aa9d0..0d86faf9c9 100644 --- a/packages/totem/totem_1.0.4.bb +++ b/packages/totem/totem_1.0.4.bb @@ -6,6 +6,7 @@ SECTION = "x11/multimedia" DESCRIPTION="A GTK2 based media player" HOMEPAGE="http://www.gnome.org/projects/totem/" LICENSE="GPL" +PR = "r1" SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/totem/1.0/totem-${PV}.tar.gz \ file://include.patch;patch=1 \ @@ -19,7 +20,7 @@ DEPENDS="gtk+ libglade gnome-vfs gconf libxine-x11 libxml2" inherit autotools -EXTRA_OECONF="--disable-schemas-install --disable-nvtv --enable-gtk --disable-debug --disable-gstreamer --disable-mozilla" +EXTRA_OECONF="--disable-schemas-install --disable-nvtv --enable-gtk --disable-debug --disable-gstreamer --disable-mozilla --disable-lirc" #SELECTED_OPTIMIZATION="-O0 -g" LDFLAGS_append = " -Wl,--export-dynamic" diff --git a/packages/tslib/tslib/h2200/tslib.sh b/packages/tslib/tslib/h2200/tslib.sh index 7fa6492ce0..90d911818b 100644 --- a/packages/tslib/tslib/h2200/tslib.sh +++ b/packages/tslib/tslib/h2200/tslib.sh @@ -15,5 +15,7 @@ case `uname -r` in ;; esac -export TSLIB_TSDEVICE TSLIB_CONFFILE +QWS_MOUSE_PROTO=TPanel:${TSLIB_TSDEVICE} + +export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO diff --git a/packages/tslib/tslib/h3600/tslib.sh b/packages/tslib/tslib/h3600/tslib.sh index b07fce0aea..a1f5205c47 100644 --- a/packages/tslib/tslib/h3600/tslib.sh +++ b/packages/tslib/tslib/h3600/tslib.sh @@ -11,5 +11,7 @@ case `uname -r` in ;; esac -export TSLIB_TSDEVICE TSLIB_CONFFILE +QWS_MOUSE_PROTO=TPanel:${TSLIB_TSDEVICE} + +export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO diff --git a/packages/tslib/tslib/h3900/tslib.sh b/packages/tslib/tslib/h3900/tslib.sh index 7fa6492ce0..90d911818b 100644 --- a/packages/tslib/tslib/h3900/tslib.sh +++ b/packages/tslib/tslib/h3900/tslib.sh @@ -15,5 +15,7 @@ case `uname -r` in ;; esac -export TSLIB_TSDEVICE TSLIB_CONFFILE +QWS_MOUSE_PROTO=TPanel:${TSLIB_TSDEVICE} + +export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO diff --git a/packages/tslib/tslib/h6300/tslib.sh b/packages/tslib/tslib/h6300/tslib.sh index 95e6a2d02b..8b45c66a1f 100644 --- a/packages/tslib/tslib/h6300/tslib.sh +++ b/packages/tslib/tslib/h6300/tslib.sh @@ -2,6 +2,7 @@ TSLIB_TSDEVICE=`detect-tsdevice` TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h6300 +QWS_MOUSE_PROTO=TPanel:${TSLIB_TSDEVICE} -export TSLIB_TSDEVICE TSLIB_CONFFILE +export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO diff --git a/packages/tslib/tslib/ipaq-pxa270/tslib.sh b/packages/tslib/tslib/ipaq-pxa270/tslib.sh index a3eb096a30..3fba531561 100644 --- a/packages/tslib/tslib/ipaq-pxa270/tslib.sh +++ b/packages/tslib/tslib/ipaq-pxa270/tslib.sh @@ -2,5 +2,6 @@ TSLIB_TSDEVICE=`detect-tsdevice` TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600 +QWS_MOUSE_PROTO=TPanel:${TSLIB_TSDEVICE} -export TSLIB_TSDEVICE TSLIB_CONFFILE +export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb index 53b4a0217c..72fb979e5e 100644 --- a/packages/tslib/tslib_cvs.bb +++ b/packages/tslib/tslib_cvs.bb @@ -1,7 +1,7 @@ SECTION = "base" DESCRIPTION = "tslib is a touchscreen access library." PV = "0.0cvs${CVSDATE}" -PR = "r33" +PR = "r34" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" PACKAGE_ARCH_tslib-conf = "${MACHINE}" @@ -41,10 +41,7 @@ EXTRA_OECONF_mnci = "--enable-shared --disable-h3600 --enable-input --disable- EXTRA_OECONF_beagle = "--enable-shared --enable-h3600 --disable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 " do_stage () { - oe_libinstall -so -C src libts-0.0 ${STAGING_LIBDIR} - ln -sf libts-0.0.so ${STAGING_LIBDIR}/libts.so - install -m 0644 src/tslib.h ${STAGING_INCDIR}/ - install -m 0644 src/tslib-private.h ${STAGING_INCDIR}/ + autotools_stage_all } do_install_prepend () { diff --git a/packages/udev/udev_084.bb b/packages/udev/udev_084.bb index 6bafa615d7..1078cc416c 100644 --- a/packages/udev/udev_084.bb +++ b/packages/udev/udev_084.bb @@ -13,7 +13,7 @@ include udev.inc INITSCRIPT_PARAMS = "start 03 S . start 55 0 6 ." -PR = "r3" +PR = "r4" FILES_${PN} += "${base_libdir}" UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" @@ -31,6 +31,7 @@ do_install () { install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules + install -m 0644 ${WORKDIR}/links.conf ${D}${sysconfdir}/udev/links.conf if [ "${UDEV_DEVFS_RULES}" = "1" ]; then install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules fi diff --git a/packages/xserver-common/xserver-common_1.8.bb b/packages/xserver-common/xserver-common_1.8.bb index 3a298621f4..1925392b80 100644 --- a/packages/xserver-common/xserver-common_1.8.bb +++ b/packages/xserver-common/xserver-common_1.8.bb @@ -2,6 +2,8 @@ MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" DESCRIPTION = "Common X11 scripts and support files" LICENSE = "GPL" SECTION = "x11" +PR = "r1" + DEPENDS = "xmodmap xrandr xdpyinfo xtscal" RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" @@ -9,4 +11,5 @@ RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" # we are using a gpe-style Makefile inherit gpe -SRC_URI += "file://100dpi.patch;patch=1" +SRC_URI += "file://100dpi.patch;patch=1 \ + file://hx4700.patch;patch=1" |