aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorRene Wagner <rw@handhelds.org>2006-04-22 12:01:41 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-04-22 12:01:41 +0000
commit57c156d9f730ca6ac436c156e1756beab5b5c692 (patch)
treefeb88f7c37a0e47ec66dc7c3ad69a365c2e61221 /packages
parent297fac9b424a54ec0340d8062661e2887636fb35 (diff)
downloadopenembedded-57c156d9f730ca6ac436c156e1756beab5b5c692.tar.gz
openembedded-57c156d9f730ca6ac436c156e1756beab5b5c692.tar.bz2
openembedded-57c156d9f730ca6ac436c156e1756beab5b5c692.zip
disapproval of revision '60713f19e6d894061ca4d58a2a86420c17a0bd72'
Diffstat (limited to 'packages')
-rw-r--r--packages/konqueror/konqueror-embedded_20030705.bb4
-rw-r--r--packages/libsdl/libsdl-mixer_1.2.6.bb4
-rw-r--r--packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb2
-rw-r--r--packages/meta/gpe-image.bb11
-rw-r--r--packages/meta/meta-opie.bb4
-rw-r--r--packages/meta/opie-image.bb12
-rw-r--r--packages/opie-rdesktop/opie-rdesktop.inc4
-rw-r--r--packages/python/python_2.4.2.bb2
8 files changed, 13 insertions, 30 deletions
diff --git a/packages/konqueror/konqueror-embedded_20030705.bb b/packages/konqueror/konqueror-embedded_20030705.bb
index 3b2d5ea97c..e3fc55a88f 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 pcre"
+DEPENDS = "libqpe-opie openssl 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} \
- --without-ssl \
+ --with-ssl-version=0.9.7c --with-ssl-dir=${STAGING_LIBDIR}/.. \
--with-qt-dir=${QTDIR} --with-qtopia-dir=${OPIEDIR} \
--enable-libsuffix="" '
diff --git a/packages/libsdl/libsdl-mixer_1.2.6.bb b/packages/libsdl/libsdl-mixer_1.2.6.bb
index 7e76334e99..3aafa18d0c 100644
--- a/packages/libsdl/libsdl-mixer_1.2.6.bb
+++ b/packages/libsdl/libsdl-mixer_1.2.6.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
DEPENDS = "virtual/libsdl"
LICENSE = "LGPL"
-PR = "r2"
+PR = "r1"
SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz"
S = "${WORKDIR}/SDL_mixer-${PV}"
@@ -13,7 +13,7 @@ export SDL_CONFIG = "${STAGING_BINDIR}/sdl-config"
inherit autotools
-EXTRA_OECONF = "--disable-music-mp3 --disable-music-libmikmod --disable-music-ogg"
+EXTRA_OECONF = "--disable-music-mp3 --disable-music-libmikmod"
# although we build smpeg... need to find out how
# to deal with optional dependencies
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb
index 58daef865d..2e301a172d 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb
@@ -6,7 +6,7 @@ PR = "r0"
DEFAULT_PREFERENCE="-1"
-KERNEL_CCSUFFIX = "-3.3.4"
+KERNEL_CCSUFFIX = "-3.3.3"
COMPATIBLE_HOST = "arm.*-linux"
SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb
index 7d37c4f4fc..3767611af3 100644
--- a/packages/meta/gpe-image.bb
+++ b/packages/meta/gpe-image.bb
@@ -1,15 +1,7 @@
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"
-
-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"
+FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11"
PR = "r21"
@@ -63,6 +55,7 @@ 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-opie.bb b/packages/meta/meta-opie.bb
index 6cc4ccbf98..f82a69f367 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-reader opie-remote \
+ opie-oxygen opie-rdesktop 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-wellenreiter opie-irc \
+ opie-rdesktop opie-wellenreiter opie-irc \
opie-mediaplayer2 \
konqueror-embedded qpdf2"
diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb
index 5c30876dec..e012b2c34f 100644
--- a/packages/meta/opie-image.bb
+++ b/packages/meta/opie-image.bb
@@ -3,15 +3,7 @@ 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"
-
-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"
+FEED_URIS_append_familiar = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie"
LICENSE = "MIT"
PR = "r19"
@@ -74,6 +66,6 @@ merge_feeds() {
}
# merge feed-sources into ipkg.conf and create /etc/timestamp from build date
-IMAGE_PREPROCESS_COMMAND = "merge_feeds; "
+IMAGE_PREPROCESS_COMMAND = "merge_feeds; create_etc_timestamp"
inherit image_ipk
diff --git a/packages/opie-rdesktop/opie-rdesktop.inc b/packages/opie-rdesktop/opie-rdesktop.inc
index 2b69707f38..1924f9c7d6 100644
--- a/packages/opie-rdesktop/opie-rdesktop.inc
+++ b/packages/opie-rdesktop/opie-rdesktop.inc
@@ -1,11 +1,9 @@
-# doesn't build without openssl enabled
-BROKEN = "1"
-
DESCRIPTION = "Remote Desktop Protocol (RDP) Client"
SECTION = "opie/applications"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
+DEPENDS = "openssl"
I18N_FILES = "ordesktop.ts"
APPNAME = "ordesktop"
APPTYPE = "binary"
diff --git a/packages/python/python_2.4.2.bb b/packages/python/python_2.4.2.bb
index 4ff07b3250..f065b68112 100644
--- a/packages/python/python_2.4.2.bb
+++ b/packages/python/python_2.4.2.bb
@@ -4,7 +4,7 @@ LICENSE = "PSF"
SECTION = "devel/python"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = "python-native readline zlib gdbm tcl tk"
+DEPENDS = "python-native readline zlib gdbm openssl tcl tk"
PR = "ml4"
PYTHON_MAJMIN = "2.4"