From 3dcbefec8c78903f1b5e0d8e52b53afbdf03ef7c Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 18 May 2006 17:09:06 +0000 Subject: ezx.conf: add stuff for uclibc builds (uncommented atm.) --- conf/distro/ezx.conf | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/conf/distro/ezx.conf b/conf/distro/ezx.conf index 2bb392759a..f13a51ee04 100644 --- a/conf/distro/ezx.conf +++ b/conf/distro/ezx.conf @@ -10,8 +10,13 @@ DISTRO_VERSION = ".dev-snapshot-${DATE}" DISTRO_TYPE = "debug" # DISTRO_TYPE = "release" -include conf/distro/openzaurus.conf +INHERIT += " package_ipk debian" +# libc setting: +# specify whether you want a glibc or uclibc based distribution +#TARGET_OS = "linux-uclibc" +TARGET_OS = "linux" +TARGET_FPU = "soft" #FEED_URIS += " \ # upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \ @@ -31,7 +36,7 @@ KERNEL_CONSOLE = "ttyS0" #DEBUG_BUILD = "1" #INHIBIT_PACKAGE_STRIP = "1" -# fix some iconv issues, needs to be adjusted when doing uclibc builds +# fix some iconv issues, needs to be commented out when doing uclibc builds PREFERRED_PROVIDER_virtual/libiconv = "glibc" PREFERRED_PROVIDER_virtual/libintl = "glibc" @@ -49,6 +54,11 @@ PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" PREFERRED_VERSION_binutils ?= "2.15.94.0.1" +# +# Utilities +# +BOOTSTRAP_EXTRA_DEPENDS += "ezx-boot-usb-native" + # # Opie # @@ -60,7 +70,7 @@ include conf/distro/preferred-opie-versions.inc # # GPE # -PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_PROVIDER_libx11 = "diet-x11" include conf/distro/preferred-gpe-versions-2.8.inc -- cgit v1.2.3 From 2b91e2e1153d395bd458ea3d3e0705ffb0ddbe61 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Thu, 18 May 2006 23:25:26 +0000 Subject: packages/bluez/bluez-utils: Do not add -I/usr/include bluez add prefix/include to the include path. While we have /usr as prefix we certainly don't want to include /usr/include. The attachs patch disables this when cross compiling. --- packages/bluez/bluez-utils.inc | 1 + packages/bluez/files/no-user-include.patch | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 packages/bluez/files/no-user-include.patch diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc index c68df7bd47..db5ddf066d 100644 --- a/packages/bluez/bluez-utils.inc +++ b/packages/bluez/bluez-utils.inc @@ -8,6 +8,7 @@ LICENSE = "GPL" SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ file://base.patch;patch=1 \ file://blueboxes.patch;patch=1 \ + file://no-user-include.patch;patch=1 \ file://hcid.conf \ file://bluetooth.default \ file://bluetooth.conf \ diff --git a/packages/bluez/files/no-user-include.patch b/packages/bluez/files/no-user-include.patch new file mode 100644 index 0000000000..8c1b1b6d6d --- /dev/null +++ b/packages/bluez/files/no-user-include.patch @@ -0,0 +1,18 @@ +Do not add -I/usr/include to the compile line just because we will +install bluez-utils there says zecke... + +Index: bluez-utils-2.25/acinclude.m4 +=================================================================== +--- bluez-utils-2.25.orig/acinclude.m4 2006-05-18 12:39:57.473577920 +0200 ++++ bluez-utils-2.25/acinclude.m4 2006-05-19 00:58:52.694599848 +0200 +@@ -69,7 +69,9 @@ + ac_save_LDFLAGS=$LDFLAGS + + BLUEZ_CFLAGS="" +- test -d "${bluez_prefix}/include" && BLUEZ_CFLAGS="$BLUEZ_CFLAGS -I${bluez_prefix}/include" ++ if test "$cross_compiling" = no; then ++ test -d "${bluez_prefix}/include" && BLUEZ_CFLAGS="$BLUEZ_CFLAGS -I${bluez_prefix}/include" ++ fi + + CPPFLAGS="$CPPFLAGS $BLUEZ_CFLAGS" + AC_CHECK_HEADER(bluetooth/bluetooth.h, dummy=yes, AC_MSG_ERROR(Bluetooth header files not found)) -- cgit v1.2.3 From 64cfcc882d7ee5a33af8c85cf71e958d866a8a2b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 19 May 2006 13:49:25 +0000 Subject: libopieobex: catch up with recent opie cvs developments --- packages/libopieobex/libopieobex0.inc | 4 +++- packages/libopieobex/libopieobex0_1.2.1.bb | 2 +- packages/libopieobex/libopieobex0_cvs.bb | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/libopieobex/libopieobex0.inc b/packages/libopieobex/libopieobex0.inc index 7a514fa68a..66cada58cc 100644 --- a/packages/libopieobex/libopieobex0.inc +++ b/packages/libopieobex/libopieobex0.inc @@ -3,7 +3,7 @@ SECTION = "opie/libs" PRIORITY = "optional" MAINTAINER = "Team Opie " LICENSE = "LGPL" -DEPENDS = "opie-taskbar openobex-apps" +DEPENDS = "libopietooth opie-taskbar openobex-apps" RDEPENDS = "openobex-apps" APPNAME = "obex" @@ -11,6 +11,8 @@ S = "${WORKDIR}/obex" inherit opie +EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/opietooth" + do_install() { install -d ${D}${palmtopdir}/pics/${APPNAME}/ ${D}${palmtopdir}/plugins/obex/ install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ diff --git a/packages/libopieobex/libopieobex0_1.2.1.bb b/packages/libopieobex/libopieobex0_1.2.1.bb index d80a2a664f..5e7c51e7cc 100644 --- a/packages/libopieobex/libopieobex0_1.2.1.bb +++ b/packages/libopieobex/libopieobex0_1.2.1.bb @@ -1,6 +1,6 @@ include libopieobex0.inc -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " diff --git a/packages/libopieobex/libopieobex0_cvs.bb b/packages/libopieobex/libopieobex0_cvs.bb index c51ca8ecc6..ed160d86c8 100644 --- a/packages/libopieobex/libopieobex0_cvs.bb +++ b/packages/libopieobex/libopieobex0_cvs.bb @@ -1,6 +1,6 @@ include libopieobex0.inc PV = "${OPIE_CVS_PV}" -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \ ${HANDHELDS_CVS};module=opie/pics" -- cgit v1.2.3 From 2cf34afabb086d22e5183838f3f5c5a6d61cfa25 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 19 May 2006 13:56:04 +0000 Subject: libopieobex0: fix typo --- packages/libopieobex/libopieobex0.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/libopieobex/libopieobex0.inc b/packages/libopieobex/libopieobex0.inc index 66cada58cc..15640c530d 100644 --- a/packages/libopieobex/libopieobex0.inc +++ b/packages/libopieobex/libopieobex0.inc @@ -3,7 +3,7 @@ SECTION = "opie/libs" PRIORITY = "optional" MAINTAINER = "Team Opie " LICENSE = "LGPL" -DEPENDS = "libopietooth opie-taskbar openobex-apps" +DEPENDS = "libopietooth1 opie-taskbar openobex-apps" RDEPENDS = "openobex-apps" APPNAME = "obex" -- cgit v1.2.3 From 51538b03e4297f621ab596b118c15b9c5913be01 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 19 May 2006 12:48:19 +0000 Subject: libhandoff: fix DEPENDS --- packages/libhandoff/libhandoff_cvs.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/libhandoff/libhandoff_cvs.bb b/packages/libhandoff/libhandoff_cvs.bb index d0812a9c38..54ffafc5e9 100644 --- a/packages/libhandoff/libhandoff_cvs.bb +++ b/packages/libhandoff/libhandoff_cvs.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" DESCRIPTION = "handoff library for GPE calendar" SECTION = "gpe/libs" PRIORITY = "optional" -DEPENDS = "libgpewidget" +DEPENDS = "glib" PV = "0.1+cvs${SRCDATE}" PR = "r0" MAINTAINER = "Koen Kooi " -- cgit v1.2.3