From ac4a2334cf292d5a131b60002753612db5c9bda2 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 29 Apr 2009 14:25:14 +0100
Subject: recipes/opkg/files/configure : fix the case where this is no splash
 installed. recipes/opkg/opkg*.bb : bump PR for affected recipes

---
 recipes/opkg/files/configure          | 10 ++++++----
 recipes/opkg/opkg-nogpg-nocurl_svn.bb |  2 +-
 recipes/opkg/opkg-nogpg_svn.bb        |  2 +-
 recipes/opkg/opkg_svn.bb              |  2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/recipes/opkg/files/configure b/recipes/opkg/files/configure
index 318ccb19c3..d5dd74dbf3 100644
--- a/recipes/opkg/files/configure
+++ b/recipes/opkg/files/configure
@@ -7,16 +7,18 @@ status_pulse || true
 fi
 
 # run configure in bg
-opkg-cl configure &
-PID=$!
-
-if [ -f /etc/default/splashfuncs ]; then
+if [  -f /etc/default/splashfuncs ]; then
+  opkg-cl configure &
+  PID=$!
+  
   # while configure still running loop
   while test -d /proc/$PID; do
   # tick to splash so it doesn't time out
     status_tick || true
     sleep 1
   done
+else
+  opkg-cl configure
 fi
 
 # delete myself
diff --git a/recipes/opkg/opkg-nogpg-nocurl_svn.bb b/recipes/opkg/opkg-nogpg-nocurl_svn.bb
index 60da447696..c390174d60 100644
--- a/recipes/opkg/opkg-nogpg-nocurl_svn.bb
+++ b/recipes/opkg/opkg-nogpg-nocurl_svn.bb
@@ -11,7 +11,7 @@ SRC_URI += " \
 	    file://opkg_wget_nogpg_03_fix_tmpdirs.patch;patch=1 \
 	    file://opkg_wget_nogpg_04_default_tmpdir.patch;patch=1 \
 	   "
-PR = "r6"
+PR = "r7"
 
 SRCREV = "${SRCREV_pn-opkg}"
 
diff --git a/recipes/opkg/opkg-nogpg_svn.bb b/recipes/opkg/opkg-nogpg_svn.bb
index c0a4d4a6e8..b6bb4b36e0 100644
--- a/recipes/opkg/opkg-nogpg_svn.bb
+++ b/recipes/opkg/opkg-nogpg_svn.bb
@@ -3,7 +3,7 @@ require opkg_svn.bb
 DEPENDS = "curl"
 PROVIDES += "opkg"
 
-PR = "r12"
+PR = "r13"
 
 SRCREV = "${SRCREV_pn-opkg}"
 
diff --git a/recipes/opkg/opkg_svn.bb b/recipes/opkg/opkg_svn.bb
index 749fa1e975..d2863774a4 100644
--- a/recipes/opkg/opkg_svn.bb
+++ b/recipes/opkg/opkg_svn.bb
@@ -1,6 +1,6 @@
 require opkg.inc
 
-PR = "r12"
+PR = "r13"
 
 PACKAGES =+ "libopkg-dev libopkg"
 
-- 
cgit v1.2.3


From fe0e9e49c9882ed95186369ef1cb84fa6ab109f0 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 29 Apr 2009 16:26:04 +0100
Subject: xserver-xorg-conf_0.1.bb : add configuration for om-gta02 machine

---
 .../xserver-xorg-conf/om-gta02/xorg.conf             | 20 ++++++++++++++++++++
 recipes/xorg-xserver/xserver-xorg-conf_0.1.bb        |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 recipes/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf

diff --git a/recipes/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf
new file mode 100644
index 0000000000..3fc8d83b22
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf
@@ -0,0 +1,20 @@
+Section "Monitor"
+        Identifier      "Builtin Default Monitor"
+EndSection
+
+Section "Device"
+        Identifier      "Builtin Default glamo Device 0"
+        Driver  "glamo"
+EndSection
+
+Section "Screen"
+        Identifier      "Builtin Default glamo Screen 0"
+        Device  "Builtin Default glamo Device 0"
+        Monitor "Builtin Default Monitor"
+EndSection
+
+Section "ServerLayout"
+        Identifier      "Builtin Default Layout"
+        Screen  "Builtin Default glamo Screen 0"
+EndSection
+
diff --git a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
index 95aa82bef9..67fc683090 100644
--- a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Machine specific xorg.conf files"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "file://xorg.conf"
 
-- 
cgit v1.2.3


From fa862d201dcdcffccd627f9f2b75cb9a97c6f65c Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 29 Apr 2009 16:29:21 +0100
Subject: sane-srcrevs.inc : update xf86-driver-glamo git rev to latest

---
 conf/distro/include/sane-srcrevs.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index af768c33da..8962174814 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -252,7 +252,7 @@ SRCREV_pn-webkit-gtk ?= "42127"
 SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
 SRCREV_pn-wmiconfig ?= "4522"
-SRCREV_pn-xf86-video-glamo ?= "8062d7aa7bac7e06c1a00bd88ca78098550606ed"
+SRCREV_pn-xf86-video-glamo ?= "16a993d8b17ef623a21b003f6f08adb86c76de77"
 SRCREV_pn-xoo ?= "1971"
 SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52"
 SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924"
-- 
cgit v1.2.3


From a787df4afb9a135283f8e6031027b9afbe4d92c0 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 29 Apr 2009 22:52:30 +0100
Subject: base-files_3.0.14.bb : fix the om-gta02 fstab and bump the PR

---
 recipes/base-files/base-files/om-gta02/fstab | 5 +++++
 recipes/base-files/base-files_3.0.14.bb      | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/recipes/base-files/base-files/om-gta02/fstab b/recipes/base-files/base-files/om-gta02/fstab
index 61c7cdcafd..c83b2b1214 100644
--- a/recipes/base-files/base-files/om-gta02/fstab
+++ b/recipes/base-files/base-files/om-gta02/fstab
@@ -1,5 +1,10 @@
 /dev/mtdblock6	/ 		jffs2	rw,noatime	1  1
 proc		/proc		proc	defaults	0  0
+tmpfs		/var/volatile	tmpfs	defaults	0  0
+tmpfs		/dev/shm	tmpfs	mode=0777	0  0
+tmpfs		/media/ram	tmpfs	defaults	0  0
 
 # microSD slot
 /dev/mmcblk0p1	/media/card	auto	defaults,async	0  0
+# stock fstab - you probably want to override this with a machine specific one
+
diff --git a/recipes/base-files/base-files_3.0.14.bb b/recipes/base-files/base-files_3.0.14.bb
index 460fd6357f..0d012c77f2 100644
--- a/recipes/base-files/base-files_3.0.14.bb
+++ b/recipes/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r85"
+PR = "r86"
 LICENSE = "GPL"
 
 SRC_URI = " \
-- 
cgit v1.2.3


From 2835967ade6abc79c212691fc372837abf1f4ff9 Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Thu, 30 Apr 2009 00:05:23 +0200
Subject: Zaurus machines: reorganize configuration files  - uniform the
 MACHINE_DISPLAY  - remove unneded IMAGE_FSTYPES because .jffs2 and tar.gz are
 default  - add ext2 to MACHINE_FEATURES: already in kernel for boot from
 CF/SD  - fix? width/height for spiz (set width 640 for clamshells)  - add
 pixel-per-inch info

---
 conf/machine/akita.conf                   | 10 ++++++++--
 conf/machine/c7x0.conf                    | 14 ++++++++++----
 conf/machine/collie.conf                  |  7 ++++++-
 conf/machine/include/zaurus-2.6.inc       | 15 ++++++++-------
 conf/machine/include/zaurus-clamshell.inc |  6 ------
 conf/machine/poodle.conf                  |  8 ++++++--
 conf/machine/spitz.conf                   | 20 ++++++++++----------
 conf/machine/tosa.conf                    | 11 +++++------
 8 files changed, 53 insertions(+), 38 deletions(-)

diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 728ce4d9fe..9930c89c6a 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -8,10 +8,16 @@ require conf/machine/include/zaurus-clamshell.inc
 PACKAGE_EXTRA_ARCHS += "iwmmxt" 
 MACHINE_FEATURES += "iwmmxt"
 
-IMAGE_FSTYPES ?= "jffs2"
-
 # NAND factory-default
 # mtdparts=sharpsl-nand:7168k@0k(smf),59392k@7168k(root),-(home) 
 ROOT_FLASH_SIZE = "58"
 
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "640"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
+MACHINE_DISPLAY_ORIENTATION = "270"
+MACHINE_DISPLAY_PPI = "216"
+
 UBOOT_MACHINE = "akita_config"
+UBOOT_ENTRYPOINT = "0xA1000000"
+UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 6a6c1b81a6..16073fee82 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -5,18 +5,24 @@
 require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/zaurus-clamshell.inc
 
-IMAGE_FSTYPES += "jffs2"
-
 # NAND factory-default
 # SL-C700 (corgi) mtdparts=sharpsl-nand:7168k@0k(smf),25600k@7168k(root),-(home)
 # SL-C750 (Shepherd) mtdparts=sharpsl-nand:7168k@0k(smf),25600k@7168k(root),-(home)
 # SL-C760 (Husky) mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home)
 # SL-C860 (Boxer) mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home)
 
+# There isn't an unique size valid for all models,
+# please set the right value in your local.conf
 ROOT_FLASH_SIZE = "25"
