From d28e826f9c7daf09f747ddb916e32cabd17ac505 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 13 Dec 2006 10:08:01 +0000 Subject: gnutls 1.6.0: package libgnutlsxx into separate package - close #1678 --- packages/gnutls/gnutls.inc | 3 ++- packages/gnutls/gnutls_1.6.0.bb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/gnutls/gnutls.inc b/packages/gnutls/gnutls.inc index 0d13d132de..2fefe34ceb 100644 --- a/packages/gnutls/gnutls.inc +++ b/packages/gnutls/gnutls.inc @@ -27,7 +27,7 @@ do_stage() { cp ${S}/lib/libgnutls.m4 ${STAGING_DATADIR}/aclocal/ } -PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin" +PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin ${PN}-xx" FILES_${PN} = "${libdir}/libgnutls.so.*" FILES_${PN}-bin = "${bindir}/gnutls-serv \ @@ -40,3 +40,4 @@ FILES_${PN}-bin = "${bindir}/gnutls-serv \ FILES_${PN}-dev += "${bindir}/*-config ${bindir}/gnutls-cli-debug" FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*" FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" +FILES_${PN}-xx = "${libdir}/libgnutlsxx.so.*" diff --git a/packages/gnutls/gnutls_1.6.0.bb b/packages/gnutls/gnutls_1.6.0.bb index c5dffdc05c..01e593f49d 100644 --- a/packages/gnutls/gnutls_1.6.0.bb +++ b/packages/gnutls/gnutls_1.6.0.bb @@ -1,6 +1,6 @@ require gnutls.inc -PR = "r1" +PR = "r2" do_configure_prepend() { sed -i "s/2.60/2.59/" ${S}/configure.in -- cgit v1.2.3 From 7c5e3aeaef690cf5ffae27f0e5d97b98956e2acd Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 13 Dec 2006 10:37:24 +0000 Subject: otpkeygen: rename otpkeygen binary - close #1663 --- packages/otpkeygen/otpkeygen_1.3.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/otpkeygen/otpkeygen_1.3.0.bb b/packages/otpkeygen/otpkeygen_1.3.0.bb index 0643ac445a..44a4789f98 100644 --- a/packages/otpkeygen/otpkeygen_1.3.0.bb +++ b/packages/otpkeygen/otpkeygen_1.3.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.bitrot.de/pda_otpkeygen.html" AUTHOR = "Thomas Driemeyer " LICENSE = "GPL" APPTYPE="binary" -PR = "r2" +PR = "r3" SRC_URI = "ftp://ftp.bitrot.de/pub/otpkeygen/otpkeygen-src_${PV}.tar.gz" @@ -22,7 +22,7 @@ do_install() { install -d ${D}${palmtopdir}/bin/ install -d ${D}${palmtopdir}/pics/ - install -m 0755 ${WORKDIR}/src/src ${D}${palmtopdir}/bin/ + install -m 0755 ${WORKDIR}/src/src ${D}${palmtopdir}/bin/otpkeygen install -m 0644 ${WORKDIR}/apps/Applications/otpkeygen.desktop ${D}${palmtopdir}/apps/Applications/ install -m 0644 ${WORKDIR}/pics/otpkeygen.png ${D}${palmtopdir}/pics/ } -- cgit v1.2.3 From 486358bab1c1f4ddfb50b5c96c8c7c5aab652fe4 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 13 Dec 2006 11:02:16 +0000 Subject: opie-image: removed familiar feed stuff --- packages/images/opie-image.bb | 2 -- 1 file changed, 2 deletions(-) (limited to 'packages') diff --git a/packages/images/opie-image.bb b/packages/images/opie-image.bb index b7c68ec505..668e2dab2e 100644 --- a/packages/images/opie-image.bb +++ b/packages/images/opie-image.bb @@ -1,8 +1,6 @@ export IMAGE_BASENAME = "opie-image" export IMAGE_LINGUAS = "" -FEED_URIS_append_familiar = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie" - LICENSE = "MIT" PR = "r21" -- cgit v1.2.3 From 156996da15e2472f2a9bcd60181313773e164a86 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 13 Dec 2006 11:27:37 +0000 Subject: task-base: 2.4 machines need modutils-depmod --- packages/tasks/task-base.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 1a41f13129..4898e84a33 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -125,6 +125,7 @@ RRECOMMENDS_task-base-core-default = '\ dropbear ' task-base-kernel24-rdepends = "\ + modutils-depmod \ linux-hotplug " task-base-kernel26-rdepends = "\ -- cgit v1.2.3 From 5cb4132ba0258cdaeb10a955f4d6b634883de984 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 13 Dec 2006 11:29:39 +0000 Subject: task-opie: switch to bluez-utils due to fact that bluez-utils-nodbus got removed --- packages/tasks/task-opie.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/tasks/task-opie.bb b/packages/tasks/task-opie.bb index b421818379..984fa61584 100644 --- a/packages/tasks/task-opie.bb +++ b/packages/tasks/task-opie.bb @@ -5,7 +5,7 @@ ALLOW_EMPTY = "1" LICENSE = "MIT" PROVIDES = "task-opie-everything" -PR = "r4" +PR = "r5" PACKAGES = "task-opie-applets task-opie-apps task-opie-base \ task-opie-base-applets task-opie-base-apps \ @@ -155,7 +155,7 @@ RDEPENDS_task-opie-todayplugins = "opie-today-addressbookplugin opie-today-dateb RDEPENDS_task-opie-pim = "task-opie-base-pim task-opie-todayplugins task-opie-datebookplugins \ opie-mail opie-pimconverter" -RDEPENDS_task-opie-bluetooth = "bluez-utils-nodbus obexftp obexpush libopieobex0 \ +RDEPENDS_task-opie-bluetooth = "bluez-utils obexftp obexpush libopieobex0 \ opie-bluepin opie-bluetoothmanager opie-bluetoothapplet" RDEPENDS_task-opie-wlan = "wireless-tools opie-wellenreiter opie-networksettings-wlanplugin" -- cgit v1.2.3 From 27ed81c7028f01455d77f436a15ca8d24373a0b6 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 13 Dec 2006 11:34:37 +0000 Subject: opie-image: install extra stuff on machines with more flash only. Supported are spitz/akita now - other must be added --- packages/images/opie-image.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/images/opie-image.bb b/packages/images/opie-image.bb index 668e2dab2e..e22200abc5 100644 --- a/packages/images/opie-image.bb +++ b/packages/images/opie-image.bb @@ -7,15 +7,15 @@ PR = "r21" DEPENDS = "${MACHINE_TASK_PROVIDER} task-opie" RDEPENDS = "${INSTALL_PACKAGES}" -extra_stuff := '${@base_conditional("ROOT_FLASH_SIZE", "24", "", "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles",d)}' - INSTALL_PACKAGES = "${MACHINE_TASK_PROVIDER} task-opie-base task-opie-base-applets \ task-opie-base-inputmethods task-opie-base-apps \ task-opie-base-settings task-opie-base-decorations \ task-opie-base-styles task-opie-base-pim \ task-opie-extra-settings \ - task-opie-bluetooth task-opie-irda \ - ${extra_stuff}" + task-opie-bluetooth task-opie-irda " + +INSTALL_PACKAGES_spitz_append = "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles" +INSTALL_PACKAGES_akita_append = "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles" export IPKG_INSTALL = "${INSTALL_PACKAGES}" -- cgit v1.2.3 From 1635ee6f41cd2eb114babb739f44eb99d70b3f5a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 13 Dec 2006 17:19:14 +0000 Subject: libx11: revert last commit till someone comes up with a proper fix --- packages/xorg-lib/libx11_X11R7.1-1.0.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb index 5b5abf4cea..4e39aa6ace 100644 --- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb @@ -17,7 +17,7 @@ FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" do_compile() { ( unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS - cd src/util;${BUILD_CC} makekeys.c -o makekeys + oe_runmake -C src/util 'X11_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys ) || exit 1 rm -f ${STAGING_INCDIR}/X11/Xlib.h oe_runmake -- cgit v1.2.3