summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/altboot/altboot_1.1.1+wip-SVNR48.bb (renamed from packages/altboot/altboot_1.1.1+wip-SVNR44.bb)4
-rw-r--r--packages/altboot/altboot_svn.bb4
-rw-r--r--packages/blueprobe/blueprobe-0.18/uclibc-fix.patch30
-rw-r--r--packages/blueprobe/blueprobe_0.18.bb5
-rw-r--r--packages/bluez/bluez-utils/uclibc-fix.patch46
-rw-r--r--packages/bluez/bluez-utils_3.9.bb4
-rw-r--r--packages/evince/evince_0.9.0.bb2
-rw-r--r--packages/gcc/gcc-cross-sdk_4.1.2.bb1
-rw-r--r--packages/gcc/gcc4-build-sdk.inc2
-rw-r--r--packages/grep/grep-2.5.1/.mtn2git_empty0
-rw-r--r--packages/grep/grep-2.5.1/uclibc-fix.patch52
-rw-r--r--packages/grep/grep-native_2.5.1.bb2
-rw-r--r--packages/grep/grep_2.5.1.bb5
-rw-r--r--packages/pimlico/dates_0.4.2.bb2
-rw-r--r--packages/pimlico/tasks_0.4.bb2
15 files changed, 149 insertions, 12 deletions
diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR44.bb b/packages/altboot/altboot_1.1.1+wip-SVNR48.bb
index 34c8c7a3b6..244b8950aa 100644
--- a/packages/altboot/altboot_1.1.1+wip-SVNR44.bb
+++ b/packages/altboot/altboot_1.1.1+wip-SVNR48.bb
@@ -15,7 +15,7 @@ LICENSE = "GPL"
RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools"
RRECOMMENDS_${PN}_append_akita = " kexec-tools"
-RRECOMMENDS_${PN}_append_spitz = " kexec-tools"
+RRECOMMENDS_${PN}_append_spitz = " kexec-tools kernel-module-jffs2"
RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools"
RDEPENDS_${PN} = "${PN}-conf"
@@ -23,7 +23,7 @@ RDEPENDS_${PN}-conf = "${PN}"
######################################################################################
-SVN_REV = "44"
+SVN_REV = "48"
PR = "r0"
######################################################################################
diff --git a/packages/altboot/altboot_svn.bb b/packages/altboot/altboot_svn.bb
index ef77412d08..6de92bf420 100644
--- a/packages/altboot/altboot_svn.bb
+++ b/packages/altboot/altboot_svn.bb
@@ -15,7 +15,7 @@ LICENSE = "GPL"
RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools"
RRECOMMENDS_${PN}_append_akita = " kexec-tools"
-RRECOMMENDS_${PN}_append_spitz = " kexec-tools"
+RRECOMMENDS_${PN}_append_spitz = " kexec-tools kernel-module-jffs2"
RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools"
RDEPENDS_${PN} = "${PN}-conf"
@@ -24,7 +24,7 @@ RDEPENDS_${PN}-conf = "${PN}"
######################################################################################
PV = "1.1.1+wip-${SRCDATE}"
-PR = "r1"
+PR = "r2"
######################################################################################
diff --git a/packages/blueprobe/blueprobe-0.18/uclibc-fix.patch b/packages/blueprobe/blueprobe-0.18/uclibc-fix.patch
new file mode 100644
index 0000000000..34a1711e60
--- /dev/null
+++ b/packages/blueprobe/blueprobe-0.18/uclibc-fix.patch
@@ -0,0 +1,30 @@
+Uclibc doesn't define or support speeds above 115200. So check the existence
+of the defines before allowing them to actually be used.
+
+Index: blueprobe-0.18/blueprobe.c
+===================================================================
+--- blueprobe-0.18.orig/blueprobe.c 2006-10-12 20:33:01.000000000 +1000
++++ blueprobe-0.18/blueprobe.c 2007-05-17 12:29:20.000000000 +1000
+@@ -25,14 +25,22 @@
+ return B57600;
+ case 115200:
+ return B115200;
++#ifdef B230400
+ case 230400:
+ return B230400;
++#endif
++#ifdef B460800
+ case 460800:
+ return B460800;
++#endif
++#ifdef B921600
+ case 921600:
+ return B921600;
++#endif
++#ifdef B1000000
+ case 1000000:
+ return B1000000;
++#endif
+ default:
+ return B57600;
+ }
diff --git a/packages/blueprobe/blueprobe_0.18.bb b/packages/blueprobe/blueprobe_0.18.bb
index ca455401e0..5db1bc4337 100644
--- a/packages/blueprobe/blueprobe_0.18.bb
+++ b/packages/blueprobe/blueprobe_0.18.bb
@@ -1,5 +1,6 @@
require blueprobe.inc
-PR = "r1"
+PR = "r2"
-SRC_URI += "file://h4000.patch;patch=1"
+SRC_URI += "file://h4000.patch;patch=1 \
+ file://uclibc-fix.patch;patch=1"
diff --git a/packages/bluez/bluez-utils/uclibc-fix.patch b/packages/bluez/bluez-utils/uclibc-fix.patch
new file mode 100644
index 0000000000..6d4753c2e5
--- /dev/null
+++ b/packages/bluez/bluez-utils/uclibc-fix.patch
@@ -0,0 +1,46 @@
+Uclibc doesn't define or support speeds above 115200. So check the existence
+of the defines before allowing them to actually be used.
+
+Index: bluez-utils-3.9/tools/hciattach.c
+===================================================================
+--- bluez-utils-3.9.orig/tools/hciattach.c 2007-05-17 12:34:28.000000000 +1000
++++ bluez-utils-3.9/tools/hciattach.c 2007-05-17 12:40:20.000000000 +1000
+@@ -105,22 +105,38 @@
+ return B57600;
+ case 115200:
+ return B115200;
++#ifdef B230400
+ case 230400:
+ return B230400;
++#endif
++#ifdef B460800
+ case 460800:
+ return B460800;
++#endif
++#ifdef B500000
+ case 500000:
+ return B500000;
++#endif
++#ifdef B576000
+ case 576000:
+ return B576000;
++#endif
++#ifdef B921600
+ case 921600:
+ return B921600;
++#endif
++#ifdef B1000000
+ case 1000000:
+ return B1000000;
++#endif
++#ifdef B1152000
+ case 1152000:
+ return B1152000;
++#endif
++#ifdef B1500000
+ case 1500000:
+ return B1500000;
++#endif
+ default:
+ return B57600;
+ }
diff --git a/packages/bluez/bluez-utils_3.9.bb b/packages/bluez/bluez-utils_3.9.bb
index fba32e08e6..60b5becd99 100644
--- a/packages/bluez/bluez-utils_3.9.bb
+++ b/packages/bluez/bluez-utils_3.9.bb
@@ -2,9 +2,11 @@ require bluez-utils.inc
PACKAGES =+ "${PN}-ciptool"
+SRC_URI += "file://uclibc-fix.patch;patch=1"
+
FILES_${PN}-ciptool = "/bin/ciptool"
RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool"
RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus"
-PR = "r4"
+PR = "r5"
diff --git a/packages/evince/evince_0.9.0.bb b/packages/evince/evince_0.9.0.bb
index 40494aa402..8689d1d371 100644
--- a/packages/evince/evince_0.9.0.bb
+++ b/packages/evince/evince_0.9.0.bb
@@ -4,7 +4,7 @@ SECTION = "x11/office"
DEPENDS = "tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring "
RDEPENDS = "espgs "
RRECOMMENDS = "gnome-vfs-plugin-file"
-PR = "r0"
+PR = "r1"
inherit gnome pkgconfig gtk-icon-cache
diff --git a/packages/gcc/gcc-cross-sdk_4.1.2.bb b/packages/gcc/gcc-cross-sdk_4.1.2.bb
index f3968f512d..c95c2e5953 100644
--- a/packages/gcc/gcc-cross-sdk_4.1.2.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.2.bb
@@ -27,7 +27,6 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 \
file://602-sdk-libstdc++-includes.patch;patch=1 \
file://740-sh-pr24836.patch;patch=1 \
file://800-arm-bigendian.patch;patch=1 \
- file://801-arm-bigendian-eabi.patch;patch=1 \
file://arm-nolibfloat.patch;patch=1 \
file://arm-softfloat.patch;patch=1 \
file://gcc41-configure.in.patch;patch=1 \
diff --git a/packages/gcc/gcc4-build-sdk.inc b/packages/gcc/gcc4-build-sdk.inc
index 86aa566e5c..b75e8a57c9 100644
--- a/packages/gcc/gcc4-build-sdk.inc
+++ b/packages/gcc/gcc4-build-sdk.inc
@@ -1,4 +1,6 @@
USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
+USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}'
+
STAGING_TARGET_INCDIR = "${STAGING_DIR}/${TARGET_SYS}/include"
STAGING_TARGET_LIBDIR = "${STAGING_DIR}/${TARGET_SYS}/lib"
diff --git a/packages/grep/grep-2.5.1/.mtn2git_empty b/packages/grep/grep-2.5.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/grep/grep-2.5.1/.mtn2git_empty
diff --git a/packages/grep/grep-2.5.1/uclibc-fix.patch b/packages/grep/grep-2.5.1/uclibc-fix.patch
new file mode 100644
index 0000000000..f67177f6ab
--- /dev/null
+++ b/packages/grep/grep-2.5.1/uclibc-fix.patch
@@ -0,0 +1,52 @@
+Fix to use mempcpy instead of __mempcpy. This is needed for uclibc which
+doesn't define __mempcpy only mempcpy. Since both uclibc and glibc have
+mempcpy we'll just use that instead.
+
+Index: grep-2.5.1/intl/localealias.c
+===================================================================
+--- grep-2.5.1.orig/intl/localealias.c 2002-03-14 00:39:06.000000000 +1100
++++ grep-2.5.1/intl/localealias.c 2007-05-17 13:53:58.000000000 +1000
+@@ -65,7 +65,7 @@
+ # define strcasecmp __strcasecmp
+
+ # ifndef mempcpy
+-# define mempcpy __mempcpy
++# error "mempcpy not detected"
+ # endif
+ # define HAVE_MEMPCPY 1
+ # define HAVE___FSETLOCKING 1
+Index: grep-2.5.1/lib/getopt.c
+===================================================================
+--- grep-2.5.1.orig/lib/getopt.c 2001-03-04 16:33:12.000000000 +1100
++++ grep-2.5.1/lib/getopt.c 2007-05-17 13:51:44.000000000 +1000
+@@ -326,7 +326,7 @@
+ nonoption_flags_len = nonoption_flags_max_len = 0;
+ else
+ {
+- memset (__mempcpy (new_str, __getopt_nonoption_flags,
++ memset (mempcpy (new_str, __getopt_nonoption_flags,
+ nonoption_flags_max_len),
+ '\0', top + 1 - nonoption_flags_max_len);
+ nonoption_flags_max_len = top + 1;
+@@ -437,7 +437,7 @@
+ if (__getopt_nonoption_flags == NULL)
+ nonoption_flags_max_len = -1;
+ else
+- memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
++ memset (mempcpy (__getopt_nonoption_flags, orig_str, len),
+ '\0', nonoption_flags_max_len - len);
+ }
+ }
+Index: grep-2.5.1/lib/regex.c
+===================================================================
+--- grep-2.5.1.orig/lib/regex.c 2001-04-03 04:04:45.000000000 +1000
++++ grep-2.5.1/lib/regex.c 2007-05-17 13:51:48.000000000 +1000
+@@ -7842,7 +7842,7 @@
+ if (msg_size > errbuf_size)
+ {
+ #if defined HAVE_MEMPCPY || defined _LIBC
+- *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
++ *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
+ #else
+ memcpy (errbuf, msg, errbuf_size - 1);
+ errbuf[errbuf_size - 1] = 0;
diff --git a/packages/grep/grep-native_2.5.1.bb b/packages/grep/grep-native_2.5.1.bb
index cacd675928..abc2ea46cb 100644
--- a/packages/grep/grep-native_2.5.1.bb
+++ b/packages/grep/grep-native_2.5.1.bb
@@ -9,3 +9,5 @@ do_stage () {
install -m 755 src/egrep ${STAGING_BINDIR}
install -m 755 src/fgrep ${STAGING_BINDIR}
}
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/grep-${PV}"
diff --git a/packages/grep/grep_2.5.1.bb b/packages/grep/grep_2.5.1.bb
index 7bcabef167..6d184b8c4c 100644
--- a/packages/grep/grep_2.5.1.bb
+++ b/packages/grep/grep_2.5.1.bb
@@ -1,9 +1,10 @@
LICENSE = "GPL"
SECTION = "console/utils"
DESCRIPTION = "grep GNU utility"
-PR = "r1"
+PR = "r2"
-SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2"
+SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
+ file://uclibc-fix.patch;patch=1"
inherit autotools
diff --git a/packages/pimlico/dates_0.4.2.bb b/packages/pimlico/dates_0.4.2.bb
index d7f0185b86..51d3acc9ed 100644
--- a/packages/pimlico/dates_0.4.2.bb
+++ b/packages/pimlico/dates_0.4.2.bb
@@ -1,3 +1,5 @@
require dates.inc
+PR = "r1"
+
SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz"
diff --git a/packages/pimlico/tasks_0.4.bb b/packages/pimlico/tasks_0.4.bb
index 9601abae47..391828430a 100644
--- a/packages/pimlico/tasks_0.4.bb
+++ b/packages/pimlico/tasks_0.4.bb
@@ -1,6 +1,6 @@
require tasks.inc
-PR = "r1"
+PR = "r2"
SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \
file://tasks-single.diff;patch=1"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 22:23:24 +0000