diff options
| -rw-r--r-- | conf/distro/include/openzaurus.inc | 2 | ||||
| -rw-r--r-- | conf/distro/openzaurus-unstable.conf | 6 | ||||
| -rw-r--r-- | packages/gnutls/gnutls.inc | 3 | ||||
| -rw-r--r-- | packages/gnutls/gnutls_1.6.0.bb | 2 | ||||
| -rw-r--r-- | packages/images/opie-image.bb | 10 | ||||
| -rw-r--r-- | packages/otpkeygen/otpkeygen_1.3.0.bb | 4 | ||||
| -rw-r--r-- | packages/tasks/task-base.bb | 1 | ||||
| -rw-r--r-- | packages/tasks/task-opie.bb | 4 | ||||
| -rw-r--r-- | packages/xorg-lib/libx11_X11R7.1-1.0.1.bb | 2 |
9 files changed, 19 insertions, 15 deletions
diff --git a/conf/distro/include/openzaurus.inc b/conf/distro/include/openzaurus.inc index ea408ff221..8274148823 100644 --- a/conf/distro/include/openzaurus.inc +++ b/conf/distro/include/openzaurus.inc @@ -22,4 +22,4 @@ BB_MIN_VERSION = "1.4.4" INHERIT += "sanity" # We want images supporting the following features (for task-base) -DISTRO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost" +DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost" diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf index 10f00b7604..476249478d 100644 --- a/conf/distro/openzaurus-unstable.conf +++ b/conf/distro/openzaurus-unstable.conf @@ -51,14 +51,18 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" +PREFERRED_VERSION_binutils-cross-sdk = "2.16" PREFERRED_VERSION_binutils-cross = "2.16" PREFERRED_VERSION_binutils = "2.16" PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" PREFERRED_VERSION_gcc = "3.4.4" PREFERRED_VERSION_gcc-cross = "3.4.4" +PREFERRED_VERSION_gcc-cross-sdk = "3.4.4" PREFERRED_VERSION_gcc-cross-initial = "3.4.4" +PREFERRED_VERSION_wpa-supplicant = "0.5.5" + # # Opie # @@ -71,7 +75,7 @@ require conf/distro/include/preferred-opie-versions.inc # GPE # PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" -PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" require conf/distro/include/preferred-gpe-versions-2.8.inc # 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 diff --git a/packages/images/opie-image.bb b/packages/images/opie-image.bb index b7c68ec505..e22200abc5 100644 --- a/packages/images/opie-image.bb +++ b/packages/images/opie-image.bb @@ -1,23 +1,21 @@ 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" 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}" 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 <thomas@bitrot.de>" 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/ } 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 = "\ 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" 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 |