summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2004-11-29 22:19:48 +0000
committerMichael Lauer <mickey@vanille-media.de>2004-11-29 22:19:48 +0000
commit6d476eeca38a34152667a626cd52652133c1d394 (patch)
treefa3f8b0afa528eba8385cffa6cac6b7d37f4813a
parentb3d93ad4b0d9ee14222812127ea4ef39a7f45176 (diff)
Merge bk://oe-devel@oe-devel.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/11/29 20:57:29+00:00 nexus.co.uk!pb bump PR on some more glibc.oes 2004/11/29 20:55:34+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/packages into stealth.nexus.co.uk:/home/pb/oe/oe-packages 2004/11/29 15:57:10-05:00 handhelds.org!kergoth Merge oe-devel@oe-devel.bkbits.net:packages into handhelds.org:/home/kergoth/code/packages 2004/11/29 20:54:56+00:00 nexus.co.uk!pb remove /etc/rpc from libc6 2004/11/29 20:32:45+00:00 nexus.co.uk!pb tweak displayed groups in gpe-appmgr 2004/11/29 20:24:50+00:00 nexus.co.uk!pb patch minimo.desktop to set Categories=Internet (not PIM) 2004/11/29 20:11:05+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/packages into stealth.nexus.co.uk:/home/pb/oe/oe-packages 2004/11/29 20:10:46+00:00 nexus.co.uk!pb patch Categories in gpe-conf.desktop 2004/11/29 11:59:09-08:00 treke.net!ggilbert Merge ssh://oe-devel@oe-devel.bkbits.net/packages into olddog.home.treke.net:/home/ggilbert/oe/packages 2004/11/29 20:07:25+00:00 nexus.co.uk!pb freshen xserver-kdrive-poodle.patch 2004/11/29 11:58:56-08:00 treke.net!ggilbert opie-mediaplayer2_1.1.7.oe: opie-mediaplayer2_1.1.7.oe: Adding a DEPEND ont he default skin opie-mediaplayer2_cvs.oe: opie-mediaplayer2_cvs.oe: Need to DEPEND on the default skin 2004/11/29 12:58:50-06:00 ti.com!kergoth Bugfix: rather than making the wlan-ng and wireless-tools pre-up scripts exit if IFACE is not wlan*, instead exit on METHOD = loopback. 2004/11/29 12:44:53-06:00 ti.com!kergoth Merge siasl.dyndns.org:code/packages into odin.sc.ti.com:/home/kergoth/code/packages 2004/11/29 12:44:25-06:00 ti.com!kergoth Apply patch to fix a bug in the wireless-tools and wlan-ng pre-up scripts, courtesy Murray Jensen. 2004/11/29 12:49:34-05:00 handhelds.org!kergoth Merge oe-devel@oe-devel.bkbits.net:packages into handhelds.org:/home/kergoth/code/packages 2004/11/29 17:02:53+00:00 nexus.co.uk!pb add some more packages to meta-gpe, courtesy Florian Boor 2004/11/29 16:54:16+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/packages into stealth.nexus.co.uk:/home/pb/oe/oe-packages 2004/11/29 16:54:01+00:00 nexus.co.uk!pb set CVSDATE_minimo for familiar 0.8.0 2004/11/29 16:52:40+00:00 nexus.co.uk!pb add samba definitions to i386 and i686 site files, courtesy Florian Boor 2004/11/29 15:08:50+01:00 local!hrw fix CVSDATE in 20030402 Tremor snapshot 2004/11/29 13:31:25+00:00 nexus.co.uk!pb add teleport, courtesy Koen Kooi 2004/11/29 13:30:39+00:00 nexus.co.uk!pb new handhelds.org kernels are hh37.4, not hh37.3 2004/11/29 13:30:22+00:00 nexus.co.uk!pb use /proc/cpu/alignment, not /proc/sys/debug/alignment 2004/11/29 13:30:01+00:00 nexus.co.uk!pb delete some redundant SRC_URIs. 2004/11/29 12:35:59+00:00 nexus.co.uk!pb remove redundant url from gpe-nmf SRC_URI 2004/11/29 12:35:16+00:00 nexus.co.uk!pb update handhelds-pxa and handhelds-sa kernels to hh37.3 2004/11/29 12:34:43+00:00 nexus.co.uk!pb add gpe-task-games to meta-gpe PACKAGES 2004/11/29 00:26:00+00:00 nexus.co.uk!pb add /etc/init.d/alignment.sh for arm 2004/11/28 22:43:15+00:00 nexus.co.uk!pb simpad: disable USE_VT, re-enable bigscreen GPE_MACHINE_CLASS 2004/11/28 22:41:59+00:00 nexus.co.uk!pb disable USE_VT for h3600 and h3900 2004/11/28 22:09:42+00:00 nexus.co.uk!pb patch pcmcia-cs to load h3600_generic_sleeve after other modules 2004/11/28 21:52:23+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/packages into stealth.nexus.co.uk:/home/pb/oe/oe-packages 2004/11/28 21:52:04+00:00 nexus.co.uk!pb don't autoload h3600_generic_sleeve. We will load it by hand. 2004/11/28 22:50:21+01:00 hrw.one.pl!hrw zddice: fixed file permissions 2004/11/28 22:39:25+01:00 hrw.one.pl!hrw opie-security: install only needed icons - rest will be in opie-securityplugin-* 2004/11/28 22:30:24+01:00 hrw.one.pl!hrw fixed files permissions in opie-pics 2004/11/28 21:38:39+01:00 hrw.one.pl!hrw added tickypip levels to meta-opie 2004/11/28 21:35:46+01:00 hrw.one.pl!hrw created new package with tickypip levels as they have different license 2004/11/28 20:05:59+00:00 nexus.co.uk!pb add new glibc snapshot, preferred for i686 only 2004/11/28 18:51:29+00:00 nexus.co.uk!pb set GPE_EXTRA_INSTALL in terms of GPE_EXTRA_INSTALL_foo. GPE_EXTRA_DEPENDS_foo is not good enough. 2004/11/28 18:11:30+00:00 nexus.co.uk!pb add figment to gpe-task-pim 2004/11/28 17:54:24+00:00 nexus.co.uk!pb add gtk-industrial-engine to meta-gpe DEPENDS 2004/11/28 17:53:13+00:00 nexus.co.uk!pb update some gpe versions in familiar-0.8.0.conf 2004/11/28 17:51:17+00:00 nexus.co.uk!pb avoid use of orinoco-modules 0.15 on arm until strange BAP write problems are fixed 2004/11/28 17:46:38+00:00 nexus.co.uk!pb add Ximian's gtk-industrial-theme engine 2004/11/28 17:45:18+00:00 nexus.co.uk!pb glib-2.0-native: also install mkinstalldirs into staging 2004/11/28 17:44:48+00:00 nexus.co.uk!pb add glib-gettextize and intltoolize support to autotools.oeclass 2004/11/28 17:31:43+00:00 nexus.co.uk!pb stage more bits for glib-gettextize 2004/11/28 17:14:32+00:00 nexus.co.uk!pb install glib-gettextize into STAGING_BINDIR 2004/11/28 17:12:39+00:00 nexus.co.uk!pb bump PR on hostap and orinoco-modules to force rebuild against latest kernels 2004/11/28 17:11:20+00:00 nexus.co.uk!pb apply WE16 patch to openzaurus-sa also 2004/11/28 15:12:16+00:00 nexus.co.uk!pb set PV appropriately for at76c503a-modules 2004/11/28 12:23:58+00:00 nexus.co.uk!pb patch openzaurus-pxa up to WE16 2004/11/27 21:15:23-05:00 handhelds.org!kergoth Merge oe-devel@oe-devel.bkbits.net:packages into handhelds.org:/home/kergoth/code/packages 2004/11/27 16:28:57-05:00 handhelds.org!kergoth Add gcc-cross and gcc-cross-initial to the versioned distro .conf files, and remove the lowered default preference on gcc 3.4.3. BKrev: 41aba0843fjH5tnDLiEdn5AJJaSaYg
-rw-r--r--at76c503a/at76c503a-modules_cvs.oe1
-rw-r--r--classes/autotools.oeclass17
-rw-r--r--conf/distro/familiar-0.8.0.conf7
-rw-r--r--conf/distro/openzaurus-3.5.1.conf2
-rw-r--r--conf/distro/openzaurus-3.5.2.conf2
-rw-r--r--conf/machine/h3600.conf1
-rw-r--r--conf/machine/h3900.conf1
-rw-r--r--conf/machine/simpad.conf3
-rw-r--r--gcc/gcc_3.4.3.oe1
-rw-r--r--glib-2.0/glib-2.0-native_2.4.6.oe6
-rw-r--r--glibc/glibc-package.oeclass1
-rw-r--r--glibc/glibc_2.2.5.oe2
-rw-r--r--glibc/glibc_2.3.2+cvs20040726.oe2
-rw-r--r--glibc/glibc_2.3.2.oe2
-rw-r--r--glibc/glibc_2.3.3+cvs20041128.oe0
-rw-r--r--glibc/glibc_2.3.3.oe2
-rw-r--r--gpe-appmgr/files/groups.patch0
-rw-r--r--gpe-appmgr/gpe-appmgr_2.4.oe10
-rw-r--r--gpe-conf/files/desktop-categories.patch0
-rw-r--r--gpe-conf/gpe-conf_0.1.22.oe5
-rw-r--r--gpe-nmf/gpe-nmf_0.17.oe8
-rw-r--r--gpe-ownerinfo/gpe-ownerinfo_0.23.oe2
-rw-r--r--gpe-ownerinfo/gpe-ownerinfo_0.24.oe12
-rw-r--r--gtk-engines/gtk-industrial-engine/no-gtk1.patch0
-rw-r--r--gtk-engines/gtk-industrial-engine_0.2.36.2.oe0
-rw-r--r--hostap/hostap-modules_0.2.5.oe2
-rw-r--r--initscripts/initscripts-1.0/arm/alignment.sh0
-rw-r--r--initscripts/initscripts_1.0.oe9
-rw-r--r--linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh37.4/defconfig-ipaqpxa0
-rw-r--r--linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.oe3
-rw-r--r--linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.oe0
-rw-r--r--linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-ipaqsa0
-rw-r--r--linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.oe3
-rw-r--r--linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.oe0
-rw-r--r--linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe3
-rw-r--r--linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe3
-rw-r--r--meta/gpe-image.oe2
-rw-r--r--meta/meta-gpe.oe15
-rw-r--r--meta/meta-opie.oe3
-rw-r--r--mozilla/files/minimo.desktop0
-rw-r--r--mozilla/minimo_cvs.oe4
-rw-r--r--opie-mediaplayer2/opie-mediaplayer2_1.1.7.oe2
-rw-r--r--opie-mediaplayer2/opie-mediaplayer2_cvs.oe2
-rw-r--r--opie-pics/opie-pics_1.1.7.oe11
-rw-r--r--opie-pics/opie-pics_cvs.oe9
-rw-r--r--opie-security/opie-security_1.1.7.oe8
-rw-r--r--opie-security/opie-security_cvs.oe8
-rw-r--r--orinoco/orinoco-modules_0.13e.oe1
-rw-r--r--orinoco/orinoco-modules_0.15rc1.oe3
-rw-r--r--orinoco/orinoco-modules_0.15rc2.oe5
-rw-r--r--pcmcia-cs/files/arm/pcmcia4
-rw-r--r--pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch0
-rw-r--r--pcmcia-cs/pcmcia-cs_3.2.8.oe3
-rw-r--r--site/i386-linux3
-rw-r--r--site/i686-linux3
-rw-r--r--teleport/teleport_0.33.oe0
-rw-r--r--tickypip/tickypip-levels/NetWalk_levels.README0
-rw-r--r--tickypip/tickypip-levels_1.0.oe0
-rw-r--r--tickypip/tickypip_0.1.2.oe33
-rw-r--r--tremor/tremor_20030402.oe28
-rw-r--r--wireless-tools/wireless-tools/wireless-tools.if-pre-up8
-rw-r--r--wlan-ng/files/pre-up9
-rw-r--r--wlan-ng/wlan-ng-modules_0.2.1pre22.oe2
-rw-r--r--xserver/xserver-kdrive/xserver-kdrive-poodle.patch19
-rw-r--r--zddice/zddice_1.0.0.oe3
65 files changed, 230 insertions, 68 deletions
diff --git a/at76c503a/at76c503a-modules_cvs.oe b/at76c503a/at76c503a-modules_cvs.oe
index d13cd34381..1c9dfba06f 100644
--- a/at76c503a/at76c503a-modules_cvs.oe
+++ b/at76c503a/at76c503a-modules_cvs.oe
@@ -4,6 +4,7 @@ SRC_URI = "cvs://anonymous@cvs.berlios.de/cvsroot/at76c503a;module=at76c503a \
file://ipaq.patch;patch=1;pnum=0"
S = "${WORKDIR}/at76c503a"
PR = "r1"
+PV = "0.0cvs${CVSDATE}"
inherit module
diff --git a/classes/autotools.oeclass b/classes/autotools.oeclass
index 98d9b6e43e..86a7f208eb 100644
--- a/classes/autotools.oeclass
+++ b/classes/autotools.oeclass
@@ -94,6 +94,23 @@ autotools_do_configure() {
if ! echo ${EXTRA_AUTORECONF} | grep -q "aclocal"; then
rm -f aclocal.m4
fi
+ if [ -e configure.in ]; then
+ CONFIGURE_AC=configure.in
+ else
+ CONFIGURE_AC=configure.ac
+ fi
+ if grep "^AM_GLIB_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
+ if grep "sed.*POTFILES" configure.ac >/dev/null; then
+ : do nothing -- we still have an old unmodified configure.ac
+ else
+ oenote Executing glib-gettextize --force --copy
+ echo "no" | glib-gettextize --force --copy
+ fi
+ fi
+ if grep "^AC_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then
+ oenote Executing intltoolize --copy --force --automake
+ intltoolize --copy --force --automake
+ fi
oenote Executing autoreconf --verbose --install --force ${EXTRA_AUTORECONF} $acpaths
mkdir -p m4
autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || oefatal "autoreconf execution failed."
diff --git a/conf/distro/familiar-0.8.0.conf b/conf/distro/familiar-0.8.0.conf
index 82254a3fac..ee960217d7 100644
--- a/conf/distro/familiar-0.8.0.conf
+++ b/conf/distro/familiar-0.8.0.conf
@@ -7,6 +7,7 @@ FEED_URIS += " \
opie##http://familiar.handhelds.org/releases/v0.8/opie/"
CVSDATE = 20041120
+CVSDATE_minimo = 20040920
PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
@@ -17,6 +18,8 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
PREFERRED_VERSION_binutils-cross = "2.15.91.0.2"
+PREFERRED_VERSION_gcc-cross = "3.4.2"
+PREFERRED_VERSION_gcc-cross-initial = "3.4.2"
PREFERRED_VERSION_libtool-native = "1.5.6"
PREFERRED_VERSION_libtool-cross= "1.5.6"
PREFERRED_VERSION_qte-for-opie = "2.3.7"
@@ -224,7 +227,7 @@ PREFERRED_VERSION_matchbox-wm = "0.8.4"
PREFERRED_VERSION_matchbox-panel = "0.8.3"
PREFERRED_VERSION_matchbox-applet-inputmanager = "0.5"
PREFERRED_VERSION_gtk+ = "2.4.13"
-PREFERRED_VERSION_libgpewidget = "0.95"
+PREFERRED_VERSION_libgpewidget = "0.96"
PREFERRED_VERSION_libgpepimc = "0.3"
PREFERRED_VERSION_libgpevtype = "0.5"
PREFERRED_VERSION_libschedule = "0.13"
@@ -253,7 +256,7 @@ PREFERRED_VERSION_gpe-su = "0.18"
PREFERRED_VERSION_gpe-conf = "0.1.22"
PREFERRED_VERSION_gpe-clock = "0.14"
PREFERRED_VERSION_gpe-mininet = "0.4"
-PREFERRED_VERSION_gpe-mixer = "0.38"
+PREFERRED_VERSION_gpe-mixer = "0.40"
PREFERRED_VERSION_gpe-shield = "0.6"
PREFERRED_VERSION_gpe-wlancfg = "0.2.6"
PREFERRED_VERSION_gpe-taskmanager = "0.17"
diff --git a/conf/distro/openzaurus-3.5.1.conf b/conf/distro/openzaurus-3.5.1.conf
index f62398d343..48671d9114 100644
--- a/conf/distro/openzaurus-3.5.1.conf
+++ b/conf/distro/openzaurus-3.5.1.conf
@@ -22,6 +22,8 @@ TARGET_FPU = "soft"
#INHIBIT_PACKAGE_STRIP = "1"
PREFERRED_VERSION_binutils-cross = "2.15.91.0.1"
+PREFERRED_VERSION_gcc-cross = "3.4.2"
+PREFERRED_VERSION_gcc-cross-initial = "3.4.2"
PREFERRED_VERSION_libtool-native = "1.5.6"
PREFERRED_VERSION_libtool-cross= "1.5.6"
PREFERRED_VERSION_qte-for-opie = "2.3.7"
diff --git a/conf/distro/openzaurus-3.5.2.conf b/conf/distro/openzaurus-3.5.2.conf
index 87db7ed5ff..27c435ef27 100644
--- a/conf/distro/openzaurus-3.5.2.conf
+++ b/conf/distro/openzaurus-3.5.2.conf
@@ -26,6 +26,8 @@ TARGET_FPU = "soft"
#ENABLE_SYSREQ = "yes"
PREFERRED_VERSION_binutils-cross = "2.15.91.0.2"
+PREFERRED_VERSION_gcc-cross = "3.4.2"
+PREFERRED_VERSION_gcc-cross-initial = "3.4.2"
PREFERRED_VERSION_libtool-native = "1.5.6"
PREFERRED_VERSION_libtool-cross= "1.5.6"
PREFERRED_VERSION_qte-for-opie = "2.3.7"
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index 83769104d6..186759b998 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -31,6 +31,7 @@ usb-char \
usb-eth"
USE_DEVFS = "1"
+USE_VT = "0"
IMAGE_LINGUAS = ""
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index 482e29b5b3..75151b0f83 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -23,6 +23,7 @@ H3900_MODULES_append_kernel26 = " h3900_lcd asic2_ts"
SERIAL_CONSOLE = "115200 tts/0 vt100"
USE_DEVFS_kernel24 = "1"
+USE_VT = "0"
include conf/machine/ipaq-common.conf
include conf/machine/handheld-common.conf
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 1ac0946ca3..96f39b3a8c 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -21,7 +21,8 @@ EXTRA_IMAGEDEPENDS = ""
SERIAL_CONSOLE = "ttySA0 115200 vt100"
USE_DEVFS = "1"
-#GPE_MACHINE_CLASS = "bigscreen"
+GPE_MACHINE_CLASS = "bigscreen"
+USE_VT = "0"
include conf/machine/handheld-common.conf
include conf/machine/tune-strongarm.conf
diff --git a/gcc/gcc_3.4.3.oe b/gcc/gcc_3.4.3.oe
index 04df9fd305..0b23cb5c2d 100644
--- a/gcc/gcc_3.4.3.oe
+++ b/gcc/gcc_3.4.3.oe
@@ -4,7 +4,6 @@ HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
-DEFAULT_PREFERENCE = "-1"
inherit autotools gettext
diff --git a/glib-2.0/glib-2.0-native_2.4.6.oe b/glib-2.0/glib-2.0-native_2.4.6.oe
index 8d4e85773c..85252fc1e6 100644
--- a/glib-2.0/glib-2.0-native_2.4.6.oe
+++ b/glib-2.0/glib-2.0-native_2.4.6.oe
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r4"
DESCRIPTION = "GLib is a general-purpose utility library, \
which provides many useful data types, macros, \
type conversions, string utilities, file utilities, a main \
@@ -26,6 +26,7 @@ do_configure_prepend () {
do_stage () {
install -m 0755 gobject/glib-mkenums ${STAGING_BINDIR}/
install -m 0755 gobject/glib-genmarshal ${STAGING_BINDIR}/
+ install -m 0755 glib-gettextize ${STAGING_BINDIR}/
oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
@@ -36,6 +37,9 @@ do_stage () {
install -d ${STAGING_DATADIR}/aclocal
install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
+ install -d ${STAGING_DATADIR}/glib-2.0/gettext/po
+ install -m 0755 mkinstalldirs ${STAGING_DATADIR}/glib-2.0/gettext/
+ install -m 0644 po/Makefile.in.in ${STAGING_DATADIR}/glib-2.0/gettext/po/
}
do_install () {
diff --git a/glibc/glibc-package.oeclass b/glibc/glibc-package.oeclass
index 6787be74b6..36ca1a4029 100644
--- a/glibc/glibc-package.oeclass
+++ b/glibc/glibc-package.oeclass
@@ -7,6 +7,7 @@ do_install() {
install -m 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/
install -d ${D}${libdir}/locale
make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED"
+ rm -f ${D}/etc/rpc
}
TMP_LOCALE="/tmp/locale/${libdir}/locale"
diff --git a/glibc/glibc_2.2.5.oe b/glibc/glibc_2.2.5.oe
index ba0fbfe24c..91ba169d98 100644
--- a/glibc/glibc_2.2.5.oe
+++ b/glibc/glibc_2.2.5.oe
@@ -1,5 +1,5 @@
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r2"
+PR = "r3"
DESCRIPTION = "GNU C Library"
HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
LICENSE = "LGPL"
diff --git a/glibc/glibc_2.3.2+cvs20040726.oe b/glibc/glibc_2.3.2+cvs20040726.oe
index 4fe381305e..8f6102062e 100644
--- a/glibc/glibc_2.3.2+cvs20040726.oe
+++ b/glibc/glibc_2.3.2+cvs20040726.oe
@@ -6,7 +6,7 @@ PRIORITY = "required"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r12"
+PR = "r13"
GLIBC_ADDONS ?= "linuxthreads"
GLIBC_EXTRA_OECONF ?= ""
diff --git a/glibc/glibc_2.3.2.oe b/glibc/glibc_2.3.2.oe
index 9adfed6794..d768a72784 100644
--- a/glibc/glibc_2.3.2.oe
+++ b/glibc/glibc_2.3.2.oe
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
LICENSE = "LGPL"
SECTION = "libs"
PRIORITY = "required"
-PR = "r5"
+PR = "r6"
GLIBC_ADDONS ?= "linuxthreads"
GLIBC_EXTRA_OECONF ?= ""
diff --git a/glibc/glibc_2.3.3+cvs20041128.oe b/glibc/glibc_2.3.3+cvs20041128.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/glibc/glibc_2.3.3+cvs20041128.oe
diff --git a/glibc/glibc_2.3.3.oe b/glibc/glibc_2.3.3.oe
index f81db8952f..3a986fefbb 100644
--- a/glibc/glibc_2.3.3.oe
+++ b/glibc/glibc_2.3.3.oe
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
DESCRIPTION = "GNU C Library"
HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
LICENSE = "LGPL"
diff --git a/gpe-appmgr/files/groups.patch b/gpe-appmgr/files/groups.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gpe-appmgr/files/groups.patch
diff --git a/gpe-appmgr/gpe-appmgr_2.4.oe b/gpe-appmgr/gpe-appmgr_2.4.oe
index e69de29bb2..d12730041c 100644
--- a/gpe-appmgr/gpe-appmgr_2.4.oe
+++ b/gpe-appmgr/gpe-appmgr_2.4.oe
@@ -0,0 +1,10 @@
+SECTION = "gpe"
+DESCRIPTION = "GPE application launcher"
+DEPENDS = "libgpewidget libgpelaunch"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+LICENSE = "GPL"
+
+inherit gpe
+
+SRC_URI += "file://groups.patch;patch=1"
+
diff --git a/gpe-conf/files/desktop-categories.patch b/gpe-conf/files/desktop-categories.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gpe-conf/files/desktop-categories.patch
diff --git a/gpe-conf/gpe-conf_0.1.22.oe b/gpe-conf/gpe-conf_0.1.22.oe
index c60ad00ba1..830ed0c606 100644
--- a/gpe-conf/gpe-conf_0.1.22.oe
+++ b/gpe-conf/gpe-conf_0.1.22.oe
@@ -1,8 +1,9 @@
-PR = "r1"
+PR = "r2"
inherit gpe
-SRC_URI += "file://gpe-conf-0.1.22-20041124.patch;patch=1;pnum=0"
+SRC_URI += "file://gpe-conf-0.1.22-20041124.patch;patch=1;pnum=0 \
+ file://desktop-categories.patch;patch=1"
DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp gpe-login gpe-icons"
RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons"
diff --git a/gpe-nmf/gpe-nmf_0.17.oe b/gpe-nmf/gpe-nmf_0.17.oe
index e69de29bb2..f9b19a45c5 100644
--- a/gpe-nmf/gpe-nmf_0.17.oe
+++ b/gpe-nmf/gpe-nmf_0.17.oe
@@ -0,0 +1,8 @@
+inherit gpe pkgconfig
+
+DESCRIPTION = "GPE audio player"
+DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins"
+SECTION = "gpe"
+PRIORITY = "optional"
+
+SRC_URI += "file://fix_makefiles.patch;patch=1"
diff --git a/gpe-ownerinfo/gpe-ownerinfo_0.23.oe b/gpe-ownerinfo/gpe-ownerinfo_0.23.oe
index cc7c3909b4..30e9d06ae1 100644
--- a/gpe-ownerinfo/gpe-ownerinfo_0.23.oe
+++ b/gpe-ownerinfo/gpe-ownerinfo_0.23.oe
@@ -6,8 +6,6 @@ PRIORITY = "optional"
MAINTAINER = "Philip Blundell <pb@handhelds.org>"
DEPENDS = "gtk+ libgpewidget"
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/gpe-ownerinfo-${PV}.tar.gz"
-
do_stage () {
oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR}
install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/
diff --git a/gpe-ownerinfo/gpe-ownerinfo_0.24.oe b/gpe-ownerinfo/gpe-ownerinfo_0.24.oe
index e69de29bb2..30e9d06ae1 100644
--- a/gpe-ownerinfo/gpe-ownerinfo_0.24.oe
+++ b/gpe-ownerinfo/gpe-ownerinfo_0.24.oe
@@ -0,0 +1,12 @@
+inherit gpe
+
+DESCRIPTION = "GPE owner information dialog"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "gtk+ libgpewidget"
+
+do_stage () {
+ oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR}
+ install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/
+}
diff --git a/gtk-engines/gtk-industrial-engine/no-gtk1.patch b/gtk-engines/gtk-industrial-engine/no-gtk1.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gtk-engines/gtk-industrial-engine/no-gtk1.patch
diff --git a/gtk-engines/gtk-industrial-engine_0.2.36.2.oe b/gtk-engines/gtk-industrial-engine_0.2.36.2.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gtk-engines/gtk-industrial-engine_0.2.36.2.oe
diff --git a/hostap/hostap-modules_0.2.5.oe b/hostap/hostap-modules_0.2.5.oe
index 280b766127..bc136a3253 100644
--- a/hostap/hostap-modules_0.2.5.oe
+++ b/hostap/hostap-modules_0.2.5.oe
@@ -3,7 +3,7 @@ SECTION = "kernel/modules"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
-PR = "r4"
+PR = "r5"
SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
file://hostap_cs.conf \
diff --git a/initscripts/initscripts-1.0/arm/alignment.sh b/initscripts/initscripts-1.0/arm/alignment.sh
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/initscripts/initscripts-1.0/arm/alignment.sh
diff --git a/initscripts/initscripts_1.0.oe b/initscripts/initscripts_1.0.oe
index a4f966f1cc..de33af11b8 100644
--- a/initscripts/initscripts_1.0.oe
+++ b/initscripts/initscripts_1.0.oe
@@ -5,7 +5,7 @@ PRIORITY = "required"
DEPENDS = "makedevs"
RDEPENDS = "makedevs"
LICENSE = "GPL"
-PR = "r19"
+PR = "r21"
SRC_URI = "file://halt \
file://ramdisk \
@@ -30,6 +30,7 @@ SRC_URI = "file://halt \
file://sysfs.sh \
file://device_table.txt"
+SRC_URI_append_arm = " file://alignment.sh"
do_install () {
#
@@ -63,6 +64,9 @@ do_install () {
install -m 0755 ${WORKDIR}/devpts.sh ${D}/etc/init.d
install -m 0755 ${WORKDIR}/devpts ${D}/etc/default
install -m 0755 ${WORKDIR}/sysfs.sh ${D}/etc/init.d
+ if [ "${TARGET_ARCH}" = "arm" ]; then
+ install -m 0755 ${WORKDIR}/alignment.sh ${D}/etc/init.d
+ fi
#
# Install device dependent scripts
#
@@ -100,6 +104,9 @@ do_install () {
# udev will run at S03 if installed
ln -sf ../init.d/sysfs.sh ${D}/etc/rcS.d/S02sysfs
ln -sf ../init.d/devpts.sh ${D}/etc/rcS.d/S38devpts.sh
+ if [ "${TARGET_ARCH}" = "arm" ]; then
+ ln -sf ../init.d/alignment.sh ${D}/etc/rcS.d/S05alignment
+ fi
install -m 0755 ${WORKDIR}/device_table.txt ${D}/etc/device_table
}
diff --git a/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh37.4/defconfig-ipaqpxa b/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh37.4/defconfig-ipaqpxa
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh37.4/defconfig-ipaqpxa
diff --git a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.oe b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.oe
index 427dd142f0..fc88a13a22 100644
--- a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.oe
+++ b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.oe
@@ -2,7 +2,7 @@ SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
PACKAGE_ARCH = "ipaqpxa"
KERNEL_CCSUFFIX = "-3.3.3"
@@ -36,7 +36,6 @@ module_conf_ppp_async = "alias ppp0 ppp_async"
module_conf_orinoco_cs = "options orinoco_cs ignore_cis_vcc=1"
module_conf_hostap_cs = "options hostap_cs ignore_cis_vcc=1"
-module_autoload_h3600_generic_sleeve = "h3600_generic_sleeve"
module_autoload_h3600_ts = "h3600_ts"
module_autoload_apm = "apm"
module_autoload_af_packet = "af_packet"
diff --git a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.oe b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.oe
diff --git a/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-ipaqsa b/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-ipaqsa
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-ipaqsa
diff --git a/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.oe b/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.oe
index b5bf57692d..e83d8896d3 100644
--- a/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.oe
+++ b/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.oe
@@ -2,7 +2,7 @@ SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
PACKAGE_ARCH = "ipaqsa"
KERNEL_CCSUFFIX = "-3.3.3"
@@ -35,7 +35,6 @@ module_conf_orinoco_cs = "options orinoco_cs ignore_cis_vcc=1"
module_conf_hostap_cs = "options hostap_cs ignore_cis_vcc=1"
module_conf_spectrum_cs = "options spectrum_cs ignore_cis_vcc=1"
-module_autoload_h3600_generic_sleeve = "h3600_generic_sleeve"
module_autoload_h3600_ts = "h3600_ts"
module_autoload_apm = "apm"
module_autoload_h3600-uda1341 = "h3600-uda1341"
diff --git a/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.oe b/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.oe
diff --git a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe
index fb5937bb18..8112b439f8 100644
--- a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe
+++ b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe
@@ -5,7 +5,7 @@ KV = "2.4.18"
RMKV = "7"
PXAV = "3"
SHARPV = "20031107"
-PR = "r23"
+PR = "r24"
DESCRIPTION = "Linux kernel for OpenZaurus PXA processor based devices."
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"
@@ -44,6 +44,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
http://www.openswan.org/download/openswan-2.2.0-kernel-2.4-klips.patch.gz;patch=1 \
file://1764-1.patch;patch=1 \
file://module_licence.patch;patch=1 \
+ http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/iw249_we16-6.diff;patch=1 \
file://defconfig-${MACHINE} \
http://us1.samba.org/samba/ftp/cifs-cvs/cifs-1.20c-2.4.tar.gz "
diff --git a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
index 695ae811a5..983c32a1a8 100644
--- a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
+++ b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
@@ -5,7 +5,7 @@ KV = "2.4.18"
RMKV = "7"
PXAV = "3"
SHARPV = "20030509"
-PR = "r12"
+PR = "r13"
DESCRIPTION = "Linux kernel for OpenZaurus StrongArm processor based devices."
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/openzaurus-sa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"
@@ -26,6 +26,7 @@ SRC_URI = "http://aurach.ewu.edu/ield_software/ch5/ROM3.10_stuff/linux-sl5500-${
http://www.openswan.org/download/openswan-2.2.0-kernel-2.4-klips.patch.gz;patch=1 \
file://1764-1.patch;patch=1 \
file://module_licence.patch;patch=1 \
+ http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/iw249_we16-6.diff;patch=1 \
file://defconfig-${MACHINE} \
"
diff --git a/meta/gpe-image.oe b/meta/gpe-image.oe
index 09dc9963b2..2947396afb 100644
--- a/meta/gpe-image.oe
+++ b/meta/gpe-image.oe
@@ -13,7 +13,7 @@ export IMAGE_BASENAME = "gpe-image"
GPE_MACHINE_CLASS ?= "none"
GPE_EXTRA_DEPENDS += "${GPE_EXTRA_DEPENDS_${GPE_MACHINE_CLASS}}"
-GPE_EXTRA_INSTALL += "${GPE_EXTRA_DEPENDS_${GPE_MACHINE_CLASS}}"
+GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GPE_MACHINE_CLASS}}"
#GPE_EXTRA_DEPENDS_bigscreen = "firefox linphone"
#GPE_EXTRA_INSTALL_bigscreen = "firefox linphone"
diff --git a/meta/meta-gpe.oe b/meta/meta-gpe.oe
index d24ec86af4..60d5ef90fb 100644
--- a/meta/meta-gpe.oe
+++ b/meta/meta-gpe.oe
@@ -1,7 +1,7 @@
-PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps
+PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games
DESCRIPTION = "Meta-package for GPE Palmtop Environment"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r21"
+PR = "r24"
ALLOW_EMPTY = 1
@@ -49,18 +49,21 @@ gpe-task-pim = "\
gpe-calendar \
gpe-sketchbook \
gpe-contacts \
- gpe-today"
+ gpe-today \
+ figment"
RDEPENDS_gpe-task-pim := "${gpe-task-pim}"
DEPENDS += " ${gpe-task-pim}"
gpe-task-settings = "\
matchbox-panel-manager \
gpe-bluetooth \
+ gpe-beam \
gpe-su \
gpe-conf \
gpe-clock \
gpe-mininet \
gpe-mixer \
+ gpe-package \
gpe-shield \
gpe-taskmanager \
keylaunch \
@@ -74,13 +77,15 @@ gpe-task-apps = "\
gpe-edit \
gpe-gallery \
gpe-calculator \
- gpe-package \
+ gpe-clock \
gpe-plucker \
gpe-terminal \
gpe-watch \
gpe-what \
matchbox-panel-hacks \
gpe-aerial \
+ mbmerlin \
+ miniclipboard \
rosetta"
RDEPENDS_gpe-task-apps := "${gpe-task-apps}"
@@ -94,5 +99,5 @@ gpe-task-games = "\
RDEPENDS_gpe-task-games := "${gpe-task-games}"
DEPENDS += "${gpe-task-games}"
-DEPENDS += "matchbox-themes-extra"
+DEPENDS += "matchbox-themes-extra gtk-industrial-engine"
diff --git a/meta/meta-opie.oe b/meta/meta-opie.oe
index 7cca1dc76a..5c4df0e522 100644
--- a/meta/meta-opie.oe
+++ b/meta/meta-opie.oe
@@ -2,7 +2,7 @@ DESCRIPTION = "Meta-package for Opie and QPE"
MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
SECTION = "opie/base"
ALLOW_EMPTY = 1
-PR = "r13"
+PR = "r14"
PACKAGE_ARCH = "all"
LICENSE = "MIT"
@@ -223,6 +223,7 @@ scummvm \
shisensho \
sokoban \
tickypip \
+tickypip-levels \
tron \
vectoroids \
win4 \
diff --git a/mozilla/files/minimo.desktop b/mozilla/files/minimo.desktop
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/mozilla/files/minimo.desktop
diff --git a/mozilla/minimo_cvs.oe b/mozilla/minimo_cvs.oe
index f69f6ee5d6..5b517ed3d0 100644
--- a/mozilla/minimo_cvs.oe
+++ b/mozilla/minimo_cvs.oe
@@ -3,7 +3,7 @@ DEPENDS = "xt gtk+ libidl zip-native"
SRC_URI = "cvs://anonymous@cvs-mirror.mozilla.org/cvsroot;module=mozilla \
file://xptcstubs.patch;patch=1 \
file://no-xmb.patch;patch=1 \
- file://minimo.png \
+ file://minimo.png file://minimo.desktop \
file://mozconfig"
S = "${WORKDIR}/mozilla"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
@@ -52,7 +52,7 @@ do_install () {
cp -rL $MOZ_OBJDIR/dist/Embed/* ${mozdir}/
rm -f ${mozdir}/TestGtkEmbed
mkdir -p ${D}/${datadir}/applications
- install -m 0644 embedding/minimo/ipkg/minimo.desktop ${D}/${datadir}/applications/minimo.desktop
+ install -m 0644 ${WORKDIR}/minimo.desktop ${D}/${datadir}/applications/minimo.desktop
mkdir -p ${D}/${datadir}/pixmaps
install -m 0644 ${WORKDIR}/minimo.png ${D}/${datadir}/pixmaps/minimo.png
mkdir -p ${D}/${bindir}
diff --git a/opie-mediaplayer2/opie-mediaplayer2_1.1.7.oe b/opie-mediaplayer2/opie-mediaplayer2_1.1.7.oe
index 98f8df2e27..e68b702939 100644
--- a/opie-mediaplayer2/opie-mediaplayer2_1.1.7.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2_1.1.7.oe
@@ -4,7 +4,7 @@ SECTION = "opie/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
MAINTAINER = "Team Opie <opie@handhelds.org>"
-DEPENDS = "libxine-opie"
+DEPENDS = "libxine-opie opie-mediaplayer2-skin-default "
RDEPENDS = "opie-mediaplayer2-skin"
RRECOMMENDS = "opie-mediaplayer2-skin-default libxine-plugin-ao-out-oss libxine-plugin-decode-mad \
libxine-plugin-dmx-audio libxine-plugin-dmx-mpeg libxine-plugin-inp-file "
diff --git a/opie-mediaplayer2/opie-mediaplayer2_cvs.oe b/opie-mediaplayer2/opie-mediaplayer2_cvs.oe
index 5c5e75c4c8..50b126659a 100644
--- a/opie-mediaplayer2/opie-mediaplayer2_cvs.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2_cvs.oe
@@ -5,7 +5,7 @@ PRIORITY = "optional"
LICENSE = "GPL"
MAINTAINER = "Team Opie <opie@handhelds.org>"
PV = "1.1.7+cvs-${CVSDATE}"
-DEPENDS = "libxine-opie"
+DEPENDS = "libxine-opie opie-mediaplayer2-skin-default"
RDEPENDS = "opie-mediaplayer2-skin"
RRECOMMENDS = "opie-mediaplayer2-skin-default libxine-plugin-ao-out-oss libxine-plugin-decode-mad \
libxine-plugin-dmx-audio libxine-plugin-dmx-mpeg libxine-plugin-inp-file "
diff --git a/opie-pics/opie-pics_1.1.7.oe b/opie-pics/opie-pics_1.1.7.oe
index 68467886b3..b38b1a3d92 100644
--- a/opie-pics/opie-pics_1.1.7.oe
+++ b/opie-pics/opie-pics_1.1.7.oe
@@ -1,8 +1,9 @@
DESCRIPTION = "Common Opie pictures usable from all applications"
SECTION = "opie/base"
PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>
+MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
+PR = "r1"
TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
SRC_URI = "${HANDHELDS_CVS};module=opie/pics;tag=${TAG}"
@@ -12,10 +13,10 @@ do_install() {
install -d ${D}${palmtopdir}/pics/addressbook/
install -d ${D}${palmtopdir}/pics/datebook/
install -d ${D}${palmtopdir}/pics/todo/
- install *.png ${D}${palmtopdir}/pics/
- install addressbook/*.png ${D}${palmtopdir}/pics/addressbook/
- install datebook/*.png ${D}${palmtopdir}/pics/datebook/
- install todo/*.png ${D}${palmtopdir}/pics/todo/
+ install -m 0664 *.png ${D}${palmtopdir}/pics/
+ install -m 0664 addressbook/*.png ${D}${palmtopdir}/pics/addressbook/
+ install -m 0664 datebook/*.png ${D}${palmtopdir}/pics/datebook/
+ install -m 0664 todo/*.png ${D}${palmtopdir}/pics/todo/
}
diff --git a/opie-pics/opie-pics_cvs.oe b/opie-pics/opie-pics_cvs.oe
index fd62da081b..d142f30258 100644
--- a/opie-pics/opie-pics_cvs.oe
+++ b/opie-pics/opie-pics_cvs.oe
@@ -4,6 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
PV = "1.1.7+cvs-${CVSDATE}"
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/pics"
S = "${WORKDIR}/pics"
@@ -12,10 +13,10 @@ do_install() {
install -d ${D}${palmtopdir}/pics/addressbook/
install -d ${D}${palmtopdir}/pics/datebook/
install -d ${D}${palmtopdir}/pics/todo/
- install *.png ${D}${palmtopdir}/pics/
- install addressbook/*.png ${D}${palmtopdir}/pics/addressbook/
- install datebook/*.png ${D}${palmtopdir}/pics/datebook/
- install todo/*.png ${D}${palmtopdir}/pics/todo/
+ install -m 0664 *.png ${D}${palmtopdir}/pics/
+ install -m 0664 addressbook/*.png ${D}${palmtopdir}/pics/addressbook/
+ install -m 0664 datebook/*.png ${D}${palmtopdir}/pics/datebook/
+ install -m 0664 todo/*.png ${D}${palmtopdir}/pics/todo/
}
FILES_${PN} = "${palmtopdir}"
diff --git a/opie-security/opie-security_1.1.7.oe b/opie-security/opie-security_1.1.7.oe
index c164880e93..d8706a9021 100644
--- a/opie-security/opie-security_1.1.7.oe
+++ b/opie-security/opie-security_1.1.7.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
RRECOMMENDS = "opie-securityplugin-pin"
-PR = "r1"
+PR = "r2"
APPNAME = "security"
@@ -20,6 +20,10 @@ inherit opie
# FILES plugins/application/libsecurity.so* bin/security apps/Settings/Security.desktop pics/security
do_install() {
install -d ${D}${palmtopdir}/pics/${APPNAME}/
- install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+
+ for icon in Security.png lock.png multiauth.png sync.png users.png;
+ do
+ install -m 0644 ${WORKDIR}/pics/${APPNAME}/$icon ${D}${palmtopdir}/pics/${APPNAME}/
+ done
}
diff --git a/opie-security/opie-security_cvs.oe b/opie-security/opie-security_cvs.oe
index 3030313d73..15699c380a 100644
--- a/opie-security/opie-security_cvs.oe
+++ b/opie-security/opie-security_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
RRECOMMENDS = "opie-securityplugin-pin"
-PR = "r1"
+PR = "r2"
PV = "1.1.7+cvs-${CVSDATE}"
APPNAME = "security"
@@ -19,6 +19,10 @@ inherit opie
# FILES plugins/application/libsecurity.so* bin/security apps/Settings/Security.desktop pics/security
do_install() {
install -d ${D}${palmtopdir}/pics/${APPNAME}/
- install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+
+ for icon in Security.png lock.png multiauth.png sync.png users.png;
+ do
+ install -m 0644 ${WORKDIR}/pics/${APPNAME}/$icon ${D}${palmtopdir}/pics/${APPNAME}/
+ done
}
diff --git a/orinoco/orinoco-modules_0.13e.oe b/orinoco/orinoco-modules_0.13e.oe
index 1a9912e12f..886cf7f514 100644
--- a/orinoco/orinoco-modules_0.13e.oe
+++ b/orinoco/orinoco-modules_0.13e.oe
@@ -4,6 +4,7 @@ SECTION = "kernel/modules"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
+PR = "r1"
SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz; \
file://crosscompile.patch;patch=1 \
diff --git a/orinoco/orinoco-modules_0.15rc1.oe b/orinoco/orinoco-modules_0.15rc1.oe
index 376736205b..099c3be2c9 100644
--- a/orinoco/orinoco-modules_0.15rc1.oe
+++ b/orinoco/orinoco-modules_0.15rc1.oe
@@ -6,6 +6,9 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
PR = "r2"
+# seems to cause problems on arm
+DEFAULT_PREFERENCE_arm = "-1"
+
SRC_URI = "${SOURCEFORGE_MIRROR}/orinoco/orinoco-${PV}.tar.gz \
file://list-move.patch;patch=1 \
file://spectrum-firmware.patch;patch=1 \
diff --git a/orinoco/orinoco-modules_0.15rc2.oe b/orinoco/orinoco-modules_0.15rc2.oe
index 9535ce7cf6..2601fa1cb1 100644
--- a/orinoco/orinoco-modules_0.15rc2.oe
+++ b/orinoco/orinoco-modules_0.15rc2.oe
@@ -5,7 +5,10 @@ PRIORITY = "optional"
PROVIDES = "spectrum-modules"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
+
+# seems to cause problems on arm
+DEFAULT_PREFERENCE_arm = "-1"
SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz \
file://list-move.patch;patch=1 \
diff --git a/pcmcia-cs/files/arm/pcmcia b/pcmcia-cs/files/arm/pcmcia
index 95fdeb3667..3dc330db21 100644
--- a/pcmcia-cs/files/arm/pcmcia
+++ b/pcmcia-cs/files/arm/pcmcia
@@ -11,3 +11,7 @@ case `awk 'BEGIN { FS=":" } /Processor/ { gsub(/ /, "", $2) ; print $2 } ' </pro
;;
esac
+if grep -q iPAQ /proc/cpuinfo; then
+ PCIC_EXTRA=h3600_generic_sleeve
+fi
+
diff --git a/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch b/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch
diff --git a/pcmcia-cs/pcmcia-cs_3.2.8.oe b/pcmcia-cs/pcmcia-cs_3.2.8.oe
index 3ac5dbb9c9..6ebd1c55d3 100644
--- a/pcmcia-cs/pcmcia-cs_3.2.8.oe
+++ b/pcmcia-cs/pcmcia-cs_3.2.8.oe
@@ -3,11 +3,12 @@ SECTION = "base"
PRIORITY = "required"
LICENSE = "GPL"
DEPENDS = "virtual/kernel"
-PR = "r9"
+PR = "r10"
SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \
file://busybox.patch;patch=1 \
file://network.patch;patch=1 \
+ file://pcic-extra.patch;patch=1 \
file://pcmcia \
file://ide.opts \
file://wireless.opts \
diff --git a/site/i386-linux b/site/i386-linux
index 3d2f74ddf1..1416ad5798 100644
--- a/site/i386-linux
+++ b/site/i386-linux
@@ -82,6 +82,9 @@ ac_cv_func_getaddrinfo=${ac_cv_func_getaddrinfo=yes}
# D-BUS
ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes}
+# samba
+samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
+
# gettext
am_cv_func_working_getline=${am_cv_func_working_getline=yes}
diff --git a/site/i686-linux b/site/i686-linux
index 67b59f99e5..1b8042e4e6 100644
--- a/site/i686-linux
+++ b/site/i686-linux
@@ -96,6 +96,9 @@ ac_cv_uint=${ac_cv_uint=yes}
ac_cv_ulong=${ac_cv_ulong=yes}
ac_cv_ushort=${ac_cv_ushort=yes}
+# samba
+samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
+
# gettext
am_cv_func_working_getline=${am_cv_func_working_getline=yes}
diff --git a/teleport/teleport_0.33.oe b/teleport/teleport_0.33.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/teleport/teleport_0.33.oe
diff --git a/tickypip/tickypip-levels/NetWalk_levels.README b/tickypip/tickypip-levels/NetWalk_levels.README
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tickypip/tickypip-levels/NetWalk_levels.README
diff --git a/tickypip/tickypip-levels_1.0.oe b/tickypip/tickypip-levels_1.0.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tickypip/tickypip-levels_1.0.oe
diff --git a/tickypip/tickypip_0.1.2.oe b/tickypip/tickypip_0.1.2.oe
index e69de29bb2..1e514d0574 100644
--- a/tickypip/tickypip_0.1.2.oe
+++ b/tickypip/tickypip_0.1.2.oe
@@ -0,0 +1,33 @@
+DESCRIPTION = "Tickypip"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
+LICENSE = "GPL"
+AUTHOR = "Christian Hammond"
+HOMEPAGE = "http://www.chipx86.com/projects/tickypip/"
+RRECOMMENDS = "tickypip-levels"
+PR = "r3"
+
+SRC_URI = "http://www.chipx86.com/packages/ipkg/tickypip-0.1.2.tar.gz \
+ file://local_compile.patch;patch=1 \
+ file://tickypip.desktop \
+ file://tickypip.png"
+
+APPNAME = "tickypip"
+APPTYPE = "binary"
+APPDESKTOP = "${WORKDIR}"
+
+QMAKE_PROFILES = "tickypip.pro"
+
+do_install () {
+ install -d ${D}/${palmtopdir}/pics/${APPNAME}/
+ install -m 0644 ${WORKDIR}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+ install -m 0644 ${S}/images/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+
+# copy share
+ install -d ${D}/${palmtopdir}/share/${APPNAME}/levels
+ install -m 0644 ${S}/levels/* ${D}/${palmtopdir}/share/${APPNAME}/levels/
+}
+
+
+inherit opie
diff --git a/tremor/tremor_20030402.oe b/tremor/tremor_20030402.oe
index e69de29bb2..545def3ad2 100644
--- a/tremor/tremor_20030402.oe
+++ b/tremor/tremor_20030402.oe
@@ -0,0 +1,28 @@
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "libogg"
+DESCRIPTION = "tremor is a fixed point implementation of the vorbis codec."
+LICENSE = "BSD"
+CVSDATE = "${PV}"
+PR = "r1"
+
+SRC_URI = "svn://svn.xiph.org/trunk;module=Tremor;rev=4573"
+
+S = "${WORKDIR}/Tremor"
+
+inherit autotools
+
+EXTRA_OECONF=" --enable-shared --disable-rpath "
+
+#do_configure_prepend() {
+# ./autogen.sh
+#}
+
+do_stage() {
+ oe_runmake install prefix=${STAGING_DIR} \
+ bindir=${STAGING_BINDIR} \
+ includedir=${STAGING_INCDIR}/tremor \
+ libdir=${STAGING_LIBDIR} \
+ datadir=${STAGING_DATADIR}
+}
diff --git a/wireless-tools/wireless-tools/wireless-tools.if-pre-up b/wireless-tools/wireless-tools/wireless-tools.if-pre-up
index 159402ceb8..11fbced462 100644
--- a/wireless-tools/wireless-tools/wireless-tools.if-pre-up
+++ b/wireless-tools/wireless-tools/wireless-tools.if-pre-up
@@ -1,5 +1,7 @@
#!/bin/sh
+case "$METHOD" in loopback) exit 0 ;; esac
+
IWCONFIG=/sbin/iwconfig
IWPRIV=/sbin/iwpriv
@@ -9,10 +11,8 @@ fi
# Detect and do nothing for linux-wlan-ng interfaces;
# which are configured by thier own if-pre-up script.
-if [ -x /sbin/wlancfg ]; then
- if /sbin/wlancfg show $IFACE >/dev/null 2>&1; then
- exit 0
- fi
+if [ -n "$IF_WIRELESS_TYPE" -a "$IF_WIRELESS_TYPE" = "wlan-ng" ]; then
+ exit 0
fi
if [ -n "$IF_NEEDS_RESET" ]; then
diff --git a/wlan-ng/files/pre-up b/wlan-ng/files/pre-up
index 002ab37511..0ae410edfa 100644
--- a/wlan-ng/files/pre-up
+++ b/wlan-ng/files/pre-up
@@ -1,4 +1,7 @@
#!/bin/sh
+
+case "$METHOD" in loopback) exit 0 ;; esac
+
#
# This script takes care of bringing up wlan-ng device.
# It is run by ifup, and gets information from the
@@ -13,10 +16,8 @@ if [ ! -x $WLANCTL ] ; then
fi
# Detect and act only on linux-wlan-ng interfaces
-if [ -x /sbin/wlancfg ]; then
- if ! /sbin/wlancfg show $IFACE >/dev/null 2>&1; then
- exit 0
- fi
+if [ "$IF_WIRELESS_TYPE" != "wlan-ng" ]; then
+ exit 0
fi
# Create a lock file; remove on script exit. This is a fairly crummy lock,
diff --git a/wlan-ng/wlan-ng-modules_0.2.1pre22.oe b/wlan-ng/wlan-ng-modules_0.2.1pre22.oe
index d52e795cfe..0f96a81b03 100644
--- a/wlan-ng/wlan-ng-modules_0.2.1pre22.oe
+++ b/wlan-ng/wlan-ng-modules_0.2.1pre22.oe
@@ -4,7 +4,7 @@ DEPENDS = "virtual/kernel"
RRECOMMENDS = "wlan-ng-utils"
MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
LICENSE = "GPL"
-PR = "r7"
+PR = "r8"
SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
file://no-compat.patch;patch=1 \
diff --git a/xserver/xserver-kdrive/xserver-kdrive-poodle.patch b/xserver/xserver-kdrive/xserver-kdrive-poodle.patch
index 9700e4a58c..6192a45065 100644
--- a/xserver/xserver-kdrive/xserver-kdrive-poodle.patch
+++ b/xserver/xserver-kdrive/xserver-kdrive-poodle.patch
@@ -1,5 +1,5 @@
---- xserver/hw/kdrive/fbdev/fbdev.c.old 2004-06-28 01:48:51.000000000 +0100
-+++ xserver/hw/kdrive/fbdev/fbdev.c 2004-07-28 15:05:55.000000000 +0100
+--- xserver/hw/kdrive/fbdev/fbdev.c.orig 2004-11-29 20:00:00.000000000 +0000
++++ xserver/hw/kdrive/fbdev/fbdev.c 2004-11-29 20:04:10.000000000 +0000
@@ -190,6 +190,7 @@
var.nonstd = 0;
var.grayscale = 0;
@@ -8,18 +8,15 @@
k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &var);
if (k < 0)
-@@ -197,7 +198,9 @@
- fprintf (stderr, "error: %s\n", strerror (errno));
- return FALSE;
- }
--
+@@ -202,6 +203,7 @@
+ k = ioctl (priv->fd, FBIOGET_FSCREENINFO, &priv->fix);
+ if (k < 0)
+ perror ("FBIOGET_FSCREENINFO");
+ */
-+
-+
+
/* Now get the new screeninfo */
ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var);
- depth = priv->var.bits_per_pixel;
-@@ -623,13 +626,14 @@
+@@ -659,13 +661,14 @@
priv->var.activate = FB_ACTIVATE_NOW|FB_CHANGE_CMAP_VBL;
/* display it on the LCD */
diff --git a/zddice/zddice_1.0.0.oe b/zddice/zddice_1.0.0.oe
index bffd67c67a..7d448d29fe 100644
--- a/zddice/zddice_1.0.0.oe
+++ b/zddice/zddice_1.0.0.oe
@@ -3,6 +3,7 @@ SECTION = "opie/games"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
+PR = "r1"
SRC_URI = "http://www.cinlug.org/modules/Static_Docs/data/db/zddice/zddice_${PV}_arm.src.tar.gz \
file://qtopia17.patch;patch=1"
@@ -15,6 +16,6 @@ EXTRA_QMAKEVARS_POST = 'TMAKE_LIBS-="-luuid" TMAKE_LIBS+="-lqpe" CONFIG+=qt CONF
do_install() {
install -d ${D}/${palmtopdir}/{bin,pics,apps/Games}
install -m 0755 zddice ${D}/${palmtopdir}/bin/
- install -m 0755 images/zddice.png ${D}/${palmtopdir}/pics/
+ install -m 0644 images/zddice.png ${D}/${palmtopdir}/pics/
install -m 0644 zddice.desktop ${D}/${palmtopdir}/apps/Games/
}