summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/include/angstrom-2007-preferred-versions.inc3
-rw-r--r--packages/binutils/binutils-2.18/binutils-2.16.1-e300c2c3.patch19
-rw-r--r--packages/binutils/binutils_2.18.bb6
-rw-r--r--packages/linux/linux-ezx_2.6.21.bb6
-rw-r--r--packages/linux/linux-rp_2.6.21.bb2
-rw-r--r--packages/xorg-app/mkfontscale-native_1.0.3.bb (renamed from packages/mkfontscale-native_1.0.3.bb)0
-rw-r--r--packages/xorg-app/mkfontscale_1.0.3.bb (renamed from packages/mkfontscale_1.0.3.bb)0
7 files changed, 31 insertions, 5 deletions
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index 0695c8cc3a..61560e3c44 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -668,7 +668,6 @@ PREFERRED_VERSION_hildon-libs ?= "0.15.1"
PREFERRED_VERSION_hildon-navigator ?= "0.9.6-2"
PREFERRED_VERSION_hildon-status-bar ?= "0.8.11-1"
PREFERRED_VERSION_hildon-thumbnail ?= "0.11"
-PREFERRED_VERSION_hnb ?= "1.9.17"
PREFERRED_VERSION_hostap-conf ?= "1.0"
PREFERRED_VERSION_hostap-daemon ?= "0.4.4"
PREFERRED_VERSION_hostap-modules ?= "0.4.7"
@@ -1232,7 +1231,7 @@ PREFERRED_VERSION_miau ?= "0.5.3"
PREFERRED_VERSION_micro-emacs ?= "20060909"
PREFERRED_VERSION_microcom ?= "1.02"
PREFERRED_VERSION_microwindows ?= "0.90"
-PREFERRED_VERSION_midori ?= "0.0.8"
+PREFERRED_VERSION_midori ?= "0.0.10"
PREFERRED_VERSION_midpath ?= "0.1"
PREFERRED_VERSION_midpath-alsa ?= "0.1"
PREFERRED_VERSION_midpath-cldc ?= "0.1"
diff --git a/packages/binutils/binutils-2.18/binutils-2.16.1-e300c2c3.patch b/packages/binutils/binutils-2.18/binutils-2.16.1-e300c2c3.patch
new file mode 100644
index 0000000000..c5e4234f22
--- /dev/null
+++ b/packages/binutils/binutils-2.18/binutils-2.16.1-e300c2c3.patch
@@ -0,0 +1,19 @@
+Adds support for Freescale Power architecture e300c2 and e300c3 cores.
+http://www.bitshrine.org/gpp/tc-fsl-x86lnx-e300c3-nptl-4.0.2-2.src.rpm
+
+Leon Woestenberg <leonw@mailcan.com>
+
+diff -uNr binutils-2.16.1.orig/gas/config/tc-ppc.c binutils-2.16.1/gas/config/tc-ppc.c
+--- binutils-2.16.1.orig/gas/config/tc-ppc.c 2005-03-02 13:24:01.000000000 +0000
++++ binutils-2.16.1/gas/config/tc-ppc.c 2006-07-04 11:45:24.000000000 +0100
+@@ -879,6 +879,10 @@
+ else
+ ppc_cpu |= PPC_OPCODE_SPE;
+ }
++ else if (strcmp (arg, "pmr") == 0)
++ {
++ ppc_cpu |= PPC_OPCODE_PMR;
++ }
+ /* -mppc64 and -m620 mean to assemble for the 64-bit PowerPC
+ 620. */
+ else if (strcmp (arg, "ppc64") == 0 || strcmp (arg, "620") == 0)
diff --git a/packages/binutils/binutils_2.18.bb b/packages/binutils/binutils_2.18.bb
index 78000c7af6..b6a230cb18 100644
--- a/packages/binutils/binutils_2.18.bb
+++ b/packages/binutils/binutils_2.18.bb
@@ -1,3 +1,5 @@
+PR = "r1"
+
require binutils.inc
SRC_URI = "\
@@ -10,3 +12,7 @@ SRC_URI = "\
file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
"
+
+# powerpc patches
+SRC_URI += "file://binutils-2.16.1-e300c2c3.patch;patch=1"
+
diff --git a/packages/linux/linux-ezx_2.6.21.bb b/packages/linux/linux-ezx_2.6.21.bb
index db561a7f0d..7ba2556bb8 100644
--- a/packages/linux/linux-ezx_2.6.21.bb
+++ b/packages/linux/linux-ezx_2.6.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and
AUTHOR = "The OpenEZX Team <openezx-devel@lists.openezx.org>"
HOMEPAGE = "http://www.openezx.org"
EZX = "ezxdev"
-PR = "${EZX}-r23"
+PR = "${EZX}-r24"
require linux.inc
@@ -92,8 +92,8 @@ COMPATIBLE_MACHINE = '(a780|e680|a1200|rorkre2|rokre6)'
#CMDLINE_CON = "console=ttyS2,115200n8 console=tty1 "
CMDLINE_CON = "console=tty1 "
-CMDLINE_ROOT = "root=/dev/mmcblk0p2 rootfstype=ext2 rootdelay=5"
-CMDLINE_NFSROOT = "root=/dev/nfs rootfstype=nfs nfsroot=192.168.0.200:/export/ezx-image rootdelay=5 "
+CMDLINE_ROOT = "root=/dev/mmcblk0p2 rootfstype=ext2 rootdelay=1"
+CMDLINE_NFSROOT = "root=/dev/nfs rootfstype=nfs nfsroot=192.168.0.200:/export/ezx-image rootdelay=1 "
# Uncomment to enable dyntick
#CMDLINE_OTHER = "dyntick=enable"
CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'
diff --git a/packages/linux/linux-rp_2.6.21.bb b/packages/linux/linux-rp_2.6.21.bb
index 3f155942e9..795e727ed3 100644
--- a/packages/linux/linux-rp_2.6.21.bb
+++ b/packages/linux/linux-rp_2.6.21.bb
@@ -2,6 +2,8 @@ require linux-rp.inc
PR = "r10"
+DEFAULT_PREFERENCE_collie = "1"
+
# Handy URLs
# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
# http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2
diff --git a/packages/mkfontscale-native_1.0.3.bb b/packages/xorg-app/mkfontscale-native_1.0.3.bb
index 0b3578ec11..0b3578ec11 100644
--- a/packages/mkfontscale-native_1.0.3.bb
+++ b/packages/xorg-app/mkfontscale-native_1.0.3.bb
diff --git a/packages/mkfontscale_1.0.3.bb b/packages/xorg-app/mkfontscale_1.0.3.bb
index 2f5eab7d63..2f5eab7d63 100644
--- a/packages/mkfontscale_1.0.3.bb
+++ b/packages/xorg-app/mkfontscale_1.0.3.bb