-# yes, we are aware that the husky and boxer (c760,c860) have 53MB rootfs,
-# but we don't make a special image for them.
 
 XSERVER = "xserver-kdrive-imageon"
 
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "640"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
+MACHINE_DISPLAY_ORIENTATION = "0"
+MACHINE_DISPLAY_PPI = "216"
+
 UBOOT_MACHINE = "corgi_config"
+UBOOT_ENTRYPOINT = "0xA0008000"
+UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 6d09406375..96f430f377 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -25,7 +25,12 @@ IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
 PCMCIA_MANAGER ?= "pcmciautils"
 
-GUI_MACHINE_CLASS = "smallscreen"
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat"
 
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+MACHINE_DISPLAY_ORIENTATION = "270"
+MACHINE_DISPLAY_PPI = "114"
+
 require conf/machine/include/kexecboot.inc
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 71fea7a508..d3345b469b 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -22,20 +22,21 @@ PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon"
 
 PCMCIA_MANAGER ?= "pcmciautils"
 
-MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat"
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat ext2"
 MACHINE_FEATURES_append_tosa  = " usbhost wifi "
 MACHINE_FEATURES_append_akita = " usbhost "
-MACHINE_FEATURES_append_spitz = " usbhost ext2 "
+MACHINE_FEATURES_append_spitz = " usbhost "
 
-MACHINE_EXTRA_RDEPENDS = "zaurusd"
+MACHINE_EXTRA_RDEPENDS = "zaurusd mtd-utils nandlogical"
+
+# Fixme ?
+#########
+# Here we just need snd modules
 MACHINE_EXTRA_RRECOMMENDS_c7x0   = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia"
 MACHINE_EXTRA_RRECOMMENDS_akita  = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia"
-MACHINE_EXTRA_RRECOMMENDS_spitz  = "kernel-module-snd-soc-spitz"
+MACHINE_EXTRA_RRECOMMENDS_spitz  = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia"
 MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia"
 
-GUI_MACHINE_CLASS = "bigscreen"
-GUI_MACHINE_CLASS_poodle = "smallscreen"
-
 KERNEL_IMAGE_MAXSIZE = "1294336"
 
 ZAURUS_KERNEL_IMAGETYPE ?= "zImage"
diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc
index c3bbca856a..34e803e418 100644
--- a/conf/machine/include/zaurus-clamshell.inc
+++ b/conf/machine/include/zaurus-clamshell.inc
@@ -1,11 +1,5 @@
 include conf/machine/include/tune-xscale.inc
 
-UBOOT_ENTRYPOINT_c7x0 = "0xA0008000"
-UBOOT_ENTRYPOINT_akita = "0xA1000000"
-UBOOT_ENTRYPOINT_spitz = "0xA1000000"
-
-UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
-
 EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
 KEXECBOOT_IMAGEDEPENDS += "sharp-flash-header-c700"
 
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index 4e8f011a1e..db7a7809a7 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -5,6 +5,10 @@
 require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/tune-xscale.inc
 
-IMAGE_FSTYPES ?= "jffs2"
-
 ROOT_FLASH_SIZE = "22"
+
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+MACHINE_DISPLAY_ORIENTATION = "270"
+MACHINE_DISPLAY_PPI = "114"
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 306046cfe8..4fe62b5f43 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -6,24 +6,24 @@ require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/zaurus-clamshell.inc
 
 MACHINE_FEATURES += "iwmmxt"
-
-PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
-
 PACKAGE_EXTRA_ARCHS += "iwmmxt"
-IMAGE_FSTYPES += "tar.gz"
 
 # NAND factory-default
 # SL-C3000 (spitz) mtdparts=sharpsl-nand:7168k@0k(smf),5120k@7168k(root),-(home)
 # SL-C3100 (borzoi) mtdparts=sharpsl-nand:7168k@0k(smf),32768k@7168k(root),-(home)
 # SL-C3200 (terrier) mtdparts=sharpsl-nand:7168k@0k(smf),44032k@7168k(root),-(home)
 
-# Valid size for all models, rootfs is on disk for these machines
-ROOT_FLASH_SIZE = "100"
+# There isn't an unique size valid for all models,
+# please set the right value in your local.conf
+ROOT_FLASH_SIZE ?= "5"
 
-MACHINE_GUI_CLASS=bigscreen
-MACHINE_DISPLAY_WIDTH_PIXELS=480
-MACHINE_DISPLAY_HEIGHT_PIXELS=640
-MACHINE_DISPLAY_ORIENTATION=270
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "640"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
+MACHINE_DISPLAY_ORIENTATION = "270"
+MACHINE_DISPLAY_PPI = "216"
 
 # spitz and akita share same u-boot machine
 UBOOT_MACHINE = "akita_config"
+UBOOT_ENTRYPOINT = "0xA1000000"
+UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index 593ceab33d..87cfe4781a 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -5,15 +5,14 @@
 require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/tune-xscale.inc
 
-IMAGE_FSTYPES += "jffs2 tar.gz"
-
 # wlan-ng Modules
 # OHCI suspend/resume fixup
 MACHINE_EXTRA_RRECOMMENDS += "wlan-ng-modules-usb apm-tosa-suspendfix"
 
 ROOT_FLASH_SIZE = "28"
 
-MACHINE_GUI_CLASS=bigscreen
-MACHINE_DISPLAY_WIDTH_PIXELS=480
-MACHINE_DISPLAY_HEIGHT_PIXELS=640
-MACHINE_DISPLAY_ORIENTATION=0
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
+MACHINE_DISPLAY_ORIENTATION = "0"
+MACHINE_DISPLAY_PPI = "200"
-- 
cgit v1.2.3


From 0263ec2aaffbe8e14a6e6ee71c0e7dd17d1a3d2c Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Thu, 30 Apr 2009 01:27:00 +0200
Subject: nandlogical: Fix GNU_HASH QA error - Bump PR

---
 recipes/nandlogical/nandlogical-static_1.0.0.bb | 4 +++-
 recipes/nandlogical/nandlogical_1.0.0.bb        | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/recipes/nandlogical/nandlogical-static_1.0.0.bb b/recipes/nandlogical/nandlogical-static_1.0.0.bb
index e2eaf4e1f5..ceeba555c3 100644
--- a/recipes/nandlogical/nandlogical-static_1.0.0.bb
+++ b/recipes/nandlogical/nandlogical-static_1.0.0.bb
@@ -1,5 +1,7 @@
+PR = "r2"
+
 require nandlogical_${PV}.bb
 
 do_compile () {
-	${CC} -o nandlogical ${WORKDIR}/nandlogical.c -static
+	${CC} nandlogical.c -o nandlogical ${CFLAGS} ${LDFLAGS}
 }
diff --git a/recipes/nandlogical/nandlogical_1.0.0.bb b/recipes/nandlogical/nandlogical_1.0.0.bb
index ba851bf513..d567b48a3c 100644
--- a/recipes/nandlogical/nandlogical_1.0.0.bb
+++ b/recipes/nandlogical/nandlogical_1.0.0.bb
@@ -2,17 +2,17 @@ DESCRIPTION = "Nandlogical for Sharp mtd1"
 LICENSE = "GPL"
 DEPENDS = "mtd-utils"
 COMPATIBLE_MACHINE = "(poodle|c7x0|akita|spitz|tosa)"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "file://nandlogical.c"
 
-S = "${WORKDIR}/${P}"
+S = "${WORKDIR}"
 
 do_compile () {
-	${CC} -o nandlogical ${WORKDIR}/nandlogical.c
+	${CC} nandlogical.c -o nandlogical ${CFLAGS} ${LDFLAGS}
 }
 
 do_install () {
 	install -d ${D}${bindir}/
-	install -m 0755 ${WORKDIR}/${P}/nandlogical ${D}${bindir}/
+	install -m 0755 nandlogical ${D}${bindir}/
 }
-- 
cgit v1.2.3


From 41d2e60e3d7b34bb739c6d0c478929785da14a18 Mon Sep 17 00:00:00 2001
From: Steffen Sledz <sledz@dresearch.de>
Date: Thu, 30 Apr 2009 09:46:18 +0200
Subject: mii-diag-2.11: GNU_HASH QA fix

---
 recipes/mii-diag/mii-diag_2.11.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/mii-diag/mii-diag_2.11.bb b/recipes/mii-diag/mii-diag_2.11.bb
index 8f664e9efe..e49a990b77 100644
--- a/recipes/mii-diag/mii-diag_2.11.bb
+++ b/recipes/mii-diag/mii-diag_2.11.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Examines and sets the MII registers of network cards."
 LICENSE = "GPL"
 SECTION = "console/network"
 PRIORITY = "optional"
-PR = "r3"
+PR = "r4"
 
 S = "${WORKDIR}/"
 
