Merge nslu2-linux@nslu2-linux.bkbits.net:openembedded

into giantshoulder.com:/home/tom/dev/openslug/openembedded

2005/03/12 03:41:05-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/12 12:27:12+01:00 (none)!koen
local.conf.sample:
  note on leading spaces

2005/03/12 11:43:28+01:00 (none)!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into lieve.(none):/data/build/oe/clean-tree/openembedded

2005/03/12 11:43:02+01:00 (none)!koen
libmatchbox_svn.bb:
  update to 1.6

2005/03/11 19:41:18-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/11 21:57:25-05:00 handhelds.org!kergoth
Gcc 3.4.0, 3.4.1, 3.4.2:
  * Remove old versions.

Gcc 3.4.3:
  * Adjust the gcc build to patch away the STMP_FIXINC/STMP_FIXPERM screwup when not setting --with-sysroot, and stop passing --with-sysroot .. setting it was resulting in our g++ binary adding -L/lib and -L /usr/lib to its link lines, which caused lots of problems.

2005/03/11 16:41:04-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/11 13:41:54-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/11 12:41:05-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/11 11:41:06-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

BKrev: 4232fb4bz0F18QK-4Xxxw237qdrUng

54 files changed, 10 insertions, 126 deletions

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 245cffa2e8..4ff306d79d 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -9,8 +9,11 @@
 #
 # Once you have done that, remove the line at the end of this
 # file and build away.
+# 
+# WARNING: lines starting with a space (' ') will result in parse failures.
+# Remove '# ' from commented lines to activate them.
 #
-# NOTE: Do NOT use ~ in your paths, BitBake does NOT expand ~ for you.  If you
+# NOTE: Do NOT use $HOME in your paths, BitBake does NOT expand ~ for you.  If you
 # must have paths relative to your homedir use ${HOME} (note the {}'s there
 # you MUST have them for the variable expansion to be done by BitBake).  Your
 # paths should all be absolute paths (They should all start with a / after
