From 6fbd7684be0328ec9e37fd923438d739c7b2ca69 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 18 Jul 2005 22:11:57 +0000 Subject: zaurus-updater: recognize zimage.bin for tosa --- packages/zaurus-updater/tosa/updater.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/zaurus-updater/tosa/updater.sh b/packages/zaurus-updater/tosa/updater.sh index e22edbf19a..5adfa97a1e 100644 --- a/packages/zaurus-updater/tosa/updater.sh +++ b/packages/zaurus-updater/tosa/updater.sh @@ -67,7 +67,7 @@ then ./consolescroll fi -for TARGETFILE in zImage zimage ZIMAGE initrd.bin INITRD.BIN mversion.bin MVERSION.BIN +for TARGETFILE in zImage zimage.bin ZIMAGE initrd.bin INITRD.BIN mversion.bin MVERSION.BIN do if [ -e $TARGETFILE ] then @@ -78,8 +78,8 @@ do #echo $TARGETFILE':'$DATASIZE'bytes' TARGETTYPE=Invalid case "$TARGETFILE" in -## zImage) TARGETTYPE=Kernel;; - zimage) TARGETTYPE=Kernel;; + zImage) TARGETTYPE=Kernel;; + zimage.bin) TARGETTYPE=Kernel;; ZIMAGE) TARGETTYPE=Kernel;; initrd.bin) TARGETTYPE=RoFs;; INITRD.BIN) TARGETTYPE=RoFs;; -- cgit v1.2.3 From 8e869b70b908cf60ed699d39b490a8417ecb1a63 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 19 Jul 2005 08:47:52 +0000 Subject: updated kdepimpi to 2.1.16 --- packages/kdepimpi/kdepimpi_2.1.13.bb | 3 --- packages/kdepimpi/kdepimpi_2.1.16.bb | 3 +++ packages/kdepimpi/pwmpi_2.1.13.bb | 3 --- packages/kdepimpi/pwmpi_2.1.16.bb | 3 +++ 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 packages/kdepimpi/kdepimpi_2.1.13.bb create mode 100644 packages/kdepimpi/kdepimpi_2.1.16.bb delete mode 100644 packages/kdepimpi/pwmpi_2.1.13.bb create mode 100644 packages/kdepimpi/pwmpi_2.1.16.bb diff --git a/packages/kdepimpi/kdepimpi_2.1.13.bb b/packages/kdepimpi/kdepimpi_2.1.13.bb deleted file mode 100644 index f3dde1a2fd..0000000000 --- a/packages/kdepimpi/kdepimpi_2.1.13.bb +++ /dev/null @@ -1,3 +0,0 @@ -SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz " - -include kdepimpi-base.inc diff --git a/packages/kdepimpi/kdepimpi_2.1.16.bb b/packages/kdepimpi/kdepimpi_2.1.16.bb new file mode 100644 index 0000000000..f3dde1a2fd --- /dev/null +++ b/packages/kdepimpi/kdepimpi_2.1.16.bb @@ -0,0 +1,3 @@ +SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz " + +include kdepimpi-base.inc diff --git a/packages/kdepimpi/pwmpi_2.1.13.bb b/packages/kdepimpi/pwmpi_2.1.13.bb deleted file mode 100644 index 904f640955..0000000000 --- a/packages/kdepimpi/pwmpi_2.1.13.bb +++ /dev/null @@ -1,3 +0,0 @@ -include kdepimpi_${PV}.bb - -include pwmpi.inc diff --git a/packages/kdepimpi/pwmpi_2.1.16.bb b/packages/kdepimpi/pwmpi_2.1.16.bb new file mode 100644 index 0000000000..904f640955 --- /dev/null +++ b/packages/kdepimpi/pwmpi_2.1.16.bb @@ -0,0 +1,3 @@ +include kdepimpi_${PV}.bb + +include pwmpi.inc -- cgit v1.2.3 From e2401ba43b82b9cf9fa8cd29b74791bf32235545 Mon Sep 17 00:00:00 2001 From: Patrick Steiner Date: Tue, 19 Jul 2005 10:00:11 +0000 Subject: updated gpsd to version 2.28 --- packages/gpsd/gpsd_2.26.bb | 2 -- packages/gpsd/gpsd_2.28.bb | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 packages/gpsd/gpsd_2.26.bb create mode 100644 packages/gpsd/gpsd_2.28.bb diff --git a/packages/gpsd/gpsd_2.26.bb b/packages/gpsd/gpsd_2.26.bb deleted file mode 100644 index cd5e223142..0000000000 --- a/packages/gpsd/gpsd_2.26.bb +++ /dev/null @@ -1,2 +0,0 @@ -include gpsd.inc - diff --git a/packages/gpsd/gpsd_2.28.bb b/packages/gpsd/gpsd_2.28.bb new file mode 100644 index 0000000000..cd5e223142 --- /dev/null +++ b/packages/gpsd/gpsd_2.28.bb @@ -0,0 +1,2 @@ +include gpsd.inc + -- cgit v1.2.3 From d94a800980d782334360eed517c5cfc6989f8d9d Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 19 Jul 2005 10:15:14 +0000 Subject: add GNU parted 1.6.23 - patch courtesy Pigi --- packages/parted/.mtn2git_empty | 0 packages/parted/parted_1.6.23.bb | 13 +++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 packages/parted/.mtn2git_empty create mode 100644 packages/parted/parted_1.6.23.bb diff --git a/packages/parted/.mtn2git_empty b/packages/parted/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/parted/parted_1.6.23.bb b/packages/parted/parted_1.6.23.bb new file mode 100644 index 0000000000..d4182487fe --- /dev/null +++ b/packages/parted/parted_1.6.23.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "parted, the GNU partition resizing program" +HOMEPAGE = "http://www.gnu.org/software/parted/parted.html" +LICENSE = "GPLv2" +MAINTAINER = "Justin Patrin " +SECTION = "console/tools" +DEPENDS = "readline e2fsprogs-libs" +PR = "r0" + +SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz" + +EXTRA_OECONF = "--disable-Werror" + +inherit autotools -- cgit v1.2.3 From a75ff4055638369d7f0fa71b8e86a373a7e5efcb Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 19 Jul 2005 10:23:05 +0000 Subject: flite: - add configure-with-audio patch courtesy Patrick Ohly - reorder metadata - set Patrick Ohly as maintainer of this package --- packages/flite/flite-1.2/configure-with-audio.patch | 20 ++++++++++++++++++++ packages/flite/flite_1.2.bb | 11 ++++++----- 2 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 packages/flite/flite-1.2/configure-with-audio.patch diff --git a/packages/flite/flite-1.2/configure-with-audio.patch b/packages/flite/flite-1.2/configure-with-audio.patch new file mode 100644 index 0000000000..4f320ac068 --- /dev/null +++ b/packages/flite/flite-1.2/configure-with-audio.patch @@ -0,0 +1,20 @@ +*** flite-1.2-release/configure.in~ Tue Feb 18 01:45:45 2003 +--- flite-1.2-release/configure.in Mon Jul 18 22:01:25 2005 +*************** +*** 144,150 **** + dnl + AC_ARG_WITH( audio, + [ --with-audio with specific audio support (none linux freebsd etc) ], +! AUDIODRIVER=$with_audio ) + + if test "x$AUDIODEFS" = x; then + case "$AUDIODRIVER" in +--- 144,151 ---- + dnl + AC_ARG_WITH( audio, + [ --with-audio with specific audio support (none linux freebsd etc) ], +! [AUDIODRIVER=$with_audio +! AUDIODEFS=]) + + if test "x$AUDIODEFS" = x; then + case "$AUDIODRIVER" in diff --git a/packages/flite/flite_1.2.bb b/packages/flite/flite_1.2.bb index b8696fd829..c9a3e71e92 100644 --- a/packages/flite/flite_1.2.bb +++ b/packages/flite/flite_1.2.bb @@ -1,14 +1,15 @@ -SECTION = "console/utils" -HOMEPAGE = "http://fife.speech.cs.cmu.edu/flite/" -DESCRIPTION = "festival light speech synthesizer" +DESCRIPTION = "flite - the festival light speech synthesizer" PRIORITY = "optional" +HOMEPAGE = "http://fife.speech.cs.cmu.edu/flite/" +SECTION = "console/utils" LICENSE = "flite" -MAINTAINER = "Michael 'Mickey' Lauer " -PR = "r1" +MAINTAINER = "Patrick Ohly " +PR = "r2" PARALLEL_MAKE = "" SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.bz2 \ + file://configure-with-audio.patch;patch=1 \ file://fix-read-only-assignments.patch;patch=1" S = "${WORKDIR}/flite-${PV}-release" -- cgit v1.2.3 From c2d1bcfad1cff2741d507bf276702ee145c9ee31 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 19 Jul 2005 10:37:33 +0000 Subject: put some sense into lzma-native NOTE: NEVER EVER call 'make' directly in OE - use oe_runmake and adjust CFLAGS as necessary --- packages/lzma/lzma-native_4.17.bb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/lzma/lzma-native_4.17.bb b/packages/lzma/lzma-native_4.17.bb index a47cd1d8da..174ed700e4 100644 --- a/packages/lzma/lzma-native_4.17.bb +++ b/packages/lzma/lzma-native_4.17.bb @@ -1,19 +1,22 @@ DESCRIPTION = "LZMA is a general compression method. LZMA provides high compression ratio and very fast decompression." HOMEPAGE = "http://www.7-zip.org/" LICENSE = "LGPL" +PR = "r1" SRC_URI = "http://www.7-zip.org/dl/lzma417.tar.bz2 \ - file://lzma-406-zlib-stream.patch;patch=1" -S = "${WORKDIR}" + file://lzma-406-zlib-stream.patch;patch=1;pnum=2" +S = "${WORKDIR}/SRC" inherit native +CFLAGS += "-c -I${S}" + do_compile() { - make -C ${S}/SRC/7zip/Compress/LZMA_Alone - make -C ${S}/SRC/7zip/Compress/LZMA_Lib + oe_runmake -C 7zip/Compress/LZMA_Alone + oe_runmake -C 7zip/Compress/LZMA_Lib } do_stage () { - install -m 0755 ${S}/SRC/7zip/Compress/LZMA_Alone/lzma ${STAGING_BINDIR} - oe_libinstall -a ${S}/SRC/7zip/Compress/LZMA_Lib/liblzma ${STAGING_LIBDIR} + install -m 0755 7zip/Compress/LZMA_Alone/lzma ${STAGING_BINDIR} + oe_libinstall -a 7zip/Compress/LZMA_Lib/liblzma ${STAGING_LIBDIR} } -- cgit v1.2.3 From 09fb08598b5a2f396ff71ed1352ba9c0b82abb7f Mon Sep 17 00:00:00 2001 From: Patrick Steiner Date: Tue, 19 Jul 2005 11:03:18 +0000 Subject: added gaim 1.4.0 --- packages/gaim/files/desktop-name_1.4.0.patch | 11 +++++++++++ packages/gaim/gaim_1.4.0.bb | 9 +++++++++ 2 files changed, 20 insertions(+) create mode 100644 packages/gaim/files/desktop-name_1.4.0.patch create mode 100644 packages/gaim/gaim_1.4.0.bb diff --git a/packages/gaim/files/desktop-name_1.4.0.patch b/packages/gaim/files/desktop-name_1.4.0.patch new file mode 100644 index 0000000000..3cfaa5771e --- /dev/null +++ b/packages/gaim/files/desktop-name_1.4.0.patch @@ -0,0 +1,11 @@ +--- gaim-1.4.0/gaim.desktop.old 2005-07-15 00:58:50.000000000 +0200 ++++ gaim-1.4.0/gaim.desktop 2005-07-15 00:59:35.000000000 +0200 +@@ -7,7 +7,7 @@ + Terminal=false + Type=Application + +-Name=Gaim Internet Messenger ++Name=Gaim + Name[ca]=Missatger d'Internet Gaim + Name[cs]=Gaim Internet Messenger + Name[da]=Gaim - internet beskeder diff --git a/packages/gaim/gaim_1.4.0.bb b/packages/gaim/gaim_1.4.0.bb new file mode 100644 index 0000000000..ec55ea5b94 --- /dev/null +++ b/packages/gaim/gaim_1.4.0.bb @@ -0,0 +1,9 @@ +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ + file://desktop-name_1.4.0.patch;patch=1" + +include gaim.inc + +CFLAGS += "-D_GNU_SOURCE" + -- cgit v1.2.3 From f1d95e32a275db0688d04f2d6ac255b2fb1771ba Mon Sep 17 00:00:00 2001 From: Patrick Steiner Date: Tue, 19 Jul 2005 11:27:55 +0000 Subject: added sylpheed 2.0.0beta6 --- .../files/sylpheed-gnutls_2.0.0beta6.patch | 92 ++++++++++++++++++++++ packages/sylpheed/sylpheed_2.0.0beta6.bb | 30 +++++++ 2 files changed, 122 insertions(+) create mode 100644 packages/sylpheed/files/sylpheed-gnutls_2.0.0beta6.patch create mode 100644 packages/sylpheed/sylpheed_2.0.0beta6.bb diff --git a/packages/sylpheed/files/sylpheed-gnutls_2.0.0beta6.patch b/packages/sylpheed/files/sylpheed-gnutls_2.0.0beta6.patch new file mode 100644 index 0000000000..b0a03c6a32 --- /dev/null +++ b/packages/sylpheed/files/sylpheed-gnutls_2.0.0beta6.patch @@ -0,0 +1,92 @@ +--- sylpheed-2.0.0beta6/config.h.in.old 2005-07-18 11:57:23.000000000 +0200 ++++ sylpheed-2.0.0beta6/config.h.in 2005-07-18 11:59:57.000000000 +0200 +@@ -263,6 +263,9 @@ + /* Define to 1 if your declares `struct tm'. */ + #undef TM_IN_SYS_TIME + ++/* Define if you use GnuTLS to support SSL. */ ++#undef USE_GNUTLS ++ + /* Define if you use GPGME to support OpenPGP. */ + #undef USE_GPGME + +@@ -273,6 +276,9 @@ + #undef USE_LDAP + + /* Define if you use OpenSSL to support SSL. */ ++#undef USE_OPENSSL ++ ++/* Define if SSL is supported. */ + #undef USE_SSL + + /* Whether to use multithread or not */ +--- sylpheed-2.0.0beta6/configure.in.old 2005-07-18 12:00:24.000000000 +0200 ++++ sylpheed-2.0.0beta6/configure.in 2005-07-18 12:04:33.000000000 +0200 +@@ -202,7 +202,8 @@ + #include + ], [ return OPENSSL_VERSION_NUMBER; ], + [ AC_MSG_RESULT(yes) +- AC_DEFINE(USE_SSL, 1, Define if you use OpenSSL to support SSL.) ], ++ AC_DEFINE(USE_SSL, 1, Define if SSL is supported.) ++ AC_DEFINE(USE_OPENSSL, 1, Define if you use OpenSSL to support SSL.) ], + [ AC_MSG_RESULT(no) + LIBS="$ac_save_LIBS" + ac_cv_enable_ssl=no ]) +@@ -211,6 +212,27 @@ + AC_MSG_RESULT(no) + fi + ++AC_ARG_ENABLE(gnutls, ++ [ --enable-gnutls Enable SSL support using GnuTLS [default=no]], ++ [ac_cv_enable_gnutls=$enableval], [ac_cv_enable_gnutls=no]) ++AC_MSG_CHECKING([whether to use GnuTLS]) ++if test $ac_cv_enable_gnutls = yes; then ++ AC_MSG_RESULT(yes) ++ AC_MSG_CHECKING([if GnuTLS is available]) ++ LIBS="$LIBS -lgnutls-openssl" ++ AC_TRY_LINK([ ++#include ++], [ return OPENSSL_VERSION_NUMBER; ], ++ [ AC_MSG_RESULT(yes) ++ AC_DEFINE(USE_SSL, 1, Define if SSL is supported.) ++ AC_DEFINE(USE_GNUTLS, 1, Define if you use GnuTLS to support SSL.) ], ++ [ AC_MSG_RESULT(no) ++ LIBS="$ac_save_LIBS" ++ ac_cv_enable_gnutls=no ]) ++else ++ AC_MSG_RESULT(no) ++fi ++ + dnl Check for X-Face support + AC_ARG_ENABLE(compface, + [ --disable-compface Do not use compface (X-Face)], +@@ -350,6 +372,7 @@ + echo "JPilot : $ac_cv_enable_jpilot" + echo "LDAP : $ac_cv_enable_ldap" + echo "OpenSSL : $ac_cv_enable_ssl" ++echo "GnuTLS : $ac_cv_enable_gnutls" + echo "iconv : $am_cv_func_iconv" + echo "compface : $ac_cv_enable_compface" + echo "IPv6 : $ac_cv_enable_ipv6" +--- sylpheed-2.0.0beta6/src/ssl.h.old 2005-07-18 12:09:35.000000000 +0200 ++++ sylpheed-2.0.0beta6/src/ssl.h 2005-07-18 12:11:15.000000000 +0200 +@@ -27,11 +27,19 @@ + #if USE_SSL + + #include ++#if USE_OPENSSL + #include + #include + #include + #include + #include ++#else ++#if USE_GNUTLS ++#include ++#else ++#error Must select either GnuTLS or OpenSSL ++#endif ++#endif + + #include "socket.h" + diff --git a/packages/sylpheed/sylpheed_2.0.0beta6.bb b/packages/sylpheed/sylpheed_2.0.0beta6.bb new file mode 100644 index 0000000000..4fab8e8bb8 --- /dev/null +++ b/packages/sylpheed/sylpheed_2.0.0beta6.bb @@ -0,0 +1,30 @@ +SECTION = "x11/network" +DESCRIPTION = "Mail user agent" +DEPENDS = "gtk+ gpgme gnutls" +MAINTAINER = "Phil Blundell " +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.0beta/sylpheed-2.0.0beta6.tar.bz2 \ + file://sylpheed-gnutls_2.0.0beta6.patch;patch=1" + +FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" +FILES_${PN}-doc += "${datadir}" + +EXTRA_OECONF = "--enable-gnutls" + +CFLAGS += "-D_GNU_SOURCE" + +do_configure_prepend() { + mkdir -p m4 +} + +inherit autotools + +do_install_append() { + install -d ${D}${datadir}/applications + install -m 0644 sylpheed.desktop ${D}${datadir}/applications/ + install -d ${D}${datadir}/pixmaps + install -m 0644 sylpheed.png ${D}${datadir}/pixmaps/ +} + -- cgit v1.2.3 From a6f5f86d2c6f1ed05ab471bbc719f5365efa1e7a Mon Sep 17 00:00:00 2001 From: Patrick Steiner Date: Tue, 19 Jul 2005 12:06:54 +0000 Subject: added ggme 1.0.3 (required for sylpheed 2.0.0beta6) --- packages/gpgme/gpgme_1.0.3.bb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 packages/gpgme/gpgme_1.0.3.bb diff --git a/packages/gpgme/gpgme_1.0.3.bb b/packages/gpgme/gpgme_1.0.3.bb new file mode 100644 index 0000000000..8292991a89 --- /dev/null +++ b/packages/gpgme/gpgme_1.0.3.bb @@ -0,0 +1,22 @@ +LICENSE = "GPL" +SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.gz" +PR = "r1" + +DEPENDS = "libgpg-error pth libassuan" + +EXTRA_OECONF = "--with-pth=${STAGING_DIR}/${HOST_SYS} --without-pth-test --with-gpg=${bindir}/gpg --without-gpgsm" + +inherit autotools binconfig + +do_stage() { + autotools_stage_includes + + install -d ${STAGING_LIBDIR} + oe_libinstall -C gpgme -so libgpgme ${STAGING_LIBDIR} + oe_libinstall -C gpgme -so libgpgme-pth ${STAGING_LIBDIR} + oe_libinstall -C gpgme -so libgpgme-pthread ${STAGING_LIBDIR} + + install -d ${STAGING_DATADIR}/aclocal + install -m 0644 gpgme/gpgme.m4 ${STAGING_DATADIR}/aclocal/ +} + -- cgit v1.2.3 From aa33ec8c089b6e0ed964f3f345e73c6fe9f4ba38 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 19 Jul 2005 14:44:26 +0000 Subject: Support for disabling irq debug messages - slugbug 109. This allows a simple local.conf change to re-enable the debug messages simply by setting CMDLINE_DEBUG to "" --- conf/distro/openslug.conf | 6 ++++++ packages/linux/nslu2-kernel.inc | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 33e655dcb6..4d4f9de837 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -32,6 +32,12 @@ EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${OPENSLUG_DE OPENSLUG_EXTRA_DEPENDS ?= "e2fsprogs reiserfsprogs upslug-native lrzsz" +# CMDLINE* macros define the kernel command line. CMDLINE_DEBUG is provided +# to enable/disable debugging in the distro. Here noirqdebug is used to +# remove the messages about unhandled interrupts - people debugging interrupt +# issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf) +CMDLINE_DEBUG = "noirqdebug" + # Filesystem support modules are listed in here for easy removal, # as is the lrzsz serial package and other kernel modules which are # not absolutely required for boot. diff --git a/packages/linux/nslu2-kernel.inc b/packages/linux/nslu2-kernel.inc index 44f466ef49..f5d7135c88 100644 --- a/packages/linux/nslu2-kernel.inc +++ b/packages/linux/nslu2-kernel.inc @@ -211,10 +211,12 @@ inherit kernel ARCH = "arm" KERNEL_IMAGETYPE = "zImage" -# To specify the console set KERNEL_CONSOLE in the .bb -# file. The default is currently set in machine/nslu2.conf +# To specify the console set KERNEL_CONSOLE in the .bb file. +# CMDLINE_ROOT contains the boot options CMDLINE_ROOT ?= "root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc reboot=s" -CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}" +# Add distro specific debug (or non-debug) options to this +CMDLINE_DEBUG ?= "" +CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_DEBUG} ${CMDLINE_CONSOLE}" # Add the architecture compiler flags to KERNEL_CC and KERNEL_LD as # required. Notice that this has to be done for each separately built -- cgit v1.2.3