@@ -15,7 +15,7 @@ FILES_${PN} = "${base_sbindir}/mii-diag"
 
 do_compile() {
 ${CC} -O -c libmii.c
-${CC} -O -DLIBMII mii-diag.c libmii.o -o mii-diag
+${CC} -O -DLIBMII mii-diag.c libmii.o -o mii-diag ${LDFLAGS}
 }
 
 do_install() {
-- 
cgit v1.2.3


From 66efe0dabfba7ab973580c7ab0f29d74cbbb3c47 Mon Sep 17 00:00:00 2001
From: Steffen Sledz <sledz@dresearch.de>
Date: Thu, 30 Apr 2009 10:43:47 +0200
Subject: bonnie++: GNU_HASH QA fix

---
 recipes/bonnie/bonnie++.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes/bonnie/bonnie++.inc b/recipes/bonnie/bonnie++.inc
index 7e9d81579c..450f6fc43c 100644
--- a/recipes/bonnie/bonnie++.inc
+++ b/recipes/bonnie/bonnie++.inc
@@ -21,6 +21,8 @@ FILES_bonnie-scripts="/bin"
 
 S="${WORKDIR}/${PN}-${PV}"
 
+TARGET_CC_ARCH += "${LDFLAGS}"
+
 do_install () {
 	install -d ${D}/bin
 	install -d ${D}/sbin
-- 
cgit v1.2.3


From 1fc726a2f3a193b3e59806cd69d50b8890bb5c28 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 30 Apr 2009 11:55:06 +0100
Subject: hal/hal.inc : change hardcoded etc to ${sysconfdir} and remove bogus
 directory hal/hal_0.5.11.bb : bump PR for above change

---
 recipes/hal/hal.inc       | 17 +++++++++--------
 recipes/hal/hal_0.5.11.bb |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/recipes/hal/hal.inc b/recipes/hal/hal.inc
index f8ef0e4398..d17907ae79 100644
--- a/recipes/hal/hal.inc
+++ b/recipes/hal/hal.inc
@@ -36,10 +36,11 @@ PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'acpi', '${MACHINE_ARCH}',
 PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}',d)}"
 
 do_install_append() {
-	install -d ${D}/etc/default/volatiles
-	install -m 0644 ${WORKDIR}/99_hal ${D}/etc/default/volatiles
-        install -d ${D}/etc/dbus-1/event.d
-        install -m 0755 ${WORKDIR}/20hal ${D}/etc/dbus-1/event.d
+	install -d ${D}/${sysconfdir}/default/volatiles
+	install -m 0644 ${WORKDIR}/99_hal ${D}/${sysconfdir}/default/volatiles
+        install -d ${D}/${sysconfdir}/dbus-1/event.d
+        install -m 0755 ${WORKDIR}/20hal ${D}/${sysconfdir}/dbus-1/event.d
+	rm -rf ${D}/${sysconfdir}/rc.d || true
 }
 
 do_stage() {
@@ -58,15 +59,15 @@ pkg_postinst_hal () {
 		exit 1
 	fi
 
-	grep haldaemon /etc/group || addgroup haldaemon
-	grep haldaemon /etc/passwd || adduser --disabled-password --system --home /var/run/hald --no-create-home haldaemon --ingroup haldaemon -g HAL
+	grep haldaemon ${sysconfdir}/group || addgroup haldaemon
+	grep haldaemon ${sysconfdir}/passwd || adduser --disabled-password --system --home /var/run/hald --no-create-home haldaemon --ingroup haldaemon -g HAL
 
-	/etc/init.d/populate-volatile.sh update
+	${sysconfdir}/init.d/populate-volatile.sh update
 
 	DBUSPID=`pidof dbus-daemon`
 
 	if [ "x$DBUSPID" != "x" ]; then
-		/etc/init.d/dbus-1 force-reload
+		${sysconfdir}/init.d/dbus-1 force-reload
 	fi
 }
 
diff --git a/recipes/hal/hal_0.5.11.bb b/recipes/hal/hal_0.5.11.bb
index 3b5888a863..898ad07c92 100644
--- a/recipes/hal/hal_0.5.11.bb
+++ b/recipes/hal/hal_0.5.11.bb
@@ -1,6 +1,6 @@
 require hal.inc
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI += " file://hal-right-input-h.patch;patch=1 \
              file://fix-configure.diff;patch=1 \
-- 
cgit v1.2.3


From 7785ce4baefbb17b2fd2f8ebe64e8a91a7fade32 Mon Sep 17 00:00:00 2001
From: Martin Lund <mgl@doredevelopment.dk>
Date: Thu, 30 Apr 2009 13:15:36 +0200
Subject: Initial add of micro linux dist

---
 conf/distro/micro-uclibc.conf |  43 ++++++++++++++++++
 conf/distro/micro.conf        | 100 ++++++++++++++++++++++++++++++++++++++++++
 recipes/images/micro-image.bb |  34 ++++++++++++++
 3 files changed, 177 insertions(+)
 create mode 100644 conf/distro/micro-uclibc.conf
 create mode 100644 conf/distro/micro.conf
 create mode 100644 recipes/images/micro-image.bb

diff --git a/conf/distro/micro-uclibc.conf b/conf/distro/micro-uclibc.conf
new file mode 100644
index 0000000000..82b78cbf79
--- /dev/null
+++ b/conf/distro/micro-uclibc.conf
@@ -0,0 +1,43 @@
+#############################################################################
+#@TYPE: Distribution
+#@NAME: Micro uclibc
+#@DESCRIPTION: Micro Linux Distribution (uclibc based)
+#@MAINTAINER: Martin Lund <mgl@doredevelopment.dk>
+#@COMMENT: This distribution configuration defines a Micro Linux distribution
+#@COMMENT: based on uclibc.
+#############################################################################
+
+# Based on the Micro Linux distribution
+require conf/distro/micro.conf
+
+#############################################################################
+# DISTRO CONFIGURATION
+#############################################################################
+DISTRO_NAME = "micro-uclibc"
+
+#############################################################################
+# TARGET OS 
+#############################################################################
+# Use linux uclibc
+TARGET_OS = "linux-uclibc"
+
+#############################################################################
+# TOOLCHAIN
+#############################################################################
+PREFERRED_LIBC = "uclibc"
+
+#############################################################################
+# PREFERRED PROVIDERS 
+#############################################################################
+PREFERRED_PROVIDER_virtual/libc		= "uclibc"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc	= "uclibc"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils	= "binutils-cross"
+PREFERRED_PROVIDER_linux-libc-headers	= "linux-libc-headers"
+PREFERRED_PROVIDER_virtual/libintl	= "proxy-libintl"
+
+#############################################################################
+# PREFERRED VERSIONS 
+#############################################################################
+PREFERRED_VERSION_uclibc = "0.9.30.1"
+PREFERRED_VERSION_uclibc-initial = "0.9.30.1"
+
diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf
new file mode 100644
index 0000000000..bf4e5e1a82
--- /dev/null
+++ b/conf/distro/micro.conf
@@ -0,0 +1,100 @@
+#############################################################################
+#@TYPE: Distribution
+#@NAME: Micro
+#@DESCRIPTION: Micro Linux Distribution (glibc based)
+#@MAINTAINER: Martin Lund <mgl@doredevelopment.dk>
+#@COMMENT: This distribution configuration defines a truely tiny OE Linux  
+#@COMMENT: distribution. The matching buildable image target (micro-image)
+#@COMMENT: basically consists of: libc, busybox, udev, sysv init, and a few
+#@COMMENT: init scripts for running up the system.
+#############################################################################
+
+#############################################################################
+# DISTRO CONFIGURATION
+#############################################################################
+DISTRO_NAME = "micro"
+DISTRO_VERSION = "${SRCDATE}"
+
+#############################################################################
+# TARGET OS
+#############################################################################
+# Linux
+TARGET_OS = "linux"
+
+#############################################################################
+# DISTRO FEATURE SELECTION
+#############################################################################
+# No features selected
+DISTRO_FEATURES = ""
+
+#############################################################################
+# LIBRARY NAMES
+#############################################################################
+# Use Debian naming scheme for library (.so) files
+INHERIT += "debian"
+
+#############################################################################
+# PACKAGING & FEEDS
+#############################################################################
+# Select packaging system
+PREFERRED_PKG_FORMAT = "ipk"
+IPKG_VARIANT = "opkg-nogpg"
+
+require conf/distro/include/sane-feed.inc
+require conf/distro/include/sane-feed-${PREFERRED_PKG_FORMAT}.inc
+
+#############################################################################
+# IMAGES
+#############################################################################
+# Name generated images
+IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${PREFERRED_LIBC}-\
+${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}"
+
+CACHE ?= "${TMPDIR}/cache/${PREFERRED_LIBC}/${MACHINE}"
+DEPLOY_DIR ?= "${TMPDIR}/deploy/${PREFERRED_LIBC}"
+DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
+
+# Image output types
+IMAGE_FSTYPES ?= "tar.gz jffs2"
+
+#############################################################################
+# LINUX KERNEL SELECTION
+#############################################################################
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+
+#############################################################################
+# TOOLCHAIN
+#############################################################################
+PREFERRED_LIBC = "glibc"
+require conf/distro/include/sane-toolchain.inc
+
+#############################################################################
+# OVERRIDES adjusted from bitbake.conf to feature the MACHINE_CLASS
+#############################################################################
+OVERRIDES = "local:${MACHINE}:${MACHINE_CLASS}:${DISTRO}:${TARGET_OS}:\
+${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
+
+#############################################################################
+# PREFERRED PROVIDERS
+#############################################################################
+PREFERRED_PROVIDER_task-bootstrap	= "task-bootstrap"
+PREFERRED_PROVIDER_virtual/libintl	= "glibc"
+
+#############################################################################
+# PREFERRED VERSIONS
+#############################################################################
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
+
+#############################################################################
+# NLS
+#############################################################################
+USE_NLS = "no"
+USE_NLS_glib-2.0 = "yes"
+USE_NLS_glib-2.0-native = "yes"
+USE_NLS_gcc-cross = "no"
+
+# Disable binary locale generation
+ENABLE_BINARY_LOCALE_GENERATION = "0"
+
diff --git a/recipes/images/micro-image.bb b/recipes/images/micro-image.bb
new file mode 100644
index 0000000000..b31365d1d1
--- /dev/null
+++ b/recipes/images/micro-image.bb
@@ -0,0 +1,34 @@
+# micro-image
+#
+# Image configuration for the OE Micro Linux Distribuion (micro, micro-uclibc)
+#
+# This image basically consists of: libc, busybox, udev, sysv init, and a few
+# init scripts for running up the system.
+#
+# It is truely tiny and should build with most architectures/machines.
+#
+# The image is tested to build and run succesfully with the following machines:
+#
+#	* at91sam9263ek (jffs2 image size ~ 1 MB, uclibc)
+#	* x86
+#
+# Maintainer: Martin Lund <mgl@doredevelopment.dk>
+#
+
+# Install basic files only
+IMAGE_INSTALL = "base-files base-passwd"
+IMAGE_LINGUAS = ""
+
+# Use busybox as login manager
+IMAGE_LOGIN_MANAGER = "busybox"
+
+# Include minimum init and init scripts
+IMAGE_DEV_MANAGER = "udev"
+IMAGE_INIT_MANAGER = "sysvinit sysvinit-pidof"
+IMAGE_INITSCRIPTS = ""
+
+# Do not install target package management system
+ONLINE_PACKAGE_MANAGEMENT = "none"
+
+inherit image
+
-- 
cgit v1.2.3


From 5a23eb5eb0fef03675c2a7dbf65cea0dd190c795 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Thu, 30 Apr 2009 12:17:12 +0000
Subject: encdec-updater: GNU_HASH QA fix.

---
 recipes/zaurus-updater/encdec-updater.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/zaurus-updater/encdec-updater.bb b/recipes/zaurus-updater/encdec-updater.bb
index c03e9b4454..72ecdcad48 100644
--- a/recipes/zaurus-updater/encdec-updater.bb
+++ b/recipes/zaurus-updater/encdec-updater.bb
@@ -7,7 +7,7 @@ SRC_URI = "file://encdec-updater.c"
 COMPATIBLE_MACHINE = '(poodle|c7x0|spitz|akita|tosa)'
 
 do_compile() {
-	${CC} -o encdec-updater ${WORKDIR}/encdec-updater.c
+	${CC} ${LDFLAGS} -o encdec-updater ${WORKDIR}/encdec-updater.c
 }
 
 do_install() {
-- 
cgit v1.2.3


From f13ab24657b5b34ce443896ac87026e2ea302fc9 Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Thu, 30 Apr 2009 17:10:47 +0200
Subject: nandlogical-static: actually build static...  - readd -static  - size
 is a bit big...433k

---
 recipes/nandlogical/nandlogical-static_1.0.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/nandlogical/nandlogical-static_1.0.0.bb b/recipes/nandlogical/nandlogical-static_1.0.0.bb
index ceeba555c3..8332008654 100644
--- a/recipes/nandlogical/nandlogical-static_1.0.0.bb
+++ b/recipes/nandlogical/nandlogical-static_1.0.0.bb
@@ -3,5 +3,5 @@ PR = "r2"
 require nandlogical_${PV}.bb
 
 do_compile () {
-	${CC} nandlogical.c -o nandlogical ${CFLAGS} ${LDFLAGS}
+	${CC} nandlogical.c -o nandlogical ${CFLAGS} ${LDFLAGS} -static
 }
-- 
cgit v1.2.3


From 3628be8901b747558b219d55b370a1f20e1dce5f Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@embeddedalley.com>
Date: Thu, 30 Apr 2009 08:37:18 -0700
Subject: gcc-3.4.x: Rename gcc-posix.patch to gcc-posix-open-fix.patch, put in
 files/

---
 recipes/gcc/files/gcc-posix-open-fix.patch | 11 +++++++++++
 recipes/gcc/gcc-3.4.4.inc                  |  2 +-
 recipes/gcc/gcc-3.4.4/gcc-posix.patch      | 11 -----------
 recipes/gcc/gcc-3.4.6.inc                  |  2 +-
 recipes/gcc/gcc-3.4.6/gcc-posix.patch      | 11 -----------
 5 files changed, 13 insertions(+), 24 deletions(-)
 create mode 100644 recipes/gcc/files/gcc-posix-open-fix.patch
 delete mode 100644 recipes/gcc/gcc-3.4.4/gcc-posix.patch
 delete mode 100644 recipes/gcc/gcc-3.4.6/gcc-posix.patch

diff --git a/recipes/gcc/files/gcc-posix-open-fix.patch b/recipes/gcc/files/gcc-posix-open-fix.patch
new file mode 100644
index 0000000000..99f813e866
--- /dev/null
+++ b/recipes/gcc/files/gcc-posix-open-fix.patch
@@ -0,0 +1,11 @@
+--- gcc-3.4.6/gcc/collect2.c	2008-10-04 18:17:17.796750393 +0400
++++ gcc-3.4.6/gcc/collect2.new	2008-10-04 18:24:10.120748711 +0400
+@@ -1534,7 +1534,7 @@ collect_execute (const char *prog, char 
+   if (redir)
+     {
+       /* Open response file.  */
+-      redir_handle = open (redir, O_WRONLY | O_TRUNC | O_CREAT);
++      redir_handle = open (redir, O_WRONLY | O_TRUNC | O_CREAT, S_IWUSR);
+ 
+       /* Duplicate the stdout and stderr file handles
+ 	 so they can be restored later.  */
diff --git a/recipes/gcc/gcc-3.4.4.inc b/recipes/gcc/gcc-3.4.4.inc
index 0b5b714e09..2bed5f8959 100644
--- a/recipes/gcc/gcc-3.4.4.inc
+++ b/recipes/gcc/gcc-3.4.4.inc
@@ -22,6 +22,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://gcc34-configure.in.patch;patch=1 \
 	   file://gcc34-thumb-support.patch;patch=1 \
 	   file://gcc-cross-fixincl.patch;patch=1 \
-	   file://gcc-posix.patch;patch=1 \
+	   file://gcc-posix-open-fix.patch;patch=1 \
 	   "
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
diff --git a/recipes/gcc/gcc-3.4.4/gcc-posix.patch b/recipes/gcc/gcc-3.4.4/gcc-posix.patch
deleted file mode 100644
index 99f813e866..0000000000
--- a/recipes/gcc/gcc-3.4.4/gcc-posix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-3.4.6/gcc/collect2.c	2008-10-04 18:17:17.796750393 +0400
-+++ gcc-3.4.6/gcc/collect2.new	2008-10-04 18:24:10.120748711 +0400
-@@ -1534,7 +1534,7 @@ collect_execute (const char *prog, char 
-   if (redir)
-     {
-       /* Open response file.  */
--      redir_handle = open (redir, O_WRONLY | O_TRUNC | O_CREAT);
-+      redir_handle = open (redir, O_WRONLY | O_TRUNC | O_CREAT, S_IWUSR);
- 
-       /* Duplicate the stdout and stderr file handles
- 	 so they can be restored later.  */
diff --git a/recipes/gcc/gcc-3.4.6.inc b/recipes/gcc/gcc-3.4.6.inc
index b1f686b365..faab40623e 100644
--- a/recipes/gcc/gcc-3.4.6.inc
+++ b/recipes/gcc/gcc-3.4.6.inc
@@ -16,7 +16,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://always-fixincperm.patch;patch=1 \
 	   file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1 \
 	   file://zecke-xgcc-cpp.patch;patch=1 \
-	   file://gcc-posix.patch;patch=1 \
+	   file://gcc-posix-open-fix.patch;patch=1 \
 	   file://gcc4-mtune-compat.patch;patch=1"
 
 SRC_URI += "file://gcc34-configure.in.patch;patch=1"
diff --git a/recipes/gcc/gcc-3.4.6/gcc-posix.patch b/recipes/gcc/gcc-3.4.6/gcc-posix.patch
deleted file mode 100644
index 99f813e866..0000000000
--- a/recipes/gcc/gcc-3.4.6/gcc-posix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-3.4.6/gcc/collect2.c	2008-10-04 18:17:17.796750393 +0400
-+++ gcc-3.4.6/gcc/collect2.new	2008-10-04 18:24:10.120748711 +0400
-@@ -1534,7 +1534,7 @@ collect_execute (const char *prog, char 
-   if (redir)
-     {
-       /* Open response file.  */
--      redir_handle = open (redir, O_WRONLY | O_TRUNC | O_CREAT);
-+      redir_handle = open (redir, O_WRONLY | O_TRUNC | O_CREAT, S_IWUSR);
- 
-       /* Duplicate the stdout and stderr file handles
- 	 so they can be restored later.  */
-- 
cgit v1.2.3


From 73a5d9a06fabdede79c82e315894341b415ec3b1 Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@embeddedalley.com>
Date: Thu, 30 Apr 2009 08:53:28 -0700
Subject: gcc (various): Drop incomplete LDFLAGS patch and really honor them,
 bump PR

---
 recipes/gcc/gcc-4.1.1.inc               |  1 -
 recipes/gcc/gcc-4.1.1/ldflags.patch     | 22 ----------------------
 recipes/gcc/gcc-4.1.2.inc               |  2 --
 recipes/gcc/gcc-4.1.2/ldflags.patch     | 22 ----------------------
 recipes/gcc/gcc-4.2.1.inc               |  2 --
 recipes/gcc/gcc-4.2.1/ldflags.patch     | 22 ----------------------
 recipes/gcc/gcc-4.2.2.inc               |  1 -
 recipes/gcc/gcc-4.2.2/ldflags.patch     | 22 ----------------------
 recipes/gcc/gcc-4.2.3.inc               |  1 -
 recipes/gcc/gcc-4.2.3/ldflags.patch     | 22 ----------------------
 recipes/gcc/gcc-4.2.4.inc               |  1 -
 recipes/gcc/gcc-4.2.4/ldflags.patch     | 22 ----------------------
 recipes/gcc/gcc-4.4.0/ldflags.patch     | 22 ----------------------
 recipes/gcc/gcc-canadian-sdk_4.2.4.bb   |  2 +-
 recipes/gcc/gcc-configure-common.inc    |  5 +++++
 recipes/gcc/gcc-cross_3.3.3.bb          |  2 +-
 recipes/gcc/gcc-cross_3.3.4.bb          |  2 +-
 recipes/gcc/gcc-cross_3.4.3.bb          |  2 +-
 recipes/gcc/gcc-cross_3.4.4.bb          |  2 +-
 recipes/gcc/gcc-cross_4.1.1.bb          |  2 +-
 recipes/gcc/gcc-cross_4.1.2.bb          |  2 +-
 recipes/gcc/gcc-cross_4.2.1.bb          |  2 +-
 recipes/gcc/gcc-cross_4.2.2.bb          |  2 +-
 recipes/gcc/gcc-cross_4.2.3.bb          |  2 +-
 recipes/gcc/gcc-cross_4.2.4.bb          |  2 +-
 recipes/gcc/gcc-cross_csl-arm-2005q3.bb |  2 +-
 recipes/gcc/gcc-cross_csl-arm-2006q1.bb |  2 +-
 recipes/gcc/gcc-cross_csl-arm-2007q3.bb |  2 +-
 recipes/gcc/gcc-cross_csl-arm-2008q1.bb |  2 +-
 recipes/gcc/gcc-csl-arm/ldflags.patch   | 22 ----------------------
 recipes/gcc/gcc-svn/ldflags.patch       | 22 ----------------------
 recipes/gcc/gcc_3.3.3.bb                |  2 +-
 recipes/gcc/gcc_3.3.4.bb                |  2 +-
 recipes/gcc/gcc_3.4.3.bb                |  2 +-
 recipes/gcc/gcc_3.4.4.bb                |  2 +-
 recipes/gcc/gcc_4.1.1.bb                |  2 +-
 recipes/gcc/gcc_4.1.2.bb                |  2 +-
 recipes/gcc/gcc_4.2.1.bb                |  2 +-
 recipes/gcc/gcc_4.2.2.bb                |  2 +-
 recipes/gcc/gcc_4.2.3.bb                |  2 +-
 recipes/gcc/gcc_4.2.4.bb                |  2 +-
 41 files changed, 30 insertions(+), 231 deletions(-)
 delete mode 100644 recipes/gcc/gcc-4.1.1/ldflags.patch
 delete mode 100644 recipes/gcc/gcc-4.1.2/ldflags.patch
 delete mode 100644 recipes/gcc/gcc-4.2.1/ldflags.patch
 delete mode 100644 recipes/gcc/gcc-4.2.2/ldflags.patch
 delete mode 100644 recipes/gcc/gcc-4.2.3/ldflags.patch
 delete mode 100644 recipes/gcc/gcc-4.2.4/ldflags.patch
 delete mode 100644 recipes/gcc/gcc-4.4.0/ldflags.patch
 delete mode 100644 recipes/gcc/gcc-csl-arm/ldflags.patch
 delete mode 100644 recipes/gcc/gcc-svn/ldflags.patch

diff --git a/recipes/gcc/gcc-4.1.1.inc b/recipes/gcc/gcc-4.1.1.inc
index 22c20ce9a2..f16928479b 100644
--- a/recipes/gcc/gcc-4.1.1.inc
+++ b/recipes/gcc/gcc-4.1.1.inc
@@ -20,7 +20,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://gcc41-configure.in.patch;patch=1 \
 	file://arm-thumb.patch;patch=1 \
 	file://arm-thumb-cache.patch;patch=1 \
-	file://ldflags.patch;patch=1 \
 	file://cse.patch;patch=1 \
 	file://zecke-xgcc-cpp.patch;patch=1 \
 	file://unbreak-armv4t.patch;patch=1 \
diff --git a/recipes/gcc/gcc-4.1.1/ldflags.patch b/recipes/gcc/gcc-4.1.1/ldflags.patch
deleted file mode 100644
index 9576f60778..0000000000
--- a/recipes/gcc/gcc-4.1.1/ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- /tmp/Makefile.in	2006-02-23 20:56:01.399758728 +0100
-+++ gcc-4.1-20060217/Makefile.in	2006-02-23 20:56:16.874406224 +0100
-@@ -334,7 +334,7 @@
- CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@ 
- PICFLAG_FOR_TARGET = 
- 
- # ------------------------------------
---- /tmp/Makefile.tpl	2006-02-23 20:50:34.077519272 +0100
-+++ gcc-4.1-20060217/Makefile.tpl	2006-02-23 21:04:31.092273688 +0100
-@@ -337,7 +337,7 @@
- CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@ 
- PICFLAG_FOR_TARGET = 
- 
- # ------------------------------------
diff --git a/recipes/gcc/gcc-4.1.2.inc b/recipes/gcc/gcc-4.1.2.inc
index 7ffb9ce738..ed4e3c408d 100644
--- a/recipes/gcc/gcc-4.1.2.inc
+++ b/recipes/gcc/gcc-4.1.2.inc
@@ -19,7 +19,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://gcc41-configure.in.patch;patch=1 \
 	file://arm-thumb.patch;patch=1 \
 	file://arm-thumb-cache.patch;patch=1 \
-	file://ldflags.patch;patch=1 \
 	file://zecke-xgcc-cpp.patch;patch=1 \
 	file://unbreak-armv4t.patch;patch=1 \
         file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
@@ -41,7 +40,6 @@ SRC_URI_avr32 = "http://www.angstrom-distribution.org/unstable/sources/gcc-4.1.2
            file://304-index_macro.patch;patch=1 \
            file://602-sdk-libstdc++-includes.patch;patch=1 \
            file://gcc41-configure.in.patch;patch=1 \
-           file://ldflags.patch;patch=1 \
            file://zecke-xgcc-cpp.patch;patch=1 \
            file://cache-amnesia.patch;patch=1 \
            "
diff --git a/recipes/gcc/gcc-4.1.2/ldflags.patch b/recipes/gcc/gcc-4.1.2/ldflags.patch
deleted file mode 100644
index 9576f60778..0000000000
--- a/recipes/gcc/gcc-4.1.2/ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- /tmp/Makefile.in	2006-02-23 20:56:01.399758728 +0100
-+++ gcc-4.1-20060217/Makefile.in	2006-02-23 20:56:16.874406224 +0100
-@@ -334,7 +334,7 @@
- CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@ 
- PICFLAG_FOR_TARGET = 
- 
- # ------------------------------------
---- /tmp/Makefile.tpl	2006-02-23 20:50:34.077519272 +0100
-+++ gcc-4.1-20060217/Makefile.tpl	2006-02-23 21:04:31.092273688 +0100
-@@ -337,7 +337,7 @@
- CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@ 
- PICFLAG_FOR_TARGET = 
- 
- # ------------------------------------
diff --git a/recipes/gcc/gcc-4.2.1.inc b/recipes/gcc/gcc-4.2.1.inc
index 920805bedc..b48d709115 100644
--- a/recipes/gcc/gcc-4.2.1.inc
+++ b/recipes/gcc/gcc-4.2.1.inc
@@ -27,7 +27,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://gcc41-configure.in.patch;patch=1 \
 	file://arm-thumb.patch;patch=1 \
 	file://arm-thumb-cache.patch;patch=1 \
-	file://ldflags.patch;patch=1 \
 	file://zecke-xgcc-cpp.patch;patch=1 \
 	file://unbreak-armv4t.patch;patch=1 \
 	file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
@@ -57,7 +56,6 @@ SRC_URI_avr32 = " http://ewi546.ewi.utwente.nl/tmp/avr32-gcc-4.2.1-atmel.1.0.3.t
         file://740-sh-pr24836.patch;patch=1 \
         file://904-flatten-switch-stmt-00.patch;patch=1 \
         file://gcc41-configure.in.patch;patch=1 \
-        file://ldflags.patch;patch=1 \
         file://zecke-xgcc-cpp.patch;patch=1 \
         file://cache-amnesia.patch;patch=1 \
         file://gfortran.patch;patch=1 \
diff --git a/recipes/gcc/gcc-4.2.1/ldflags.patch b/recipes/gcc/gcc-4.2.1/ldflags.patch
deleted file mode 100644
index 9576f60778..0000000000
--- a/recipes/gcc/gcc-4.2.1/ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- /tmp/Makefile.in	2006-02-23 20:56:01.399758728 +0100
-+++ gcc-4.1-20060217/Makefile.in	2006-02-23 20:56:16.874406224 +0100
-@@ -334,7 +334,7 @@
- CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@ 
- PICFLAG_FOR_TARGET = 
- 
- # ------------------------------------
---- /tmp/Makefile.tpl	2006-02-23 20:50:34.077519272 +0100
-+++ gcc-4.1-20060217/Makefile.tpl	2006-02-23 21:04:31.092273688 +0100
-@@ -337,7 +337,7 @@
- CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@ 
- PICFLAG_FOR_TARGET = 
- 
- # ------------------------------------
diff --git a/recipes/gcc/gcc-4.2.2.inc b/recipes/gcc/gcc-4.2.2.inc
index f5878123ed..0b4b87c3ff 100644
--- a/recipes/gcc/gcc-4.2.2.inc
+++ b/recipes/gcc/gcc-4.2.2.inc
@@ -28,7 +28,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://gcc41-configure.in.patch;patch=1 \
 	file://arm-thumb.patch;patch=1 \
 	file://arm-thumb-cache.patch;patch=1 \
-	file://ldflags.patch;patch=1 \
 	file://zecke-xgcc-cpp.patch;patch=1 \
 	file://unbreak-armv4t.patch;patch=1 \
 	file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
diff --git a/recipes/gcc/gcc-4.2.2/ldflags.patch b/recipes/gcc/gcc-4.2.2/ldflags.patch
deleted file mode 100644
index 9576f60778..0000000000
--- a/recipes/gcc/gcc-4.2.2/ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- /tmp/Makefile.in	2006-02-23 20:56:01.399758728 +0100
-+++ gcc-4.1-20060217/Makefile.in	2006-02-23 20:56:16.874406224 +0100
-@@ -334,7 +334,7 @@
- CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@ 
- PICFLAG_FOR_TARGET = 
- 
- # ------------------------------------
---- /tmp/Makefile.tpl	2006-02-23 20:50:34.077519272 +0100
-+++ gcc-4.1-20060217/Makefile.tpl	2006-02-23 21:04:31.092273688 +0100
-@@ -337,7 +337,7 @@
- CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@ 
- PICFLAG_FOR_TARGET = 
- 
- # ------------------------------------
diff --git a/recipes/gcc/gcc-4.2.3.inc b/recipes/gcc/gcc-4.2.3.inc
index 35d8cc6f1b..376e9180fd 100644
--- a/recipes/gcc/gcc-4.2.3.inc
+++ b/recipes/gcc/gcc-4.2.3.inc
@@ -28,7 +28,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://gcc41-configure.in.patch;patch=1 \
 	file://arm-thumb.patch;patch=1 \
 	file://arm-thumb-cache.patch;patch=1 \
-	file://ldflags.patch;patch=1 \
 	file://zecke-xgcc-cpp.patch;patch=1 \
 	file://unbreak-armv4t.patch;patch=1 \
 	file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
diff --git a/recipes/gcc/gcc-4.2.3/ldflags.patch b/recipes/gcc/gcc-4.2.3/ldflags.patch
deleted file mode 100644
index 9576f60778..0000000000
--- a/recipes/gcc/gcc-4.2.3/ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- /tmp/Makefile.in	2006-02-23 20:56:01.399758728 +0100
-+++ gcc-4.1-20060217/Makefile.in	2006-02-23 20:56:16.874406224 +0100
-@@ -334,7 +334,7 @@
- CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@ 
- PICFLAG_FOR_TARGET = 
- 
- # ------------------------------------
---- /tmp/Makefile.tpl	2006-02-23 20:50:34.077519272 +0100
-+++ gcc-4.1-20060217/Makefile.tpl	2006-02-23 21:04:31.092273688 +0100
-@@ -337,7 +337,7 @@
- CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@ 
- PICFLAG_FOR_TARGET = 
- 
- # ------------------------------------
diff --git a/recipes/gcc/gcc-4.2.4.inc b/recipes/gcc/gcc-4.2.4.inc
index 085f241558..74f953d69a 100644
--- a/recipes/gcc/gcc-4.2.4.inc
+++ b/recipes/gcc/gcc-4.2.4.inc
@@ -28,7 +28,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://gcc41-configure.in.patch;patch=1 \
 	file://arm-thumb.patch;patch=1 \
 	file://arm-thumb-cache.patch;patch=1 \
-	file://ldflags.patch;patch=1 \
 	file://zecke-xgcc-cpp.patch;patch=1 \
 	file://unbreak-armv4t.patch;patch=1 \
 	file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
diff --git a/recipes/gcc/gcc-4.2.4/ldflags.patch b/recipes/gcc/gcc-4.2.4/ldflags.patch
deleted file mode 100644
index 9576f60778..0000000000
--- a/recipes/gcc/gcc-4.2.4/ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- /tmp/Makefile.in	2006-02-23 20:56:01.399758728 +0100
-+++ gcc-4.1-20060217/Makefile.in	2006-02-23 20:56:16.874406224 +0100
-@@ -334,7 +334,7 @@
- CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@ 
- PICFLAG_FOR_TARGET = 
- 
- # ------------------------------------
---- /tmp/Makefile.tpl	2006-02-23 20:50:34.077519272 +0100
-+++ gcc-4.1-20060217/Makefile.tpl	2006-02-23 21:04:31.092273688 +0100
-@@ -337,7 +337,7 @@
- CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@ 
- PICFLAG_FOR_TARGET = 
- 
- # ------------------------------------
diff --git a/recipes/gcc/gcc-4.4.0/ldflags.patch b/recipes/gcc/gcc-4.4.0/ldflags.patch
deleted file mode 100644
index 9576f60778..0000000000
--- a/recipes/gcc/gcc-4.4.0/ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- /tmp/Makefile.in	2006-02-23 20:56:01.399758728 +0100
-+++ gcc-4.1-20060217/Makefile.in	2006-02-23 20:56:16.874406224 +0100
-@@ -334,7 +334,7 @@
- CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@ 
- PICFLAG_FOR_TARGET = 
- 
- # ------------------------------------
---- /tmp/Makefile.tpl	2006-02-23 20:50:34.077519272 +0100
-+++ gcc-4.1-20060217/Makefile.tpl	2006-02-23 21:04:31.092273688 +0100
-@@ -337,7 +337,7 @@
- CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@ 
- PICFLAG_FOR_TARGET = 
- 
- # ------------------------------------
diff --git a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb
index d78ab75c81..8859a47331 100644
--- a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb
+++ b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb
@@ -1,6 +1,6 @@
 inherit canadian-sdk
 
-PR = "r2"
+PR = "r3"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 
diff --git a/recipes/gcc/gcc-configure-common.inc b/recipes/gcc/gcc-configure-common.inc
index e88cee5cb2..ee5784afc3 100644
--- a/recipes/gcc/gcc-configure-common.inc
+++ b/recipes/gcc/gcc-configure-common.inc
@@ -74,6 +74,11 @@ do_configure () {
 	export CXXFLAGS_FOR_BUILD="${BUILD_CXXFLAGS}"
 	export LDFLAGS_FOR_BUILD="${BUILD_LDFLAGS}"
 	export ARCH_FLAGS_FOR_TARGET="${ARCH_FLAGS_FOR_TARGET}"
+
+	# Make sure LDFLAGS are honored.
+	sed -i 's/^LDFLAGS = $/LDFLAGS = @LDFLAGS@/' ${S}/Makefile.in
+	sed -i 's/^LDFLAGS = $/LDFLAGS = @LDFLAGS@/' ${S}/Makefile.tpl
+
 	(cd ${S} && gnu-configize) || die "failure running gnu-configize"
 
 	# splice our idea of where the headers live into gcc's world
diff --git a/recipes/gcc/gcc-cross_3.3.3.bb b/recipes/gcc/gcc-cross_3.3.3.bb
index 73ae287686..b5547399ca 100644
--- a/recipes/gcc/gcc-cross_3.3.3.bb
+++ b/recipes/gcc/gcc-cross_3.3.3.bb
@@ -1,4 +1,4 @@
-PR = "r6"
+PR = "r7"
 
 require gcc-${PV}.inc
 require gcc-cross.inc
diff --git a/recipes/gcc/gcc-cross_3.3.4.bb b/recipes/gcc/gcc-cross_3.3.4.bb
index 6513704341..462b9cdc66 100644
--- a/recipes/gcc/gcc-cross_3.3.4.bb
+++ b/recipes/gcc/gcc-cross_3.3.4.bb
@@ -1,4 +1,4 @@
-PR ="r9"
+PR ="r10"
 
 require gcc-${PV}.inc
 require gcc-cross.inc
diff --git a/recipes/gcc/gcc-cross_3.4.3.bb b/recipes/gcc/gcc-cross_3.4.3.bb
index 83319f1814..0ecee8ad89 100644
--- a/recipes/gcc/gcc-cross_3.4.3.bb
+++ b/recipes/gcc/gcc-cross_3.4.3.bb
@@ -1,4 +1,4 @@
-PR = "r17"
+PR = "r18"
 
 require gcc-${PV}.inc
 require gcc-cross.inc
diff --git a/recipes/gcc/gcc-cross_3.4.4.bb b/recipes/gcc/gcc-cross_3.4.4.bb
index ccc2ceea69..43d4b76037 100644
--- a/recipes/gcc/gcc-cross_3.4.4.bb
+++ b/recipes/gcc/gcc-cross_3.4.4.bb
@@ -1,4 +1,4 @@
-PR = "r13"
+PR = "r14"
 
 require gcc-${PV}.inc
 require gcc-cross.inc
diff --git a/recipes/gcc/gcc-cross_4.1.1.bb b/recipes/gcc/gcc-cross_4.1.1.bb
index fb4ee71fb0..da797597d7 100644
--- a/recipes/gcc/gcc-cross_4.1.1.bb
+++ b/recipes/gcc/gcc-cross_4.1.1.bb
@@ -1,4 +1,4 @@
-PR = "r23"
+PR = "r22"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/recipes/gcc/gcc-cross_4.1.2.bb b/recipes/gcc/gcc-cross_4.1.2.bb
index 51a5c8a01c..2effd3e62e 100644
--- a/recipes/gcc/gcc-cross_4.1.2.bb
+++ b/recipes/gcc/gcc-cross_4.1.2.bb
@@ -1,4 +1,4 @@
-PR = "r19"
+PR = "r20"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/recipes/gcc/gcc-cross_4.2.1.bb b/recipes/gcc/gcc-cross_4.2.1.bb
index 2df95c22b9..b2dba3956a 100644
--- a/recipes/gcc/gcc-cross_4.2.1.bb
+++ b/recipes/gcc/gcc-cross_4.2.1.bb
@@ -1,4 +1,4 @@
-PR = "r19"
+PR = "r20"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/recipes/gcc/gcc-cross_4.2.2.bb b/recipes/gcc/gcc-cross_4.2.2.bb
index a24370fd59..8e20d03e68 100644
--- a/recipes/gcc/gcc-cross_4.2.2.bb
+++ b/recipes/gcc/gcc-cross_4.2.2.bb
@@ -1,4 +1,4 @@
-PR = "r13"
+PR = "r14"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/recipes/gcc/gcc-cross_4.2.3.bb b/recipes/gcc/gcc-cross_4.2.3.bb
index dc3ee94a52..816eddba19 100644
--- a/recipes/gcc/gcc-cross_4.2.3.bb
+++ b/recipes/gcc/gcc-cross_4.2.3.bb
@@ -1,4 +1,4 @@
-PR = "r9"
+PR = "r10"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/recipes/gcc/gcc-cross_4.2.4.bb b/recipes/gcc/gcc-cross_4.2.4.bb
index 9821d3cd83..11e04594fc 100644
--- a/recipes/gcc/gcc-cross_4.2.4.bb
+++ b/recipes/gcc/gcc-cross_4.2.4.bb
@@ -1,4 +1,4 @@
-PR = "r5"
+PR = "r6"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/recipes/gcc/gcc-cross_csl-arm-2005q3.bb b/recipes/gcc/gcc-cross_csl-arm-2005q3.bb
index 5fa278d651..39abdeb500 100644
--- a/recipes/gcc/gcc-cross_csl-arm-2005q3.bb
+++ b/recipes/gcc/gcc-cross_csl-arm-2005q3.bb
@@ -1,4 +1,4 @@
-PR = "r6"
+PR = "r7"
 
 require gcc-csl-arm-2005q3.inc
 require gcc-cross.inc
diff --git a/recipes/gcc/gcc-cross_csl-arm-2006q1.bb b/recipes/gcc/gcc-cross_csl-arm-2006q1.bb
index 5cb1633cfc..0f28986478 100644
--- a/recipes/gcc/gcc-cross_csl-arm-2006q1.bb
+++ b/recipes/gcc/gcc-cross_csl-arm-2006q1.bb
@@ -1,4 +1,4 @@
-PR = "r5"
+PR = "r6"
 
 require gcc-csl-arm-2006q1.inc
 require gcc-cross.inc
diff --git a/recipes/gcc/gcc-cross_csl-arm-2007q3.bb b/recipes/gcc/gcc-cross_csl-arm-2007q3.bb
index 2230413852..4bd9e632a3 100644
--- a/recipes/gcc/gcc-cross_csl-arm-2007q3.bb
+++ b/recipes/gcc/gcc-cross_csl-arm-2007q3.bb
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
 
 require gcc-csl-arm-2007q3.inc
 require gcc-cross4.inc
diff --git a/recipes/gcc/gcc-cross_csl-arm-2008q1.bb b/recipes/gcc/gcc-cross_csl-arm-2008q1.bb
index 60cf2dae16..59bfd24960 100644
--- a/recipes/gcc/gcc-cross_csl-arm-2008q1.bb
+++ b/recipes/gcc/gcc-cross_csl-arm-2008q1.bb
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
 
 require gcc-csl-arm-2008q1.inc
 require gcc-cross4.inc
diff --git a/recipes/gcc/gcc-csl-arm/ldflags.patch b/recipes/gcc/gcc-csl-arm/ldflags.patch
deleted file mode 100644
index 9576f60778..0000000000
--- a/recipes/gcc/gcc-csl-arm/ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- /tmp/Makefile.in	2006-02-23 20:56:01.399758728 +0100
-+++ gcc-4.1-20060217/Makefile.in	2006-02-23 20:56:16.874406224 +0100
-@@ -334,7 +334,7 @@
- CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@ 
- PICFLAG_FOR_TARGET = 
- 
- # ------------------------------------
---- /tmp/Makefile.tpl	2006-02-23 20:50:34.077519272 +0100
-+++ gcc-4.1-20060217/Makefile.tpl	2006-02-23 21:04:31.092273688 +0100
-@@ -337,7 +337,7 @@
- CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@ 
- PICFLAG_FOR_TARGET = 
- 
- # ------------------------------------
diff --git a/recipes/gcc/gcc-svn/ldflags.patch b/recipes/gcc/gcc-svn/ldflags.patch
deleted file mode 100644
index 9576f60778..0000000000
--- a/recipes/gcc/gcc-svn/ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- /tmp/Makefile.in	2006-02-23 20:56:01.399758728 +0100
-+++ gcc-4.1-20060217/Makefile.in	2006-02-23 20:56:16.874406224 +0100
-@@ -334,7 +334,7 @@
- CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@ 
- PICFLAG_FOR_TARGET = 
- 
- # ------------------------------------
---- /tmp/Makefile.tpl	2006-02-23 20:50:34.077519272 +0100
-+++ gcc-4.1-20060217/Makefile.tpl	2006-02-23 21:04:31.092273688 +0100
-@@ -337,7 +337,7 @@
- CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@ 
- PICFLAG_FOR_TARGET = 
- 
- # ------------------------------------
diff --git a/recipes/gcc/gcc_3.3.3.bb b/recipes/gcc/gcc_3.3.3.bb
index 9fd2b0acc3..1bbab50930 100644
--- a/recipes/gcc/gcc_3.3.3.bb
+++ b/recipes/gcc/gcc_3.3.3.bb
@@ -1,4 +1,4 @@
-PR = "r5"
+PR = "r6"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/recipes/gcc/gcc_3.3.4.bb b/recipes/gcc/gcc_3.3.4.bb
index 9fd2b0acc3..1bbab50930 100644
--- a/recipes/gcc/gcc_3.3.4.bb
+++ b/recipes/gcc/gcc_3.3.4.bb
@@ -1,4 +1,4 @@
-PR = "r5"
+PR = "r6"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/recipes/gcc/gcc_3.4.3.bb b/recipes/gcc/gcc_3.4.3.bb
index 10d868893b..fb5a85a4b5 100644
--- a/recipes/gcc/gcc_3.4.3.bb
+++ b/recipes/gcc/gcc_3.4.3.bb
@@ -1,4 +1,4 @@
-PR = "r16"
+PR = "r17"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/recipes/gcc/gcc_3.4.4.bb b/recipes/gcc/gcc_3.4.4.bb
index 43d55fa601..73e908ae24 100644
--- a/recipes/gcc/gcc_3.4.4.bb
+++ b/recipes/gcc/gcc_3.4.4.bb
@@ -1,4 +1,4 @@
-PR = "r11"
+PR = "r12"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/recipes/gcc/gcc_4.1.1.bb b/recipes/gcc/gcc_4.1.1.bb
index 6ba5972fc1..3d202f9930 100644
--- a/recipes/gcc/gcc_4.1.1.bb
+++ b/recipes/gcc/gcc_4.1.1.bb
@@ -1,4 +1,4 @@
-PR = "r22"
+PR = "r23"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/recipes/gcc/gcc_4.1.2.bb b/recipes/gcc/gcc_4.1.2.bb
index dd88ccdc27..711aa35a32 100644
--- a/recipes/gcc/gcc_4.1.2.bb
+++ b/recipes/gcc/gcc_4.1.2.bb
@@ -1,4 +1,4 @@
-PR = "r14"
+PR = "r15"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/recipes/gcc/gcc_4.2.1.bb b/recipes/gcc/gcc_4.2.1.bb
index a8c8b71648..dd88ccdc27 100644
--- a/recipes/gcc/gcc_4.2.1.bb
+++ b/recipes/gcc/gcc_4.2.1.bb
@@ -1,4 +1,4 @@
-PR = "r13"
+PR = "r14"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/recipes/gcc/gcc_4.2.2.bb b/recipes/gcc/gcc_4.2.2.bb
index 582fff49ac..f0471d473f 100644
--- a/recipes/gcc/gcc_4.2.2.bb
+++ b/recipes/gcc/gcc_4.2.2.bb
@@ -1,4 +1,4 @@
-PR = "r10"
+PR = "r11"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/recipes/gcc/gcc_4.2.3.bb b/recipes/gcc/gcc_4.2.3.bb
index a2ae0c0e92..ca22e0f69c 100644
--- a/recipes/gcc/gcc_4.2.3.bb
+++ b/recipes/gcc/gcc_4.2.3.bb
@@ -1,4 +1,4 @@
-PR = "r8"
+PR = "r9"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/recipes/gcc/gcc_4.2.4.bb b/recipes/gcc/gcc_4.2.4.bb
index 033f33f8d3..318ccd3775 100644
--- a/recipes/gcc/gcc_4.2.4.bb
+++ b/recipes/gcc/gcc_4.2.4.bb
@@ -1,4 +1,4 @@
-PR = "r3"
+PR = "r4"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
-- 
cgit v1.2.3


From 1f7055b6bbc26c5243cd809d5974b418545fdf03 Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@embeddedalley.com>
Date: Thu, 30 Apr 2009 08:55:10 -0700
Subject: gcc 4.0.0: Fix fortran building, disable libmudflap/ssp, add
 gcc-posix-open-fix.patch, add missing cross-initial/cross-intermediate files,
 really honor LDFLAGS, bump PR

---
 recipes/gcc/gcc-4.0.0.inc                   |  8 +++++---
 recipes/gcc/gcc-4.0.0/ldflags.patch         | 22 ----------------------
 recipes/gcc/gcc-cross-initial_4.0.0.bb      |  6 ++++++
 recipes/gcc/gcc-cross-intermediate_4.0.0.bb |  4 ++++
 recipes/gcc/gcc-cross_4.0.0.bb              |  2 +-
 recipes/gcc/gcc_4.0.0.bb                    |  2 +-
 6 files changed, 17 insertions(+), 27 deletions(-)
 delete mode 100644 recipes/gcc/gcc-4.0.0/ldflags.patch
 create mode 100644 recipes/gcc/gcc-cross-initial_4.0.0.bb
 create mode 100644 recipes/gcc/gcc-cross-intermediate_4.0.0.bb

diff --git a/recipes/gcc/gcc-4.0.0.inc b/recipes/gcc/gcc-4.0.0.inc
index 5745ba050d..fe56c3443b 100644
--- a/recipes/gcc/gcc-4.0.0.inc
+++ b/recipes/gcc/gcc-4.0.0.inc
@@ -1,11 +1,13 @@
 require gcc-common.inc
 
+DEPENDS = "mpfr gmp"
+
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
-	file://zecke-xgcc-cpp.patch;patch=1 \
-	file://ldflags.patch;patch=1"
+	file://gcc-posix-open-fix.patch;patch=1 \
+	file://zecke-xgcc-cpp.patch;patch=1"
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
 # Language Overrides
 FORTRAN = ",f95"
 
-EXTRA_OECONF_BASE = "--disable-libssp"
+EXTRA_OECONF_BASE = "--disable-libssp --disable-libmudflap"
diff --git a/recipes/gcc/gcc-4.0.0/ldflags.patch b/recipes/gcc/gcc-4.0.0/ldflags.patch
deleted file mode 100644
index 1196bf0c8e..0000000000
--- a/recipes/gcc/gcc-4.0.0/ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gcc-4.0.0/Makefile.tpl.old	2005-06-10 13:05:09.000000000 +0100
-+++ gcc-4.0.0/Makefile.tpl	2005-06-10 13:05:10.000000000 +0100
-@@ -339,7 +339,7 @@
- NM = @NM@
- 
- LD = @LD@
--LDFLAGS = 
-+LDFLAGS = @LDFLAGS@
- 
- RANLIB = @RANLIB@
- 
---- gcc-4.0.0/Makefile.in.old	2005-06-10 17:13:12.000000000 +0100
-+++ gcc-4.0.0/Makefile.in	2005-06-10 17:13:22.000000000 +0100
-@@ -336,7 +336,7 @@
- NM = @NM@
- 
- LD = @LD@
--LDFLAGS = 
-+LDFLAGS = @LDFLAGS@
- 
- RANLIB = @RANLIB@
- 
diff --git a/recipes/gcc/gcc-cross-initial_4.0.0.bb b/recipes/gcc/gcc-cross-initial_4.0.0.bb
new file mode 100644
index 0000000000..976cd96b00
--- /dev/null
+++ b/recipes/gcc/gcc-cross-initial_4.0.0.bb
@@ -0,0 +1,6 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-initial.inc
+
+DEPENDS += "gmp-native mpfr-native"
+
+EXTRA_OECONF += "--disable-multilib --disable-libssp --disable-libmudflap"
diff --git a/recipes/gcc/gcc-cross-intermediate_4.0.0.bb b/recipes/gcc/gcc-cross-intermediate_4.0.0.bb
new file mode 100644
index 0000000000..1feb434a21
--- /dev/null
+++ b/recipes/gcc/gcc-cross-intermediate_4.0.0.bb
@@ -0,0 +1,4 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-intermediate.inc
+
+EXTRA_OECONF += "--disable-multilib --disable-libssp --disable-libmudflap"
diff --git a/recipes/gcc/gcc-cross_4.0.0.bb b/recipes/gcc/gcc-cross_4.0.0.bb
index e192d82adc..e9e2e7bae8 100644
--- a/recipes/gcc/gcc-cross_4.0.0.bb
+++ b/recipes/gcc/gcc-cross_4.0.0.bb
@@ -1,4 +1,4 @@
-PR = "r8"
+PR = "r9"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/recipes/gcc/gcc_4.0.0.bb b/recipes/gcc/gcc_4.0.0.bb
index 1bbab50930..5e2598079b 100644
--- a/recipes/gcc/gcc_4.0.0.bb
+++ b/recipes/gcc/gcc_4.0.0.bb
@@ -1,4 +1,4 @@
-PR = "r6"
+PR = "r7"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
-- 
cgit v1.2.3


From 8592e94690ed21c95c2244b2873aec109350a14b Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@embeddedalley.com>
Date: Thu, 30 Apr 2009 08:59:11 -0700
Subject: gcc 4.0.2: Disable libmudflap/ssp, add gcc-posix-open-fix.patch,
 really honor LDFLAGS, bump PR

---
 recipes/gcc/gcc-4.0.2.inc                   |  5 ++---
 recipes/gcc/gcc-4.0.2/ldflags.patch         | 22 ----------------------
 recipes/gcc/gcc-cross-initial_4.0.2.bb      |  2 +-
 recipes/gcc/gcc-cross-intermediate_4.0.2.bb |  2 +-
 recipes/gcc/gcc-cross_4.0.2.bb              |  2 +-
 recipes/gcc/gcc_4.0.2.bb                    |  2 +-
 6 files changed, 6 insertions(+), 29 deletions(-)
 delete mode 100644 recipes/gcc/gcc-4.0.2/ldflags.patch

diff --git a/recipes/gcc/gcc-4.0.2.inc b/recipes/gcc/gcc-4.0.2.inc
index e3fafb8a7f..a80e4010b3 100644
--- a/recipes/gcc/gcc-4.0.2.inc
+++ b/recipes/gcc/gcc-4.0.2.inc
@@ -3,9 +3,9 @@ require gcc-common.inc
 DEPENDS = "mpfr gmp"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
+	file://gcc-posix-open-fix.patch;patch=1 \
 	file://arm-nolibfloat.patch;patch=1 \
 	file://arm-softfloat.patch;patch=1 \
-	file://ldflags.patch;patch=1 \
 	file://GCOV_PREFIX_STRIP-cross-profile_4.1.patch;patch=1 \
 	file://zecke-xgcc-cpp.patch;patch=1 "
 
@@ -25,5 +25,4 @@ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 # Language Overrides
 FORTRAN = ""
 
-EXTRA_OECONF_BASE = "--disable-libssp"
-
+EXTRA_OECONF_BASE = "--disable-libssp --disable-libmudflap"
diff --git a/recipes/gcc/gcc-4.0.2/ldflags.patch b/recipes/gcc/gcc-4.0.2/ldflags.patch
deleted file mode 100644
index 1196bf0c8e..0000000000
--- a/recipes/gcc/gcc-4.0.2/ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gcc-4.0.0/Makefile.tpl.old	2005-06-10 13:05:09.000000000 +0100
-+++ gcc-4.0.0/Makefile.tpl	2005-06-10 13:05:10.000000000 +0100
-@@ -339,7 +339,7 @@
- NM = @NM@
- 
- LD = @LD@
--LDFLAGS = 
-+LDFLAGS = @LDFLAGS@
- 
- RANLIB = @RANLIB@
- 
---- gcc-4.0.0/Makefile.in.old	2005-06-10 17:13:12.000000000 +0100
-+++ gcc-4.0.0/Makefile.in	2005-06-10 17:13:22.000000000 +0100
-@@ -336,7 +336,7 @@
- NM = @NM@
- 
- LD = @LD@
--LDFLAGS = 
-+LDFLAGS = @LDFLAGS@
- 
- RANLIB = @RANLIB@
- 
diff --git a/recipes/gcc/gcc-cross-initial_4.0.2.bb b/recipes/gcc/gcc-cross-initial_4.0.2.bb
index 70877fe626..ffe5fe37eb 100644
--- a/recipes/gcc/gcc-cross-initial_4.0.2.bb
+++ b/recipes/gcc/gcc-cross-initial_4.0.2.bb
@@ -1,4 +1,4 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
 
-EXTRA_OECONF += "--disable-multilib"
+EXTRA_OECONF += "--disable-multilib --disable-libssp --disable-libmudflap"
diff --git a/recipes/gcc/gcc-cross-intermediate_4.0.2.bb b