diff --git a/packages/gcc/gcc-3.4.0/gcc-3.4.0-arm-bigendian.patch b/packages/gcc/gcc-3.4.0/gcc-3.4.0-arm-bigendian.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.0/gcc-3.4.0-arm-bigendian.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.0/gcc-3.4.0-arm-lib1asm.patch b/packages/gcc/gcc-3.4.0/gcc-3.4.0-arm-lib1asm.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.0/gcc-3.4.0-arm-lib1asm.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.0/gcc-3.4.0-arm-nolibfloat.patch b/packages/gcc/gcc-3.4.0/gcc-3.4.0-arm-nolibfloat.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.0/gcc-3.4.0-arm-nolibfloat.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.0/gcc-uclibc-3.4.0-100-conf.patch b/packages/gcc/gcc-3.4.0/gcc-uclibc-3.4.0-100-conf.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.0/gcc-uclibc-3.4.0-100-conf.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.0/gcc-uclibc-3.4.0-120-softfloat.patch b/packages/gcc/gcc-3.4.0/gcc-uclibc-3.4.0-120-softfloat.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.0/gcc-uclibc-3.4.0-120-softfloat.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.0/gcc-uclibc-3.4.0-200-code.patch b/packages/gcc/gcc-3.4.0/gcc-uclibc-3.4.0-200-code.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.0/gcc-uclibc-3.4.0-200-code.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.0/gcc34-15089.patch b/packages/gcc/gcc-3.4.0/gcc34-15089.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.0/gcc34-15089.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.0/gcc34-15666.patch b/packages/gcc/gcc-3.4.0/gcc34-15666.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.0/gcc34-15666.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.0/gcc34-arm-ldm-peephole.patch b/packages/gcc/gcc-3.4.0/gcc34-arm-ldm-peephole.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.0/gcc34-arm-ldm-peephole.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.0/gcc34-arm-ldm.patch b/packages/gcc/gcc-3.4.0/gcc34-arm-ldm.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.0/gcc34-arm-ldm.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.0/gcc34-arm-tune.patch b/packages/gcc/gcc-3.4.0/gcc34-arm-tune.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.0/gcc34-arm-tune.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.0/gcc34-pre-modify.patch b/packages/gcc/gcc-3.4.0/gcc34-pre-modify.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.0/gcc34-pre-modify.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.0/gcc34-reverse-compare.patch b/packages/gcc/gcc-3.4.0/gcc34-reverse-compare.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.0/gcc34-reverse-compare.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.1/gcc-3.4.0-arm-bigendian-uclibc.patch b/packages/gcc/gcc-3.4.1/gcc-3.4.0-arm-bigendian-uclibc.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.1/gcc-3.4.0-arm-bigendian-uclibc.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.1/gcc-3.4.0-arm-bigendian.patch b/packages/gcc/gcc-3.4.1/gcc-3.4.0-arm-bigendian.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.1/gcc-3.4.0-arm-bigendian.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.1/gcc-3.4.0-arm-lib1asm.patch b/packages/gcc/gcc-3.4.1/gcc-3.4.0-arm-lib1asm.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.1/gcc-3.4.0-arm-lib1asm.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.1/gcc-3.4.0-arm-nolibfloat.patch b/packages/gcc/gcc-3.4.1/gcc-3.4.0-arm-nolibfloat.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.1/gcc-3.4.0-arm-nolibfloat.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.1/gcc-3.4.1-uclibc-100-conf.patch b/packages/gcc/gcc-3.4.1/gcc-3.4.1-uclibc-100-conf.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.1/gcc-3.4.1-uclibc-100-conf.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.1/gcc-3.4.1-uclibc-200-locale.patch b/packages/gcc/gcc-3.4.1/gcc-3.4.1-uclibc-200-locale.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.1/gcc-3.4.1-uclibc-200-locale.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.1/gcc-uclibc-3.4.0-120-softfloat.patch b/packages/gcc/gcc-3.4.1/gcc-uclibc-3.4.0-120-softfloat.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.1/gcc-uclibc-3.4.0-120-softfloat.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.1/gcc34-arm-ldm-peephole.patch b/packages/gcc/gcc-3.4.1/gcc34-arm-ldm-peephole.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.1/gcc34-arm-ldm-peephole.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.1/gcc34-arm-ldm.patch b/packages/gcc/gcc-3.4.1/gcc34-arm-ldm.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.1/gcc34-arm-ldm.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.1/gcc34-arm-tune.patch b/packages/gcc/gcc-3.4.1/gcc34-arm-tune.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.1/gcc34-arm-tune.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.1/gcc34-reverse-compare.patch b/packages/gcc/gcc-3.4.1/gcc34-reverse-compare.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.1/gcc34-reverse-compare.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.1/sdk-libstdc++-includes.patch b/packages/gcc/gcc-3.4.1/sdk-libstdc++-includes.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.1/sdk-libstdc++-includes.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.2/gcc-3.4.0-arm-bigendian-uclibc.patch b/packages/gcc/gcc-3.4.2/gcc-3.4.0-arm-bigendian-uclibc.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.2/gcc-3.4.0-arm-bigendian-uclibc.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.2/gcc-3.4.0-arm-bigendian.patch b/packages/gcc/gcc-3.4.2/gcc-3.4.0-arm-bigendian.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.2/gcc-3.4.0-arm-bigendian.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.2/gcc-3.4.0-arm-lib1asm.patch b/packages/gcc/gcc-3.4.2/gcc-3.4.0-arm-lib1asm.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.2/gcc-3.4.0-arm-lib1asm.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.2/gcc-3.4.0-arm-nolibfloat.patch b/packages/gcc/gcc-3.4.2/gcc-3.4.0-arm-nolibfloat.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.2/gcc-3.4.0-arm-nolibfloat.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.2/gcc-3.4.0-arm-softfloat.patch b/packages/gcc/gcc-3.4.2/gcc-3.4.0-arm-softfloat.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.2/gcc-3.4.0-arm-softfloat.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.2/gcc-3.4.1-uclibc-100-conf.patch b/packages/gcc/gcc-3.4.2/gcc-3.4.1-uclibc-100-conf.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.2/gcc-3.4.1-uclibc-100-conf.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.2/gcc-3.4.1-uclibc-200-locale.patch b/packages/gcc/gcc-3.4.2/gcc-3.4.1-uclibc-200-locale.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.2/gcc-3.4.1-uclibc-200-locale.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.2/gcc-uclibc-3.4.0-120-softfloat.patch b/packages/gcc/gcc-3.4.2/gcc-uclibc-3.4.0-120-softfloat.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.2/gcc-uclibc-3.4.0-120-softfloat.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.2/gcc34-arm-ldm-peephole.patch b/packages/gcc/gcc-3.4.2/gcc34-arm-ldm-peephole.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.2/gcc34-arm-ldm-peephole.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.2/gcc34-arm-ldm.patch b/packages/gcc/gcc-3.4.2/gcc34-arm-ldm.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.2/gcc34-arm-ldm.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.2/gcc34-arm-tune.patch b/packages/gcc/gcc-3.4.2/gcc34-arm-tune.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.2/gcc34-arm-tune.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.2/gcc34-reverse-compare.patch b/packages/gcc/gcc-3.4.2/gcc34-reverse-compare.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.2/gcc34-reverse-compare.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.2/sdk-libstdc++-includes.patch b/packages/gcc/gcc-3.4.2/sdk-libstdc++-includes.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-3.4.2/sdk-libstdc++-includes.patch
+++ /dev/null
diff --git a/packages/gcc/gcc-3.4.0/gcc-3.4.0-arm-bigendian-uclibc.patch b/packages/gcc/gcc-3.4.3/always-fixincperm.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/gcc/gcc-3.4.0/gcc-3.4.0-arm-bigendian-uclibc.patch
+++ b/packages/gcc/gcc-3.4.3/always-fixincperm.patch
diff --git a/packages/gcc/gcc-cross-initial_3.4.1.bb b/packages/gcc/gcc-cross-initial_3.4.1.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-cross-initial_3.4.1.bb
+++ /dev/null
diff --git a/packages/gcc/gcc-cross-initial_3.4.2.bb b/packages/gcc/gcc-cross-initial_3.4.2.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-cross-initial_3.4.2.bb
+++ /dev/null
diff --git a/packages/gcc/gcc-cross-sdk_3.4.1.bb b/packages/gcc/gcc-cross-sdk_3.4.1.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-cross-sdk_3.4.1.bb
+++ /dev/null
diff --git a/packages/gcc/gcc-cross-sdk_3.4.2.bb b/packages/gcc/gcc-cross-sdk_3.4.2.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gcc/gcc-cross-sdk_3.4.2.bb
+++ /dev/null
diff --git a/packages/gcc/gcc-cross_3.4.0.bb b/packages/gcc/gcc-cross_3.4.0.bb
deleted file mode 100644
index a0fe4df120..0000000000
--- a/packages/gcc/gcc-cross_3.4.0.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-include gcc_${PV}.bb
-# path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
-inherit cross
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-# NOTE: split PR.  If the main .oe changes something that affects its *build*
-# remember to increment this one too.
-PR = "r6"
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
-
-# cross build
-include gcc3-cross-build.inc
-# cross packaging
-include gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_3.4.1.bb b/packages/gcc/gcc-cross_3.4.1.bb
deleted file mode 100644
index a0fe4df120..0000000000
--- a/packages/gcc/gcc-cross_3.4.1.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-include gcc_${PV}.bb
-# path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
-inherit cross
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-# NOTE: split PR.  If the main .oe changes something that affects its *build*
-# remember to increment this one too.
-PR = "r6"
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
-
-# cross build
-include gcc3-cross-build.inc
-# cross packaging
-include gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_3.4.2.bb b/packages/gcc/gcc-cross_3.4.2.bb
deleted file mode 100644
index a0fe4df120..0000000000
--- a/packages/gcc/gcc-cross_3.4.2.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-include gcc_${PV}.bb
-# path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
-inherit cross
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-# NOTE: split PR.  If the main .oe changes something that affects its *build*
-# remember to increment this one too.
-PR = "r6"
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
-
-# cross build
-include gcc3-cross-build.inc
-# cross packaging
-include gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_3.4.3.bb b/packages/gcc/gcc-cross_3.4.3.bb
index 54a0629a7b..460fecbf13 100644
--- a/packages/gcc/gcc-cross_3.4.3.bb
+++ b/packages/gcc/gcc-cross_3.4.3.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r9"
+PR = "r10"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc3-build.inc b/packages/gcc/gcc3-build.inc
index a54528cc75..f184767dd7 100644
--- a/packages/gcc/gcc3-build.inc
+++ b/packages/gcc/gcc3-build.inc
@@ -24,7 +24,7 @@ EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d,
                 ${EXTRA_OECONF_PATHS} \
                 ${EXTRA_OECONF_DEP}"
 
