diff options
66 files changed, 592 insertions, 28 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 8fe6a62061..0f475598e2 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -18,6 +18,8 @@ SRCDATE = "20060425" # Opie +#use 1337 mt version of opie to have a webbrowser +PALMTOP_USE_MULTITHREADED_QT = "yes" QTE_VERSION = "2.3.10" OPIE_VERSION = "1.2.2" include conf/distro/preferred-opie-versions.inc diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf index daa85d5bda..547436cd1a 100644 --- a/conf/distro/angstrom.conf +++ b/conf/distro/angstrom.conf @@ -35,8 +35,6 @@ BUILD_OPTIMIZATION = "-Os" #ARM EABI is softfloat by default, but let's make sure :) TARGET_FPU_arm = "soft" -PARALLEL_INSTALL_MODULES = "1" - #Always ship these packages BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version dropbear sysvinit" BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version dropbear sysvinit" diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf index 6526f50ef4..03fa7faa62 100644 --- a/conf/machine/jornada6xx.conf +++ b/conf/machine/jornada6xx.conf @@ -2,8 +2,8 @@ #@NAME: HP Jornada 680 #@DESCRIPTION: Machine configuration for the HITACHI SH3 based HP Jornada 6xx palmtop computer -TARGET_ARCH = "sh3" -IPKG_ARCHS = "all sh3 ${MACHINE}" +TARGET_ARCH = "sh" +IPKG_ARCHS = "all ${TARGET_ARCH} ${MACHINE}" PREFERRED_VERSION_glibc = "2.3.4" PREFERRED_VERSION_glibc-initial = "2.3.4" diff --git a/packages/altboot/altboot_1.0.5.bb b/packages/altboot/altboot_1.0.5.bb index 3c2a269b64..c5f641f11f 100644 --- a/packages/altboot/altboot_1.0.5.bb +++ b/packages/altboot/altboot_1.0.5.bb @@ -9,6 +9,7 @@ DESCRIPTION = "The altboot bootmanager" MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" +LICENSE = "GPL" ###################################################################################### diff --git a/packages/altboot/altboot_1.0.6.bb b/packages/altboot/altboot_1.0.6.bb index 5f76d1b516..ee0fb7c1df 100644 --- a/packages/altboot/altboot_1.0.6.bb +++ b/packages/altboot/altboot_1.0.6.bb @@ -9,6 +9,7 @@ DESCRIPTION = "The altboot bootmanager" MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" +LICENSE = "GPL" ###################################################################################### diff --git a/packages/altboot/altboot_1.0.7-rc2.bb b/packages/altboot/altboot_1.0.7-rc2.bb index 18ba022a71..385e30907e 100644 --- a/packages/altboot/altboot_1.0.7-rc2.bb +++ b/packages/altboot/altboot_1.0.7-rc2.bb @@ -9,6 +9,7 @@ DESCRIPTION = "The altboot bootmanager" MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" +LICENSE = "GPL" ###################################################################################### diff --git a/packages/anthy/anthy-native_6801.bb b/packages/anthy/anthy-native_6801.bb index 508b9ff027..eed500560c 100644 --- a/packages/anthy/anthy-native_6801.bb +++ b/packages/anthy/anthy-native_6801.bb @@ -1,6 +1,8 @@ require anthy_${PV}.bb +DEPENDS ="" inherit native + do_stage() { autotools_stage_all } diff --git a/packages/bootchart/.mtn2git_empty b/packages/bootchart/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/bootchart/.mtn2git_empty diff --git a/packages/bootchart/bootchart_0.9.bb b/packages/bootchart/bootchart_0.9.bb new file mode 100644 index 0000000000..b9b4029590 --- /dev/null +++ b/packages/bootchart/bootchart_0.9.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Bootchart is a tool for performance analysis and visualization of the GNU/Linux boot process." +LICENSE = "GPLv2" +HOMEPAGE = "http://www.bootchart.org/" +MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" + + +#this only installs the loggers, you will need to run the renderers on your workstation +#boot with 'init=/sbin/bootchartd' and do '/sbin/bootchartd stop' to end the logging + +#needed for a real /bin/sh and /bin/sleep +DEPENDS = "bash coreutils" +RDEPENDS = "bash coreutils" + +#this is a plain shell script +PACKAGE_ARCH = "all" + +SRC_URI = "file://bootchart \ + file://bootchartd \ + file://bootchartd.conf" + + +do_install() { + install -d ${D}/sbin + install -d ${D}/etc + install -m 755 ${WORKDIR}/bootchart ${D}/sbin + install -m 755 ${WORKDIR}/bootchartd ${D}/sbin + install -m 644 ${WORKDIR}/bootchart ${D}/etc +} + diff --git a/packages/dcop/.mtn2git_empty b/packages/dcop/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/dcop/.mtn2git_empty diff --git a/packages/dcop/dcopidl-native_3.5.4.bb b/packages/dcop/dcopidl-native_3.5.4.bb new file mode 100644 index 0000000000..8a2e8738a7 --- /dev/null +++ b/packages/dcop/dcopidl-native_3.5.4.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "DCOP IDL parser" +SECTION = "kde/dev" +PRIORITY = "optional" +MAINTAINER = "freyther@kde.org" +LICENSE = "GPL" +DEPENDS = "uicmoc3-native" + + +SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kdelibs/dcop/;module=dcopidl \ + file://dcopidl-compile.patch;patch=1 " +S = "${WORKDIR}/dcopidl" + + +inherit native qmake qt3e + +export OE_QMAKE_LINK="${CXX}" +EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl " +EXTRA_QMAKEVARS_POST_append = "CONFIG-=thread " + +# create a .pro file now +do_configure_prepend() { + echo "SOURCES += main.cpp yacc.cc scanner.cc " > dcopidl.pro + echo "HEADERS += yacc.cc.h " >> dcopidl.pro +} + +do_stage() { + install -d ${STAGING_BINDIR} + install -m 0755 dcopidl ${STAGING_BINDIR} +} diff --git a/packages/dcop/dcopidl2cpp-native_3.5.4.bb b/packages/dcop/dcopidl2cpp-native_3.5.4.bb new file mode 100644 index 0000000000..5828bc35ec --- /dev/null +++ b/packages/dcop/dcopidl2cpp-native_3.5.4.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "DCOP IDL parser" +SECTION = "kde/dev" +PRIORITY = "optional" +MAINTAINER = "freyther@kde.org" +LICENSE = "GPL" +DEPENDS = "uicmoc3-native" + + +SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kdelibs/dcop/;module=dcopidl2cpp " +#\ +# file://dcopidl-compile.patch;patch=1 " +S = "${WORKDIR}/dcopidl2cpp" + + +inherit native qmake qt3e + +export OE_QMAKE_LINK="${CXX}" +EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl " +EXTRA_QMAKEVARS_POST_append = "CONFIG-=thread " + +# create a .pro file now +do_configure_prepend() { + echo "SOURCES += main.cpp skel.cpp stub.cpp stubimpl.cpp" > dcopidl2cpp.pro + echo "HEADERS += main.h " >> dcopidl2cpp.pro +} + +do_stage() { + install -d ${STAGING_BINDIR} + install -m 0755 dcopidl2cpp ${STAGING_BINDIR} +} diff --git a/packages/dcop/files/.mtn2git_empty b/packages/dcop/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/dcop/files/.mtn2git_empty diff --git a/packages/dcop/files/dcopidl-compile.patch b/packages/dcop/files/dcopidl-compile.patch new file mode 100644 index 0000000000..320112395f --- /dev/null +++ b/packages/dcop/files/dcopidl-compile.patch @@ -0,0 +1,12 @@ +Index: dcopidl/yacc.cc +=================================================================== +--- dcopidl.orig/yacc.cc 2006-04-26 21:59:13.000000000 +0200 ++++ dcopidl/yacc.cc 2006-04-26 22:28:28.859672808 +0200 +@@ -213,7 +213,6 @@ + + ******************************************************************/ + +-#include <config.h> + + // Workaround for a bison issue: + // bison.simple concludes from _GNU_SOURCE that stpcpy is available, diff --git a/packages/gammu/gammu_1.05.00.bb b/packages/gammu/gammu_1.06.00.bb index 514819935c..514819935c 100644 --- a/packages/gammu/gammu_1.05.00.bb +++ b/packages/gammu/gammu_1.06.00.bb diff --git a/packages/hostap/hostap-daemon.inc b/packages/hostap/hostap-daemon.inc index c95059efe8..83491bfb14 100644 --- a/packages/hostap/hostap-daemon.inc +++ b/packages/hostap/hostap-daemon.inc @@ -5,6 +5,7 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" RDEPENDS = "hostap-modules hostap-utils (${PV})" +DEPENDS = "openssl" DEPENDS_mtx-1_append = "madwifi-modules" SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \ diff --git a/packages/kdepimpi/files/.mtn2git_empty b/packages/kdepimpi/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/kdepimpi/files/.mtn2git_empty diff --git a/packages/kdepimpi/files/gcc4.patch b/packages/kdepimpi/files/gcc4.patch new file mode 100644 index 0000000000..70bd00c889 --- /dev/null +++ b/packages/kdepimpi/files/gcc4.patch @@ -0,0 +1,104 @@ +--- ./gammu/emb/gammu/depend/siemens/dsiemens.c 2006/04/14 23:30:53 1.1 ++++ ./gammu/emb/gammu/depend/siemens/dsiemens.c 2006/04/14 23:31:08 +@@ -351,7 +351,7 @@ + GSM_Terminate(); + } + +-static GSM_Reply_Function UserReplyFunctionsAtS[] = { ++GSM_Reply_Function UserReplyFunctionsAtS[] = { + {ATSIEMENS_Reply_GetSAT, "AT^SSTK", 0x00,0x00,ID_User1 }, + {ATSIEMENS_Reply_GetNetmon, "AT^S^MI", 0x00,0x00,ID_User2 }, + {NULL, "\x00", 0x00,0x00,ID_None } +--- ./gammu/emb/gammu/depend/nokia/dct4.c 2006/04/14 23:28:56 1.1 ++++ ./gammu/emb/gammu/depend/nokia/dct4.c 2006/04/14 23:29:17 +@@ -1288,7 +1288,7 @@ + GSM_Terminate(); + } + +-static GSM_Reply_Function UserReplyFunctions4[] = { ++GSM_Reply_Function UserReplyFunctions4[] = { + + #ifdef DEBUG + {DCT4_ReplyResetSecurityCode, "\x08",0x03,0x05,ID_User2 }, +--- ./gammu/emb/gammu/depend/nokia/dct3trac/wmx.c 2006/04/14 23:31:48 1.1 ++++ ./gammu/emb/gammu/depend/nokia/dct3trac/wmx.c 2006/04/14 23:31:55 +@@ -462,7 +462,7 @@ + GSMDecoder_free(gsmdec); + } + +-static GSM_Reply_Function UserReplyFunctionsX[] = { ++GSM_Reply_Function UserReplyFunctionsX[] = { + {DCT3_ReplySwitchDebug, "\x40",0x02,0x70,ID_DebugSwitch }, + {DCT3_ReplySwitchDebug, "\x40",0x02,0x71,ID_DebugSwitch }, + {DCT3_ReplyDebugTrace, "\x00",0x00,0x00,ID_IncomingFrame }, +--- ./gammu/emb/gammu/depend/nokia/dct3.c 2006/04/14 23:25:59 1.1 ++++ ./gammu/emb/gammu/depend/nokia/dct3.c 2006/04/14 23:27:52 +@@ -770,7 +770,7 @@ + } + #endif + +-static GSM_Reply_Function UserReplyFunctions3[] = { ++GSM_Reply_Function UserReplyFunctions3[] = { + #ifdef GSM_ENABLE_NOKIA6110 + {DCT3_ReplyDisplayOutput, "\x0D",0x03,0x50,ID_IncomingFrame }, + {DCT3_ReplyDisplayOutput, "\x0D",0x03,0x54,ID_User7 }, +--- ./gammu/emb/common/phone/alcatel/alcatel.c 2006/04/14 23:23:19 1.1 ++++ ./gammu/emb/common/phone/alcatel/alcatel.c 2006/04/14 23:24:16 +@@ -3833,7 +3833,7 @@ + return ATGEN_SetFastSMSSending(s, enable); + } + +-static GSM_Reply_Function ALCATELReplyFunctions[] = { ++GSM_Reply_Function ALCATELReplyFunctions[] = { + {ALCATEL_ReplyGeneric, "\x02",0x00,0x00, ID_AlcatelAttach }, + {ALCATEL_ReplyGeneric, "\x02",0x00,0x00, ID_AlcatelDetach }, + {ALCATEL_ReplyGeneric, "\x02",0x00,0x00, ID_AlcatelCommit }, +--- ./kaddressbook/addresseeeditorwidget.h 2006/04/14 23:14:39 1.1 ++++ ./kaddressbook/addresseeeditorwidget.h 2006/04/14 23:14:51 +@@ -43,6 +43,8 @@ + class QMultiLineEdit; + #endif //KAB_EMBEDDED + ++class QComboBox; ++ + class KComboBox; + class KDateEdit; + class KLineEdit; +--- ./korganizer/koeditordetails.cpp 2006/04/14 22:51:27 1.1 ++++ ./korganizer/koeditordetails.cpp 2006/04/14 23:04:05 +@@ -54,13 +54,13 @@ + #include "koeditordetails.h" + + template <> +-CustomListViewItem<class Attendee *>::~CustomListViewItem() ++CustomListViewItem<KCal::Attendee *>::~CustomListViewItem() + { + delete mData; + } + + template <> +-void CustomListViewItem<class Attendee *>::updateItem() ++void CustomListViewItem<KCal::Attendee *>::updateItem() + { + setText(0,mData->name()); + setText(1,mData->email()); +--- ./pwmanager/libcrypt/cipher/serpent.c 2006/04/15 00:30:57 1.1 ++++ ./pwmanager/libcrypt/cipher/serpent.c 2006/04/15 00:33:06 +@@ -687,7 +687,7 @@ + if (! serpent_init_done) + { + /* Execute a self-test the first time, Serpent is used. */ +- static const char *serpent_test (void); ++ const char *serpent_test (void); + + serpent_test_ret = serpent_test (); + if (serpent_test_ret) +@@ -864,7 +864,7 @@ + + /* Serpent test. */ + +-static const char * ++const char * + serpent_test (void) + { + serpent_context_t context; diff --git a/packages/kdepimpi/kdepimpi_2.2.7.bb b/packages/kdepimpi/kdepimpi_2.2.7.bb index f3dde1a2fd..843863c575 100644 --- a/packages/kdepimpi/kdepimpi_2.2.7.bb +++ b/packages/kdepimpi/kdepimpi_2.2.7.bb @@ -1,3 +1,6 @@ -SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz " +SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz \ + file://gcc4.patch;patch=1" include kdepimpi-base.inc + +PR = "r1" diff --git a/packages/kdepimpi/pwmpi.inc b/packages/kdepimpi/pwmpi.inc index 2b77eed0de..c737d40e83 100644 --- a/packages/kdepimpi/pwmpi.inc +++ b/packages/kdepimpi/pwmpi.inc @@ -7,6 +7,7 @@ SUBDIRS="pwmanager/libcrypt/mpi \ " export OE_QMAKE_LINK="${CXX}" +OE_QMAKE_CFLAGS_prepend="-I${S}/pwmanager/libcrypt/crypt " EXTRA_QMAKEVARS_POST += " \ INCLUDEPATH+=${STAGING_INCDIR}/kdepimpi/ \ LIBS+=-L${STAGING_LIBDIR}/kdepimpi/ \ diff --git a/packages/konqueror/konqueror-embedded_20060404.bb b/packages/konqueror/konqueror-embedded_20060404.bb index 1d269e611e..e5f2901cb8 100644 --- a/packages/konqueror/konqueror-embedded_20060404.bb +++ b/packages/konqueror/konqueror-embedded_20060404.bb @@ -2,7 +2,7 @@ DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition SECTION = "opie/applications" PRIORITY = "optional" HOMEPAGE = "http://www.konqueror.org/" -DEPENDS = "openssl pcre virtual/libqte2 dcopidl-native" +DEPENDS = "openssl pcre virtual/libqte2 dcopidl-native dcopidl2cpp-native" LICENSE = "LGPL/GPL" PR = "r2" diff --git a/packages/linux/ep93xx-kernel/eabi-enums.patch b/packages/linux/ep93xx-kernel/eabi-enums.patch new file mode 100644 index 0000000000..9e5e9ec571 --- /dev/null +++ b/packages/linux/ep93xx-kernel/eabi-enums.patch @@ -0,0 +1,16 @@ +Index: linux-2.6.16/arch/arm/Makefile +=================================================================== +--- linux-2.6.16.orig/arch/arm/Makefile 2006-03-20 05:53:29.000000000 +0000 ++++ linux-2.6.16/arch/arm/Makefile 2006-04-24 20:10:27.000000000 +0100 +@@ -57,7 +57,7 @@ + tune-$(CONFIG_CPU_V6) :=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) + + ifeq ($(CONFIG_AEABI),y) +-CFLAGS_ABI :=-mabi=aapcs -mno-thumb-interwork ++CFLAGS_ABI :=-mabi=aapcs-linux -mno-thumb-interwork + else + CFLAGS_ABI :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,) + endif + + + diff --git a/packages/linux/ep93xx-kernel_2.6.16.bb b/packages/linux/ep93xx-kernel_2.6.16.bb index a472e9379c..068b9671d0 100644 --- a/packages/linux/ep93xx-kernel_2.6.16.bb +++ b/packages/linux/ep93xx-kernel_2.6.16.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Linux Kernel for Cirrus Logic ep39xx compatible machines" SECTION = "kernel" MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" LICENSE = "GPL" -PR = "r0" +PR = "r1" COMPATIBLE_MACHINE = "ep93xx" @@ -11,6 +11,7 |