-EXTRA_OECONF_PATHS = "--with-sysroot=/ \
+EXTRA_OECONF_PATHS = " \
                       --with-local-prefix=${prefix}/local \
                       --with-gxx-include-dir=${includedir}/c++/${PV}"
 
diff --git a/packages/gcc/gcc_3.4.0.bb b/packages/gcc/gcc_3.4.0.bb
deleted file mode 100644
index 9f844cd0e1..0000000000
--- a/packages/gcc/gcc_3.4.0.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-PR = "r6"
-DESCRIPTION = "The GNU cc and gcc C compilers."
-HOMEPAGE = "http://www.gnu.org/software/gcc/"
-SECTION = "devel"
-LICENSE = "GPL"
-MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
-
-inherit autotools gettext
-
-include gcc-package.inc
-
-SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
-	   file://gcc34-reverse-compare.patch;patch=1 \
-	   file://gcc34-arm-ldm.patch;patch=1 \
-	   file://gcc34-arm-ldm-peephole.patch;patch=1 \
-	   file://gcc34-arm-tune.patch;patch=1 \
-	   file://gcc-3.4.1-uclibc-100-conf.patch;patch=1 \
-	   file://gcc-3.4.1-uclibc-200-locale.patch;patch=1 \
-	   file://gcc-3.4.0-arm-lib1asm.patch;patch=1 \
-	   file://gcc-3.4.0-arm-nolibfloat.patch;patch=1 \
-	   file://gcc-3.4.0-arm-bigendian.patch;patch=1 \
-	   file://gcc-3.4.0-arm-bigendian-uclibc.patch;patch=1"
-
-include gcc3-build.inc
diff --git a/packages/gcc/gcc_3.4.1.bb b/packages/gcc/gcc_3.4.1.bb
deleted file mode 100644
index 9f844cd0e1..0000000000
--- a/packages/gcc/gcc_3.4.1.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-PR = "r6"
-DESCRIPTION = "The GNU cc and gcc C compilers."
-HOMEPAGE = "http://www.gnu.org/software/gcc/"
-SECTION = "devel"
-LICENSE = "GPL"
-MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
-
-inherit autotools gettext
-
-include gcc-package.inc
-
-SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
-	   file://gcc34-reverse-compare.patch;patch=1 \
-	   file://gcc34-arm-ldm.patch;patch=1 \
-	   file://gcc34-arm-ldm-peephole.patch;patch=1 \
-	   file://gcc34-arm-tune.patch;patch=1 \
-	   file://gcc-3.4.1-uclibc-100-conf.patch;patch=1 \
-	   file://gcc-3.4.1-uclibc-200-locale.patch;patch=1 \
-	   file://gcc-3.4.0-arm-lib1asm.patch;patch=1 \
-	   file://gcc-3.4.0-arm-nolibfloat.patch;patch=1 \
-	   file://gcc-3.4.0-arm-bigendian.patch;patch=1 \
-	   file://gcc-3.4.0-arm-bigendian-uclibc.patch;patch=1"
-
-include gcc3-build.inc
diff --git a/packages/gcc/gcc_3.4.2.bb b/packages/gcc/gcc_3.4.2.bb
deleted file mode 100644
index 9f844cd0e1..0000000000
--- a/packages/gcc/gcc_3.4.2.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-PR = "r6"
-DESCRIPTION = "The GNU cc and gcc C compilers."
-HOMEPAGE = "http://www.gnu.org/software/gcc/"
-SECTION = "devel"
-LICENSE = "GPL"
-MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
-
-inherit autotools gettext
-
-include gcc-package.inc
-
-SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
-	   file://gcc34-reverse-compare.patch;patch=1 \
-	   file://gcc34-arm-ldm.patch;patch=1 \
-	   file://gcc34-arm-ldm-peephole.patch;patch=1 \
-	   file://gcc34-arm-tune.patch;patch=1 \
-	   file://gcc-3.4.1-uclibc-100-conf.patch;patch=1 \
-	   file://gcc-3.4.1-uclibc-200-locale.patch;patch=1 \
-	   file://gcc-3.4.0-arm-lib1asm.patch;patch=1 \
-	   file://gcc-3.4.0-arm-nolibfloat.patch;patch=1 \
-	   file://gcc-3.4.0-arm-bigendian.patch;patch=1 \
-	   file://gcc-3.4.0-arm-bigendian-uclibc.patch;patch=1"
-
-include gcc3-build.inc
diff --git a/packages/gcc/gcc_3.4.3.bb b/packages/gcc/gcc_3.4.3.bb
index 375c67f15f..c92746be58 100644
--- a/packages/gcc/gcc_3.4.3.bb
+++ b/packages/gcc/gcc_3.4.3.bb
@@ -1,4 +1,4 @@
-PR = "r10"
+PR = "r11"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
@@ -21,6 +21,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://gcc-3.4.0-arm-bigendian.patch;patch=1 \
 	   file://gcc-3.4.0-arm-bigendian-uclibc.patch;patch=1 \
 	   file://GCC3.4.0VisibilityPatch.diff;patch=1 \
-	   file://15342.patch;patch=1"
+	   file://15342.patch;patch=1 \
+	   file://always-fixincperm.patch;patch=1"
 
 include gcc3-build.inc
diff --git a/packages/libmatchbox/libmatchbox_svn.bb b/packages/libmatchbox/libmatchbox_svn.bb
index 6e0245b7ad..dbd4edc860 100644
--- a/packages/libmatchbox/libmatchbox_svn.bb
+++ b/packages/libmatchbox/libmatchbox_svn.bb
@@ -1,6 +1,6 @@
 include libmatchbox.inc
 
-PV = "1.5cvs${CVSDATE}"
+PV = "1.6cvs${CVSDATE}"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http\