From 538df84934d7885b0cc150a6ffb3d7b6be04d797 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Fri, 9 Mar 2007 12:21:50 +0000
Subject: aircrack: clean up in accordance with OE policy. removed superfluous
 (R)DEPENDS lines.

---
 packages/aircrack/aircrack-ng_0.7.bb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'packages')

diff --git a/packages/aircrack/aircrack-ng_0.7.bb b/packages/aircrack/aircrack-ng_0.7.bb
index 3093c39955..bf5bd27d9d 100644
--- a/packages/aircrack/aircrack-ng_0.7.bb
+++ b/packages/aircrack/aircrack-ng_0.7.bb
@@ -2,10 +2,7 @@ SECTION = "console/network"
 DESCRIPTION = "Aircrack-ng is a set of tools for wep key statistical cracking"
 HOMEPAGE = "http://www.aircrack-ng.org/"
 LICENSE = "GPLv2"
-MAINTAINER = "Zero_Chaos <sidhayn@gmail.com>"
-DEPENDS = ""
-RDEPENDS = ""
-PR="r2"
+PR = "r2"
 
 SRC_URI = "http://download.aircrack-ng.org/aircrack-ng-${PV}.tar.gz"
 
-- 
cgit v1.2.3


From 92708f5323fb8ab3731f331bab971417dc95ea53 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sat, 10 Mar 2007 01:54:28 +0000
Subject: procps: unify

---
 packages/procps/procps.inc       | 14 ++++++++++++++
 packages/procps/procps_3.1.15.bb | 15 ++-------------
 packages/procps/procps_3.2.1.bb  | 16 +++-------------
 packages/procps/procps_3.2.5.bb  | 19 ++++---------------
 packages/procps/procps_3.2.7.bb  | 19 ++++---------------
 5 files changed, 27 insertions(+), 56 deletions(-)
 create mode 100644 packages/procps/procps.inc

(limited to 'packages')

diff --git a/packages/procps/procps.inc b/packages/procps/procps.inc
new file mode 100644
index 0000000000..ddc8030077
--- /dev/null
+++ b/packages/procps/procps.inc
@@ -0,0 +1,14 @@
+DESCRIPTION = "Procps is the package that has a bunch \
+of small useful utilities that give information \
+about processes using the /proc filesystem. The package \
+includes the programs ps, top, vmstat, w, kill, and skill."
+HOMEPAGE = "http://procps.sf.net"
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "ncurses"
+
+SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
+           file://install.patch;patch=1"
+
+inherit autotools
diff --git a/packages/procps/procps_3.1.15.bb b/packages/procps/procps_3.1.15.bb
index 12d6a43fd2..01114e80dc 100644
--- a/packages/procps/procps_3.1.15.bb
+++ b/packages/procps/procps_3.1.15.bb
@@ -1,17 +1,6 @@
-LICENSE = "GPL"
-DESCRIPTION = "Procps is the package that has a bunch \
-of small useful utilities that give information \
-about processes using the /proc filesystem. The package \
-includes the programs ps, top, vmstat, w, kill, and skill."
-SECTION = "base"
-PRIORITY = "optional"
-DEPENDS = "ncurses"
+require procps.inc
 
-SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
-           file://procps_${PV}-2.diff;patch=1 \
-           file://install.patch;patch=1"
-
-inherit autotools
+SRC_URI += "file://procps_${PV}-2.diff;patch=1"
 
 EXTRA_OEMAKE = "CFLAGS=-I${STAGING_INCDIR} \
                 LDFLAGS=-L${STAGING_LIBDIR} -Wl,--rpath-link,${STAGING_LIBDIR} \
diff --git a/packages/procps/procps_3.2.1.bb b/packages/procps/procps_3.2.1.bb
index 3c0aaf547a..33df399c5f 100644
--- a/packages/procps/procps_3.2.1.bb
+++ b/packages/procps/procps_3.2.1.bb
@@ -1,18 +1,8 @@
-LICENSE = "GPL"
-DESCRIPTION = "Procps is the package that has a bunch \
-of small useful utilities that give information \
-about processes using the /proc filesystem. The package \
-includes the programs ps, top, vmstat, w, kill, and skill."
-SECTION = "base"
-PRIORITY = "optional"
-DEPENDS = "ncurses"
-PR = "r1"
+require procps.inc
 
-SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
-           file://install.patch;patch=1 \
-           file://pagesz-not-constant.patch;patch=1"
+PR = "r1"
 
-inherit autotools
+SRC_URI += "file://pagesz-not-constant.patch;patch=1"
 
 EXTRA_OEMAKE = "CFLAGS=-I${STAGING_INCDIR} \
                 LDFLAGS=-L${STAGING_LIBDIR} -Wl,--rpath-link,${STAGING_LIBDIR} \
diff --git a/packages/procps/procps_3.2.5.bb b/packages/procps/procps_3.2.5.bb
index 5101874a5b..de7524b2cb 100644
--- a/packages/procps/procps_3.2.5.bb
+++ b/packages/procps/procps_3.2.5.bb
@@ -1,21 +1,10 @@
-LICENSE = "GPL"
-DESCRIPTION = "Procps is the package that has a bunch \
-of small useful utilities that give information \
-about processes using the /proc filesystem. The package \
-includes the programs ps, top, vmstat, w, kill, and skill."
-SECTION = "base"
-PRIORITY = "optional"
-DEPENDS = "ncurses"
-PR = "r5"
-
-SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
-           file://install.patch;patch=1 \
-           file://procmodule.patch;patch=1 \
-           file://psmodule.patch;patch=1"
+require procps.inc
 
+PR = "r5"
 
+SRC_URI += "file://procmodule.patch;patch=1 \
+            file://psmodule.patch;patch=1"
 
-inherit autotools
 FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \
 	 ${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \
 	 ${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \
diff --git a/packages/procps/procps_3.2.7.bb b/packages/procps/procps_3.2.7.bb
index 5101874a5b..de7524b2cb 100644
--- a/packages/procps/procps_3.2.7.bb
+++ b/packages/procps/procps_3.2.7.bb
@@ -1,21 +1,10 @@
-LICENSE = "GPL"
-DESCRIPTION = "Procps is the package that has a bunch \
-of small useful utilities that give information \
-about processes using the /proc filesystem. The package \
-includes the programs ps, top, vmstat, w, kill, and skill."
-SECTION = "base"
-PRIORITY = "optional"
-DEPENDS = "ncurses"
-PR = "r5"
-
-SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
-           file://install.patch;patch=1 \
-           file://procmodule.patch;patch=1 \
-           file://psmodule.patch;patch=1"
+require procps.inc
 
+PR = "r5"
 
+SRC_URI += "file://procmodule.patch;patch=1 \
+            file://psmodule.patch;patch=1"
 
-inherit autotools
 FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \
 	 ${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \
 	 ${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \
-- 
cgit v1.2.3


From 3984d2df5f1235473fa46314852659e040965be5 Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 11 Mar 2007 22:16:24 +0000
Subject: disapproval of revision 'e7f88b3d1877bd1013495ae0870737c163c6c433'

---
 packages/gcc/gcc-4.1.1/gcc-ignore-cache.patch | 15 ---------------
 packages/gcc/gcc-4.1.2/gcc-ignore-cache.patch | 15 ---------------
 packages/gcc/gcc_4.1.1.bb                     |  3 +--
 packages/gcc/gcc_4.1.2.bb                     |  3 +--
 4 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 packages/gcc/gcc-4.1.1/gcc-ignore-cache.patch
 delete mode 100644 packages/gcc/gcc-4.1.2/gcc-ignore-cache.patch

(limited to 'packages')

diff --git a/packages/gcc/gcc-4.1.1/gcc-ignore-cache.patch b/packages/gcc/gcc-4.1.1/gcc-ignore-cache.patch
deleted file mode 100644
index 396b4b2345..0000000000
--- a/packages/gcc/gcc-4.1.1/gcc-ignore-cache.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- /gcc/orig-configure	2007-03-11 21:50:28.000000000 +0200
-+++ /gcc/configure	2007-03-11 21:53:27.000000000 +0200
-@@ -12272,9 +12272,11 @@
- 	esac
- 	saved_CFLAGS="${CFLAGS}"
- 	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
-+        CONFIG_SITE=""
- 	${realsrcdir}/configure \
- 		--enable-languages=${enable_languages-all} \
--		--target=$target_alias --host=$build_alias --build=$build_alias
-+		--target=$target_alias --host=$build_alias --build=$build_alias \
-+                --cache-file=./tmp-cache
- 	CFLAGS="${saved_CFLAGS}"
- 
- 	# We just finished tests for the build machine, so rename
diff --git a/packages/gcc/gcc-4.1.2/gcc-ignore-cache.patch b/packages/gcc/gcc-4.1.2/gcc-ignore-cache.patch
deleted file mode 100644
index 396b4b2345..0000000000
--- a/packages/gcc/gcc-4.1.2/gcc-ignore-cache.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- /gcc/orig-configure	2007-03-11 21:50:28.000000000 +0200
-+++ /gcc/configure	2007-03-11 21:53:27.000000000 +0200
-@@ -12272,9 +12272,11 @@
- 	esac
- 	saved_CFLAGS="${CFLAGS}"
- 	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
-+        CONFIG_SITE=""
- 	${realsrcdir}/configure \
- 		--enable-languages=${enable_languages-all} \
--		--target=$target_alias --host=$build_alias --build=$build_alias
-+		--target=$target_alias --host=$build_alias --build=$build_alias \
-+                --cache-file=./tmp-cache
- 	CFLAGS="${saved_CFLAGS}"
- 
- 	# We just finished tests for the build machine, so rename
diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb
index 08ec8a0fa0..104a8abb76 100644
--- a/packages/gcc/gcc_4.1.1.bb
+++ b/packages/gcc/gcc_4.1.1.bb
@@ -1,4 +1,4 @@
-PR = "r11"
+PR = "r10"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
@@ -32,7 +32,6 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \
 	file://unbreak-armv4t.patch;patch=1 \
         file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
         file://gcc-4.1.1-pr13685-1.patch;patch=1 \
-        file://gcc-ignore-cache.patch;patch=1 \
 	"
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
diff --git a/packages/gcc/gcc_4.1.2.bb b/packages/gcc/gcc_4.1.2.bb
index 2794ffca8b..91f6624aa1 100644
--- a/packages/gcc/gcc_4.1.2.bb
+++ b/packages/gcc/gcc_4.1.2.bb
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r0"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
@@ -24,7 +24,6 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 \
 	file://arm-nolibfloat.patch;patch=1 \
 	file://arm-softfloat.patch;patch=1 \
 	file://gcc41-configure.in.patch;patch=1 \
-	file://gcc-ignore-cache.patch;patch=1 \
 	file://arm-thumb.patch;patch=1 \
 	file://arm-thumb-cache.patch;patch=1 \
 	file://ldflags.patch;patch=1 \
-- 
cgit v1.2.3


From 2a46e35f47253a8f6f7e1c16356fed58c9c3214e Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 11 Mar 2007 06:35:08 +0000
Subject: task-mokogateway: Fixed the PR

---
 packages/tasks/task-mokogateway.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/tasks/task-mokogateway.bb b/packages/tasks/task-mokogateway.bb
index 1d05af8c4f..a17d9c668c 100644
--- a/packages/tasks/task-mokogateway.bb
+++ b/packages/tasks/task-mokogateway.bb
@@ -3,7 +3,7 @@ ALLOW_EMPTY = "1"
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
 PROVIDES = "task-mokogateway-everything"
-PR = "2"
+PR = "r2"
 
 PACKAGES = "\
 	task-mokogateway-everything \
-- 
cgit v1.2.3


From a6a448bf3250cc6c1228f334fbfc2c44a05faa6f Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 11 Mar 2007 14:36:06 +0000
Subject: linux-turbostation: Update to 2.6.20.2, repartition, remove
 unneccessary patches

---
 .../linux-turbostation/2.6.20.1/.mtn2git_empty     |  0
 packages/linux/linux-turbostation/defconfig        |  5 +-
 .../linux-2.6.16_arch_ppc_syslib_open_pic.c        | 14 ------
 .../linux-2.6.16_drivers_i2c_chips_Kconfig         | 17 -------
 .../linux-2.6.16_drivers_i2c_chips_Makefile        | 12 -----
 .../linux-2.6.16_drivers_mtd_maps_physmap.c        | 38 +++++++++------
 .../linux-2.6.16_drivers_net_r8169.c               | 13 -----
 packages/linux/linux-turbostation_2.6.20.1.bb      | 55 ----------------------
 packages/linux/linux-turbostation_2.6.20.2.bb      | 51 ++++++++++++++++++++
 9 files changed, 77 insertions(+), 128 deletions(-)
 delete mode 100644 packages/linux/linux-turbostation/2.6.20.1/.mtn2git_empty
 delete mode 100644 packages/linux/linux-turbostation/linux-2.6.16_arch_ppc_syslib_open_pic.c
 delete mode 100644 packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Kconfig
 delete mode 100644 packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Makefile
 delete mode 100644 packages/linux/linux-turbostation/linux-2.6.16_drivers_net_r8169.c
 delete mode 100644 packages/linux/linux-turbostation_2.6.20.1.bb
 create mode 100644 packages/linux/linux-turbostation_2.6.20.2.bb

(limited to 'packages')

diff --git a/packages/linux/linux-turbostation/2.6.20.1/.mtn2git_empty b/packages/linux/linux-turbostation/2.6.20.1/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/linux/linux-turbostation/defconfig b/packages/linux/linux-turbostation/defconfig
index 4930877637..094f6f3708 100644
--- a/packages/linux/linux-turbostation/defconfig
+++ b/packages/linux/linux-turbostation/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20.1
-# Thu Mar  8 19:11:26 2007
+# Linux kernel version: 2.6.20.2
+# Sun Mar 11 15:29:33 2007
 #
 CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
@@ -958,7 +958,6 @@ CONFIG_I2C_MPC=y
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_M41T00 is not set
 # CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_SENSORS_S35390A is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
diff --git a/packages/linux/linux-turbostation/linux-2.6.16_arch_ppc_syslib_open_pic.c b/packages/linux/linux-turbostation/linux-2.6.16_arch_ppc_syslib_open_pic.c
deleted file mode 100644
index 05b2a41e7f..0000000000
--- a/packages/linux/linux-turbostation/linux-2.6.16_arch_ppc_syslib_open_pic.c
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: linux-2.6.20.1/arch/ppc/syslib/open_pic.c
-===================================================================
---- linux-2.6.20.1.orig/arch/ppc/syslib/open_pic.c	2007-02-20 07:34:32.000000000 +0100
-+++ linux-2.6.20.1/arch/ppc/syslib/open_pic.c	2007-02-26 02:26:56.000000000 +0100
-@@ -318,7 +318,8 @@
- #ifdef CONFIG_EPIC_SERIAL_MODE
- 	/* Have to start from ground zero.
- 	*/
--	openpic_reset();
-+	// 2005.09.06, JohnsonCheng Fixed USB device Oops bug
-+	//openpic_reset();
- #endif
- 
- 	if (ppc_md.progress) ppc_md.progress("openpic: enter", 0x122);
diff --git a/packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Kconfig b/packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Kconfig
deleted file mode 100644
index 6cd91368f4..0000000000
--- a/packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Kconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: linux-2.6.20.1/drivers/i2c/chips/Kconfig
-===================================================================
---- linux-2.6.20.1.orig/drivers/i2c/chips/Kconfig	2007-02-20 07:34:32.000000000 +0100
-+++ linux-2.6.20.1/drivers/i2c/chips/Kconfig	2007-02-26 02:27:27.000000000 +0100
-@@ -125,4 +125,12 @@
- 	  This driver can also be built as a module.  If so, the module
- 	  will be called max6875.
- 
-+config SENSORS_S35390A
-+	tristate "S-35390A RTC chip"
-+	depends on I2C && PPC32 && SANDPOINT
-+	help
-+	  If you say yes here you get support for the S-35390A RTC chip/
-+	  
-+	  This driver can also be built as a module.  If so, the module
-+	  will be called i2c-s3531a
- endmenu
diff --git a/packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Makefile b/packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Makefile
deleted file mode 100644
index 3378609724..0000000000
--- a/packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: linux-2.6.20.1/drivers/i2c/chips/Makefile
-===================================================================
---- linux-2.6.20.1.orig/drivers/i2c/chips/Makefile	2007-02-20 07:34:32.000000000 +0100
-+++ linux-2.6.20.1/drivers/i2c/chips/Makefile	2007-02-26 02:27:43.000000000 +0100
-@@ -12,6 +12,7 @@
- obj-$(CONFIG_SENSORS_PCF8591)	+= pcf8591.o
- obj-$(CONFIG_ISP1301_OMAP)	+= isp1301_omap.o
- obj-$(CONFIG_TPS65010)		+= tps65010.o
-+obj-$(CONFIG_SENSORS_S35390A)	+= i2c-s3531a.o
- 
- ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)
- EXTRA_CFLAGS += -DDEBUG
diff --git a/packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c b/packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c
index b73b227220..e1895af53a 100644
--- a/packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c
+++ b/packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c
@@ -1,8 +1,8 @@
-Index: linux-2.6.21-rc2-git3/drivers/mtd/maps/physmap.c
+Index: linux-2.6.20.2/drivers/mtd/maps/physmap.c
 ===================================================================
---- linux-2.6.21-rc2-git3.orig/drivers/mtd/maps/physmap.c	2007-03-06 01:06:56.000000000 +0100
-+++ linux-2.6.21-rc2-git3/drivers/mtd/maps/physmap.c	2007-03-06 01:12:35.000000000 +0100
-@@ -134,13 +134,43 @@
+--- linux-2.6.20.2.orig/drivers/mtd/maps/physmap.c	2007-03-11 15:22:25.000000000 +0100
++++ linux-2.6.20.2/drivers/mtd/maps/physmap.c	2007-03-11 15:28:18.000000000 +0100
+@@ -134,13 +134,53 @@
  	}
  	info->mtd->owner = THIS_MODULE;
  
@@ -11,27 +11,37 @@ Index: linux-2.6.21-rc2-git3/drivers/mtd/maps/physmap.c
 +	  .name = "u-boot",
 +	  .offset = 0x00F00000,
 +	  .size = 0x00040000,
-+	  .mask_flags = MTD_WRITEABLE,  /* force read-only */
++	  .mask_flags = MTD_WRITEABLE,
 +	},
 +	{
-+	  .name = "kernel",             /* default kernel image */
++	  .name = "kernel",
 +	  .offset = 0x00000000,
-+	  .size = 0x00280000,
++	  .size = 0x00200000,
 +	},
 +	{
 +	  .name = "rootfs",
-+	  .offset = 0x00280000,
-+	  .size = 0x00C80000,
++	  .offset = 0x00200000,
++	  .size = 0x00D00000,
 +	},
 +	{
-+	  .name = "empty",
++	  .name = "u-boot env",
 +	  .offset = 0x00F40000,
-+	  .size = 0x000A0000,
++	  .size = 0x00020000,
 +	},
 +	{
-+	  .name = "u-boot env",
-+	  .offset = 0x00FE0000,
++	  .name = "u-boot2",
++	  .offset = 0x00F60000,
++	  .size = 0x00040000,
++	},
++	{
++	  .name = "u-boot2 env",
++	  .offset = 0x00FA0000,
 +	  .size = 0x00020000,
++	},
++	{
++	  .name = "sysconf",
++	  .offset = 0x00FC0000,
++	  .size = 0x00040000,
 +	}
 +};
 +
@@ -43,7 +53,7 @@ Index: linux-2.6.21-rc2-git3/drivers/mtd/maps/physmap.c
  		return 0;
  	}
 -
-+	physmap_set_partitions(TS101_partitions, 5);
++	physmap_set_partitions(TS101_partitions, 7);
  	if (physmap_data->nr_parts) {
  		printk(KERN_NOTICE "Using physmap partition information\n");
  		add_mtd_partitions(info->mtd, physmap_data->parts,
diff --git a/packages/linux/linux-turbostation/linux-2.6.16_drivers_net_r8169.c b/packages/linux/linux-turbostation/linux-2.6.16_drivers_net_r8169.c
deleted file mode 100644
index 8ba15e1a84..0000000000
--- a/packages/linux/linux-turbostation/linux-2.6.16_drivers_net_r8169.c
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: linux-2.6.20.1/drivers/net/r8169.c
-===================================================================
---- linux-2.6.20.1.orig/drivers/net/r8169.c	2007-02-26 03:33:53.000000000 +0100
-+++ linux-2.6.20.1/drivers/net/r8169.c	2007-02-26 03:34:21.000000000 +0100
-@@ -1522,7 +1522,7 @@
- 		goto err_out_disable_2;
- 
- 	/* save power state before pci_enable_device overwrites it */
--	pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM);
-+	pm_cap = 220; // pci_find_capability(pdev, PCI_CAP_ID_PM)
- 	if (pm_cap) {
- 		u16 pwr_command, acpi_idle_state;
- 
diff --git a/packages/linux/linux-turbostation_2.6.20.1.bb b/packages/linux/linux-turbostation_2.6.20.1.bb
deleted file mode 100644
index a74bf1475a..0000000000
--- a/packages/linux/linux-turbostation_2.6.20.1.bb
+++ /dev/null
@@ -1,55 +0,0 @@
-DESCRIPTION = "Linux Kernel for the QNAP TurboStation platform"
-SECTION = "kernel"
-LICENSE = "GPL"
-DEPENDS = "uboot-utils"
-PR = "r6"
-
-COMPATIBLE_MACHINE = "turbostation"
-
-RDEPENDS_kernel-module-zd1211rw += "zd1211-firmware"
-
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-	file://001_r1000.diff;patch=1 \
-	file://linux-2.6.16_arch_ppc_platforms_sandpoint.h;patch=1 \
-	file://linux-2.6.16_drivers_i2c_chips_Makefile;patch=1 \
-	file://002_qnap-pic.diff;patch=1 \
-	file://linux-2.6.16_arch_ppc_syslib_Makefile;patch=1 \
-	file://linux-2.6.16_drivers_mtd_maps_physmap.c;patch=1 \
-	file://linux-2.6.16_arch_ppc_syslib_mpc10x_common.c;patch=1 \
-	file://linux-2.6.16_drivers_net_r8169.c;patch=1 \
-	file://linux-2.6.16_arch_ppc_platforms_Makefile;patch=1 \
-	file://linux-2.6.16_arch_ppc_syslib_open_pic.c;patch=1 \
-	file://linux-2.6.16_include_asm-ppc_mpc10x.h;patch=1 \
-	file://linux-2.6.16_arch_ppc_platforms_sandpoint.c;patch=1 \
-	file://linux-2.6.16_drivers_i2c_chips_Kconfig;patch=1 \
-	file://defconfig"
-
-S = "${WORKDIR}/linux-${PV}"
-
-inherit kernel
-
-KERNEL_IMAGETYPE = "uImage"
-KERNEL_OUTPUT = "arch/${ARCH}/boot/images/${KERNEL_IMAGETYPE}"
-# Override arch. The kernel stuff is in arch/ppc, not arch/powerpc in our case
-ARCH = ppc
-
-do_configure() {
-		install -m 644 ${WORKDIR}/defconfig ${S}/.config
-		make ARCH=ppc oldconfig
-}
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/images/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
-}
-
-#ppc build leaves the kernel in a different place
-#do_movekernel() {
-#
-#}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
-
diff --git a/packages/linux/linux-turbostation_2.6.20.2.bb b/packages/linux/linux-turbostation_2.6.20.2.bb
new file mode 100644
index 0000000000..84701e4a6a
--- /dev/null
+++ b/packages/linux/linux-turbostation_2.6.20.2.bb
@@ -0,0 +1,51 @@
+DESCRIPTION = "Linux Kernel for the QNAP TurboStation platform"
+SECTION = "kernel"
+LICENSE = "GPL"
+DEPENDS = "uboot-utils"
+PR = "r1"
+
+COMPATIBLE_MACHINE = "turbostation"
+
+RDEPENDS_kernel-module-zd1211rw += "zd1211-firmware"
+
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
+	file://001_r1000.diff;patch=1 \
+	file://linux-2.6.16_arch_ppc_platforms_sandpoint.h;patch=1 \
+	file://002_qnap-pic.diff;patch=1 \
+	file://linux-2.6.16_arch_ppc_syslib_Makefile;patch=1 \
+	file://linux-2.6.16_drivers_mtd_maps_physmap.c;patch=1 \
+	file://linux-2.6.16_arch_ppc_syslib_mpc10x_common.c;patch=1 \
+	file://linux-2.6.16_arch_ppc_platforms_Makefile;patch=1 \
+	file://linux-2.6.16_include_asm-ppc_mpc10x.h;patch=1 \
+	file://linux-2.6.16_arch_ppc_platforms_sandpoint.c;patch=1 \
+	file://defconfig"
+
+S = "${WORKDIR}/linux-${PV}"
+
+inherit kernel
+
+KERNEL_IMAGETYPE = "uImage"
+KERNEL_OUTPUT = "arch/${ARCH}/boot/images/${KERNEL_IMAGETYPE}"
+# Override arch. The kernel stuff is in arch/ppc, not arch/powerpc in our case
+ARCH = ppc
+
+do_configure() {
+		install -m 644 ${WORKDIR}/defconfig ${S}/.config
+		make ARCH=ppc oldconfig
+}
+
+do_deploy() {
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/images/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
+}
+
+#ppc build leaves the kernel in a different place
+#do_movekernel() {
+#
+#}
+
+do_deploy[dirs] = "${S}"
+
+addtask deploy before do_build after do_compile
+
+
-- 
cgit v1.2.3


From e0beacec71e8075fcadf4a3b58e0e81f21d6137f Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 11 Mar 2007 14:37:55 +0000
Subject: foonas-image: update kernel/rootfs size

---
 packages/images/foonas-image.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/images/foonas-image.bb b/packages/images/foonas-image.bb
index f5a258b3d9..8d3541c114 100644
--- a/packages/images/foonas-image.bb
+++ b/packages/images/foonas-image.bb
@@ -75,7 +75,7 @@ turbostation_pack_image() {
 	PADFILE=${DEPLOY_DIR_IMAGE}/padfile.zzz
 	HEX_MAX_KERN_SIZE=200000
 	DEC_MAX_KERN_SIZE=`echo "ibase=16; $HEX_MAX_KERN_SIZE" | bc `
-	HEX_MAX_ROOT_SIZE=C80000
+	HEX_MAX_ROOT_SIZE=D00000
 	DEC_MAX_ROOT_SIZE=`echo "ibase=16; $HEX_MAX_ROOT_SIZE" | bc `
 	KERNEL_SIZE=`ls -l $KERNEL | awk '{print $5}'`
 	if [ $KERNEL_SIZE -gt $DEC_MAX_KERN_SIZE ]; then
-- 
cgit v1.2.3


From 8fd93bb81a05c07e59816ad6ac3fe22b4df97c41 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 11 Mar 2007 17:20:18 +0000
Subject: task-mokogateway-wifi: added madwifi for PCI devices, and
 bridge-utils.

---
 packages/tasks/task-mokogateway.bb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'packages')

diff --git a/packages/tasks/task-mokogateway.bb b/packages/tasks/task-mokogateway.bb
index a17d9c668c..fe8672381a 100644
--- a/packages/tasks/task-mokogateway.bb
+++ b/packages/tasks/task-mokogateway.bb
@@ -3,7 +3,7 @@ ALLOW_EMPTY = "1"
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
 PROVIDES = "task-mokogateway-everything"
-PR = "r2"
+PR = "r3"
 
 PACKAGES = "\
 	task-mokogateway-everything \
@@ -53,9 +53,10 @@ RRECOMMENDS_task-mokogateway-bluetooth = "\
 
 DESCRIPTION_task-mokogateway-wifi = "MokoGateway: WiFi"
 RDEPENDS_task-mokogateway-wifi = "\
+	bridge-utils \
 	wireless-tools \
-	${@base_contains("COMBINED_FEATURES", "pcmcia", "hostap-utils", "",d)} \
-	${@base_contains("COMBINED_FEATURES", "pci", "hostap-utils", "",d)} \
+	${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng-modules", "",d)} \
+	${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng-tools", "",d)} \
 	wpa-supplicant \
 "
 RRECOMMENDS_task-mokogateway-wifi = "\
-- 
cgit v1.2.3


From 42f23263ac62da6ef5a7c105afaed3875c75c096 Mon Sep 17 00:00:00 2001
From: Philip Balister <philip@balister.org>
Date: Sun, 11 Mar 2007 18:34:11 +0000
Subject: Add exmap-console from Poky.

---
 packages/exmap-console/.mtn2git_empty       |  0
 packages/exmap-console/exmap-console.inc    | 61 +++++++++++++++++++++++++++++
 packages/exmap-console/exmap-console_0.4.bb |  2 +
 packages/exmap-console/exmap-console_svn.bb | 10 +++++
 4 files changed, 73 insertions(+)
 create mode 100644 packages/exmap-console/.mtn2git_empty
 create mode 100644 packages/exmap-console/exmap-console.inc
 create mode 100644 packages/exmap-console/exmap-console_0.4.bb
 create mode 100644 packages/exmap-console/exmap-console_svn.bb

(limited to 'packages')

diff --git a/packages/exmap-console/.mtn2git_empty b/packages/exmap-console/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/exmap-console/exmap-console.inc b/packages/exmap-console/exmap-console.inc
new file mode 100644
index 0000000000..4c107d5f07
--- /dev/null
+++ b/packages/exmap-console/exmap-console.inc
@@ -0,0 +1,61 @@
+DESCRIPTION = "Console based version of exmap, a memory usage analysis tool"
+HOMEPAGE = "http://projects.o-hand.com/exmap-console"
+SECTION = "devel"
+LICENSE = "GPL"
+DEPENDS = "virtual/kernel"
+
+SRC_URI = "http://projects.o-hand.com/sources/exmap-console/exmap-console-${PV}.tgz"
+
+inherit module-base
+inherit autotools
+
+MYPV := "${PV}"
+
+PACKAGES += "exmap-server kernel-module-exmap"
+
+FILES_exmap-console = "${bindir}/exmap ${bindir}/exmapd"
+PACKAGE_ARCH_exmap-console = "${TARGET_ARCH}"
+RDEPENDS_exmap-console += "kernel-module-exmap"
+
+FILES_exmap-server = "${bindir}/exmapserver"
+PACKAGE_ARCH_exmap-server = "${TARGET_ARCH}"
+RDEPENDS_exmap-server += "kernel-module-exmap"
+
+FILES_kernel-module-exmap = "${base_libdir}"
+PACKAGE_ARCH_kernel-module-exmap = "${MACHINE_ARCH}"
+PV_kernel-module-exmap = "${MYPV}-${KERNEL_VERSION}"
+RDEPENDS_kernel-module-exmap += "kernel (${KERNEL_VERSION})"
+
+S = "${WORKDIR}/exmap-console-${PV}"
+
+export MODULE_PATH="${D}${base_libdir}/modules/${KERNEL_VERSION}"
+
+do_compile() {
+    cd ${S}/src
+    make
+
+    cd ${S}/kernel
+    unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+    oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR}   \
+        KERNEL_SRC=${STAGING_KERNEL_DIR}    \
+        KERNEL_VERSION=${KERNEL_VERSION}    \
+        CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
+        ${MAKE_TARGETS}
+}
+
+do_install() {
+    oe_runmake 'DESTDIR=${D}' 'DEPMOD=/bin/true' install
+}
+
+pkg_postinst_append_kernel-module-exmap () {
+    if [ -n "$D" ]; then
+        exit 1
+    fi
+    depmod -a
+    update-modules || true
+}
+
+pkg_postrm_append_kernel-module-exmap () {
+    update-modules || true
+}
+
diff --git a/packages/exmap-console/exmap-console_0.4.bb b/packages/exmap-console/exmap-console_0.4.bb
new file mode 100644
index 0000000000..5d89f04937
--- /dev/null
+++ b/packages/exmap-console/exmap-console_0.4.bb
@@ -0,0 +1,2 @@
+require exmap-console.inc
+
diff --git a/packages/exmap-console/exmap-console_svn.bb b/packages/exmap-console/exmap-console_svn.bb
new file mode 100644
index 0000000000..9e6ca80dc0
--- /dev/null
+++ b/packages/exmap-console/exmap-console_svn.bb
@@ -0,0 +1,10 @@
+PR = "r10"
+PV = "0.4+svn${SRCDATE}"
+
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=exmap-console;proto=http"
+
+S = "${WORKDIR}/exmap-console"
+
+MYPV := "${PV}"
+PV_kernel-module-exmap = "${MYPV}-${KERNEL_VERSION}"
+
-- 
cgit v1.2.3


From 3233c70592622e3a27e6db1f4ca8fbafb7b642c2 Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 11 Mar 2007 20:51:17 +0000
Subject: gcc: Fix crossbuild issue on x86_64 hosts (4.1.1/4.1.2)

---
 packages/gcc/gcc-4.1.1/gcc-ignore-cache.patch | 15 +++++++++++++++
 packages/gcc/gcc-4.1.2/gcc-ignore-cache.patch | 15 +++++++++++++++
 packages/gcc/gcc_4.1.1.bb                     |  3 ++-
 packages/gcc/gcc_4.1.2.bb                     |  3 ++-
 4 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 packages/gcc/gcc-4.1.1/gcc-ignore-cache.patch
 create mode 100644 packages/gcc/gcc-4.1.2/gcc-ignore-cache.patch

(limited to 'packages')

diff --git a/packages/gcc/gcc-4.1.1/gcc-ignore-cache.patch b/packages/gcc/gcc-4.1.1/gcc-ignore-cache.patch
new file mode 100644
index 0000000000..396b4b2345
--- /dev/null
+++ b/packages/gcc/gcc-4.1.1/gcc-ignore-cache.patch
@@ -0,0 +1,15 @@
+--- /gcc/orig-configure	2007-03-11 21:50:28.000000000 +0200
++++ /gcc/configure	2007-03-11 21:53:27.000000000 +0200
+@@ -12272,9 +12272,11 @@
+ 	esac
+ 	saved_CFLAGS="${CFLAGS}"
+ 	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
++        CONFIG_SITE=""
+ 	${realsrcdir}/configure \
+ 		--enable-languages=${enable_languages-all} \
+-		--target=$target_alias --host=$build_alias --build=$build_alias
++		--target=$target_alias --host=$build_alias --build=$build_alias \
++                --cache-file=./tmp-cache
+ 	CFLAGS="${saved_CFLAGS}"
+ 
+ 	# We just finished tests for the build machine, so rename
diff --git a/packages/gcc/gcc-4.1.2/gcc-ignore-cache.patch b/packages/gcc/gcc-4.1.2/gcc-ignore-cache.patch
new file mode 100644
index 0000000000..396b4b2345
--- /dev/null
+++ b/packages/gcc/gcc-4.1.2/gcc-ignore-cache.patch
@@ -0,0 +1,15 @@
+--- /gcc/orig-configure	2007-03-11 21:50:28.000000000 +0200
++++ /gcc/configure	2007-03-11 21:53:27.000000000 +0200
+@@ -12272,9 +12272,11 @@
+ 	esac
+ 	saved_CFLAGS="${CFLAGS}"
+ 	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
++        CONFIG_SITE=""
+ 	${realsrcdir}/configure \
+ 		--enable-languages=${enable_languages-all} \
+-		--target=$target_alias --host=$build_alias --build=$build_alias
++		--target=$target_alias --host=$build_alias --build=$build_alias \
++                --cache-file=./tmp-cache
+ 	CFLAGS="${saved_CFLAGS}"
+ 
+ 	# We just finished tests for the build machine, so rename
diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb
index 104a8abb76..08ec8a0fa0 100644
--- a/packages/gcc/gcc_4.1.1.bb
+++ b/packages/gcc/gcc_4.1.1.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"
@@ -32,6 +32,7 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \
 	file://unbreak-armv4t.patch;patch=1 \
         file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
         file://gcc-4.1.1-pr13685-1.patch;patch=1 \
+        file://gcc-ignore-cache.patch;patch=1 \
 	"
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
diff --git a/packages/gcc/gcc_4.1.2.bb b/packages/gcc/gcc_4.1.2.bb
index 91f6624aa1..2794ffca8b 100644
--- a/packages/gcc/gcc_4.1.2.bb
+++ b/packages/gcc/gcc_4.1.2.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
@@ -24,6 +24,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 \
 	file://arm-nolibfloat.patch;patch=1 \
 	file://arm-softfloat.patch;patch=1 \
 	file://gcc41-configure.in.patch;patch=1 \
+	file://gcc-ignore-cache.patch;patch=1 \
 	file://arm-thumb.patch;patch=1 \
 	file://arm-thumb-cache.patch;patch=1 \
 	file://ldflags.patch;patch=1 \
-- 
cgit v1.2.3


From 685edbe4043c863b0b9b3f5b1ceb6e578fcf1c5f Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 11 Mar 2007 20:51:52 +0000
Subject: foonas: Add gcc to feed

---
 packages/meta/foonas-packages.bb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'packages')

diff --git a/packages/meta/foonas-packages.bb b/packages/meta/foonas-packages.bb
index 822b7afb2d..da3cb40de7 100644
--- a/packages/meta/foonas-packages.bb
+++ b/packages/meta/foonas-packages.bb
@@ -45,6 +45,7 @@ FOONAS_PACKAGES = "\
 	flite \
 	gallery \
 	gawk \
+	gcc \
 	gdbm \
 	gnu-config \
 	grep \
@@ -119,6 +120,7 @@ FOONAS_PACKAGES = "\
 	syslog-ng \
 	tar \
 	thttpd \
+	tzdata \
 	tiff \
 	unzip \
 	usbutils \
-- 
cgit v1.2.3


From 12c256dd88f6161d5bfcf82b19357e429bf2d596 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sun, 11 Mar 2007 22:02:08 +0000
Subject: glueap: some reordering of fields.  Minor additions and clean-up.

---
 packages/rglueap/rglueap_0.1.bb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'packages')

diff --git a/packages/rglueap/rglueap_0.1.bb b/packages/rglueap/rglueap_0.1.bb
index 2d6cd2c41b..c26bf31eaa 100644
--- a/packages/rglueap/rglueap_0.1.bb
+++ b/packages/rglueap/rglueap_0.1.bb
@@ -1,10 +1,12 @@
-DESCRIPTION = "Raw Glue AP"
-SECTION = "console/network"
+DESCRIPTION = "Raw Glue AP, wireless intrusion detection"
+AUTHOR = "Laurent Butti"
 HOMEPAGE = "http://rfakeap.tuxfamily.org/#Raw_Glue_AP"
+SECTION = "console/network"
+PRIORITY = "optional"
 LICENSE = "GPLv2"
 DEPENDS = "libpcap"
 
-SRC_URI = "http://rfakeap.tuxfamily.org/rglueap-${PV}.tar.gz"
+SRC_URI = "http://rfakeap.tuxfamily.org/${P}.tar.gz"
 
 LDFLAGS += "-lpcap"
 
-- 
cgit v1.2.3


From 31919e6fe94364633281f85620cd2290f445f2b5 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Mon, 12 Mar 2007 07:54:19 +0000
Subject: picocom: add UUCP_LOCK_DIR define and one patch to get it built with
 gcc4

---
 packages/picocom/picocom/.mtn2git_empty |  0
 packages/picocom/picocom/gcc4.patch     | 12 ++++++++++++
 packages/picocom/picocom_1.4.bb         |  9 ++++++---
 3 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 packages/picocom/picocom/.mtn2git_empty
 create mode 100644 packages/picocom/picocom/gcc4.patch

(limited to 'packages')

diff --git a/packages/picocom/picocom/.mtn2git_empty b/packages/picocom/picocom/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/picocom/picocom/gcc4.patch b/packages/picocom/picocom/gcc4.patch
new file mode 100644
index 0000000000..867ca11bf3
--- /dev/null
+++ b/packages/picocom/picocom/gcc4.patch
@@ -0,0 +1,12 @@
+Index: picocom-1.4/picocom.c
+===================================================================
+--- picocom-1.4.orig/picocom.c	2004-08-12 13:45:11.000000000 +0200
++++ picocom-1.4/picocom.c	2007-03-08 14:40:30.000000000 +0100
+@@ -37,6 +37,7 @@
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <limits.h>
++#include <bits/posix1_lim.h>
+ 
+ #define _GNU_SOURCE
+ #include <getopt.h>
diff --git a/packages/picocom/picocom_1.4.bb b/packages/picocom/picocom_1.4.bb
index 04640903b5..8bc3b89e8c 100644
--- a/packages/picocom/picocom_1.4.bb
+++ b/packages/picocom/picocom_1.4.bb
@@ -1,10 +1,13 @@
-DESCRIPTION = "Picocom is a lightweight and minimal (~20K) dumb-terminal emulation program. "
+DESCRIPTION = "Lightweight and minimal (~20K) dumb-terminal emulation program."
 SECTION = "console/utils"
 PRIORITY = "optional"
 LICENSE = "GPL"
-SRC_URI = "http://efault.net/npat/hacks/picocom/dist/picocom-${PV}.tar.gz"
+PR = "r1"
 
-CFLAGS_append = ' -DVERSION_STR=\\"${PV}\\"'
+SRC_URI = "http://efault.net/npat/hacks/picocom/dist/picocom-${PV}.tar.gz \
+           file://gcc4.patch;patch=1"
+
+CFLAGS_append = ' -DVERSION_STR=\\"${PV}\\" -DUUCP_LOCK_DIR'
 
 do_install () {
 	install -d ${D}${bindir}
-- 
cgit v1.2.3


From abb606d76d8dabc164f935ffeada03a0a6063d5d Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Mon, 12 Mar 2007 08:21:33 +0000
Subject: =?UTF-8?q?picocom:=20revert=20part=20of=20my=20changes,=20add=20n?=
 =?UTF-8?q?olock.patch=20written=20by=20Marek=20Va=C5=A1ut=20<marek.vasut@?=
 =?UTF-8?q?gmail.com>=20-=20close=20#1972?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/picocom/picocom/nolock.patch | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 packages/picocom/picocom/nolock.patch

(limited to 'packages')

diff --git a/packages/picocom/picocom/nolock.patch b/packages/picocom/picocom/nolock.patch
new file mode 100644
index 0000000000..42ca57f927
--- /dev/null
+++ b/packages/picocom/picocom/nolock.patch
@@ -0,0 +1,35 @@
+diff -Naur picocom-1.4.orig/picocom.c picocom-1.4/picocom.c
+--- picocom-1.4.orig/picocom.c	2004-08-12 13:45:11.000000000 +0200
++++ picocom-1.4/picocom.c	2007-03-12 00:23:01.000000000 +0100
+@@ -790,7 +790,9 @@
+ 		{"escape", required_argument, 0, 'e'},
+ 		{"noinit", no_argument, 0, 'i'},
+ 		{"noreset", no_argument, 0, 'r'},
++#ifdef UUCP_LOCK_DIR
+ 		{"nolock", no_argument, 0, 'l'},
++#endif
+ 		{"flow", required_argument, 0, 'f'},
+ 		{"baud", required_argument, 0, 'b'},
+ 		{"parity", required_argument, 0, 'p'},
+@@ -827,9 +829,11 @@
+ 		case 'r':
+ 			opts.noreset = 1;
+ 			break;
++#ifdef UUCP_LOCK_DIR
+ 		case 'l':
+ 			opts.nolock = 1;
+ 			break;
++#endif
+ 		case 'e':
+ 			if ( isupper(optarg[0]) )
+ 				opts.escape = optarg[0] - 'A' + 1;
+@@ -930,7 +934,9 @@
+ 	printf("escape is      : C-%c\n", 'a' + opts.escape - 1);
+ 	printf("noinit is      : %s\n", opts.noinit ? "yes" : "no");
+ 	printf("noreset is     : %s\n", opts.noreset ? "yes" : "no");
++#ifdef UUCP_LOCK_DIR
+ 	printf("nolock is      : %s\n", opts.nolock ? "yes" : "no");
++#endif
+ 	printf("send_cmd is    : %s\n", opts.send_cmd);
+ 	printf("receive_cmd is : %s\n", opts.receive_cmd);
+ 	printf("\n");
-- 
cgit v1.2.3


From e429e9bd6215332d5a0250ea77edcf8adbf13d99 Mon Sep 17 00:00:00 2001
From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Mon, 12 Mar 2007 10:38:32 +0000
Subject: gpe-conf: Add missing dependency. Add patch to name sound settings
 script correctly.

---
 packages/gpe-conf/gpe-conf-0.2.4/.mtn2git_empty   |  0
 packages/gpe-conf/gpe-conf-0.2.4/scriptname.patch | 13 +++++++++++++
 packages/gpe-conf/gpe-conf_0.2.4.bb               |  6 ++++--
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 packages/gpe-conf/gpe-conf-0.2.4/.mtn2git_empty
 create mode 100644 packages/gpe-conf/gpe-conf-0.2.4/scriptname.patch

(limited to 'packages')

diff --git a/packages/gpe-conf/gpe-conf-0.2.4/.mtn2git_empty b/packages/gpe-conf/gpe-conf-0.2.4/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/gpe-conf/gpe-conf-0.2.4/scriptname.patch b/packages/gpe-conf/gpe-conf-0.2.4/scriptname.patch
new file mode 100644
index 0000000000..e66d509c9f
--- /dev/null
+++ b/packages/gpe-conf/gpe-conf-0.2.4/scriptname.patch
@@ -0,0 +1,13 @@
+Index: Makefile.am
+===================================================================
+--- Makefile.am	(revision 9037)
++++ Makefile.am	(working copy)
+@@ -178,7 +178,7 @@
+ 
+ install-data-hook:
+ 	chmod u+s $(DESTDIR)$(bindir)/gpe-conf                
+-	cd $(DESTDIR)/$(xscriptsdir) && mv soundsettings.sh S30soundsettings
++	cd $(DESTDIR)/$(xscriptsdir) && mv soundsettings.sh 30soundsettings
+ 
+ deb: dist
+ 	-mkdir $(top_builddir)/debian-build
diff --git a/packages/gpe-conf/gpe-conf_0.2.4.bb b/packages/gpe-conf/gpe-conf_0.2.4.bb
index 4a45b599a1..aa458d089e 100644
--- a/packages/gpe-conf/gpe-conf_0.2.4.bb
+++ b/packages/gpe-conf/gpe-conf_0.2.4.bb
@@ -3,8 +3,8 @@ SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client"
-RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons timezones"
+DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client libxrandr"
+RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons timezones xrandr"
 RDEPENDS_gpe-conf-panel = "gpe-conf"
 
 PR = "r1"
@@ -13,6 +13,8 @@ GPE_TARBALL_SUFFIX = "bz2"
 
 inherit gpe autotools pkgconfig
 
+SRC_URI += "file://scriptname.patch;patch=1;pnum=0"
+
 PACKAGES += "gpe-conf-panel"
 
 FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \
-- 
cgit v1.2.3


From 38f20b3486c8b16512cc27faab4fba42f231a668 Mon Sep 17 00:00:00 2001
From: Stelios Koroneos <skoroneos@digital-opsis.com>
Date: Mon, 12 Mar 2007 12:33:03 +0000
Subject: packages/perl/perl-5.8.7/config.sh-powerpc-linux: Don't use share
 library for powerpc targets

---
 packages/perl/perl-5.8.7/config.sh-powerpc-linux | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/perl/perl-5.8.7/config.sh-powerpc-linux b/packages/perl/perl-5.8.7/config.sh-powerpc-linux
index d0b79ae484..0ca31c1230 100644
--- a/packages/perl/perl-5.8.7/config.sh-powerpc-linux
+++ b/packages/perl/perl-5.8.7/config.sh-powerpc-linux
@@ -971,7 +971,7 @@ useperlio='define'
 useposix='true'
 usereentrant='undef'
 usesfio='false'
-useshrplib='true'
+useshrplib='fasle'
 usesitecustomize='undef'
 usesocks='undef'
 usethreads='undef'
-- 
cgit v1.2.3


From 8a99edb6e1f3eea465d389761eda63fcf31f7d85 Mon Sep 17 00:00:00 2001
From: Stelios Koroneos <skoroneos@digital-opsis.com>
Date: Mon, 12 Mar 2007 12:36:21 +0000
Subject: packages/gcc/gcc_4.1.1.bb: Make sure that the build machine uses the
 correct site files and not cached values which contain target's data

---
 packages/gcc/gcc-4.1.1/gcc-ignore-cache.patch | 15 +++++++++++++++
 packages/gcc/gcc_4.1.1.bb                     |  3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 packages/gcc/gcc-4.1.1/gcc-ignore-cache.patch

(limited to 'packages')

diff --git a/packages/gcc/gcc-4.1.1/gcc-ignore-cache.patch b/packages/gcc/gcc-4.1.1/gcc-ignore-cache.patch
new file mode 100644
index 0000000000..396b4b2345
--- /dev/null
+++ b/packages/gcc/gcc-4.1.1/gcc-ignore-cache.patch
@@ -0,0 +1,15 @@
+--- /gcc/orig-configure	2007-03-11 21:50:28.000000000 +0200
++++ /gcc/configure	2007-03-11 21:53:27.000000000 +0200
+@@ -12272,9 +12272,11 @@
+ 	esac
+ 	saved_CFLAGS="${CFLAGS}"
+ 	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
++        CONFIG_SITE=""
+ 	${realsrcdir}/configure \
+ 		--enable-languages=${enable_languages-all} \
+-		--target=$target_alias --host=$build_alias --build=$build_alias
++		--target=$target_alias --host=$build_alias --build=$build_alias \
++                --cache-file=./tmp-cache
+ 	CFLAGS="${saved_CFLAGS}"
+ 
+ 	# We just finished tests for the build machine, so rename
diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb
index 104a8abb76..08ec8a0fa0 100644
--- a/packages/gcc/gcc_4.1.1.bb
+++ b/packages/gcc/gcc_4.1.1.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"
@@ -32,6 +32,7 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \
 	file://unbreak-armv4t.patch;patch=1 \
         file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
         file://gcc-4.1.1-pr13685-1.patch;patch=1 \
+        file://gcc-ignore-cache.patch;patch=1 \
 	"
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
-- 
cgit v1.2.3


From 242ff6b8bc003c6529e9e50af75294ba4b862906 Mon Sep 17 00:00:00 2001
From: Stelios Koroneos <skoroneos@digital-opsis.com>
Date: Mon, 12 Mar 2007 12:42:28 +0000
Subject: packages/gcc/gcc_4.1.1.bb :The following set of 2 patches adds
 support for soft-float and mlong-128 to powerpc targets without fpu for gcc
 4.1.1/glibc 2.5

---
 packages/gcc/gcc-4.1.1/ppc-gcc-41-20060515.patch   | 2225 ++++++++++
 .../gcc-4.1.1/ppc-sfp-long-double-gcc411-7.patch   | 4271 ++++++++++++++++++++
 packages/gcc/gcc_4.1.1.bb                          |    5 +-
 3 files changed, 6500 insertions(+), 1 deletion(-)
 create mode 100644 packages/gcc/gcc-4.1.1/ppc-gcc-41-20060515.patch
 create mode 100644 packages/gcc/gcc-4.1.1/ppc-sfp-long-double-gcc411-7.patch

(limited to 'packages')

diff --git a/packages/gcc/gcc-4.1.1/ppc-gcc-41-20060515.patch b/packages/gcc/gcc-4.1.1/ppc-gcc-41-20060515.patch
new file mode 100644
index 0000000000..166e79c7e9
--- /dev/null
+++ b/packages/gcc/gcc-4.1.1/ppc-gcc-41-20060515.patch
@@ -0,0 +1,2225 @@
+diff -urpN -X /home/bergner/cvs/dontdiff gcc-41-20060515.orig/gcc/ChangeLog gcc-41-20060515/gcc/ChangeLog
+--- gcc-41-20060515.orig/gcc/ChangeLog	2006-05-15 11:14:20.000000000 -0500
++++ gcc-41-20060515/gcc/ChangeLog	2006-05-15 14:00:27.693964000 -0500
+@@ -724,6 +724,51 @@
+ 	* reload1.c (choose_reload_regs): Added call of regno_clobbered_p 
+ 	with new meaning of SETS.
+ 
++2006-02-14  Jakub Jelinek  <jakub@redhat.com>
++	    Aldy Hernandez  <aldyh@redhat.com>
++
++	PR target/25864
++	* configure.ac: Add --with{out}-long-double-128 configure option.
++	(TARGET_DEFAULT_LONG_DOUBLE_128): New test.
++	* configure: Rebuilt.
++	* config.in: Rebuilt.
++	* doc/install.texi (Options specification): Document
++	--with-long-double-128.
++
++	* config.gcc (sparc-*-linux*): Add sparc/t-linux to tmake_file.
++	(sparc64-*-linux*): Likewise.
++	* config/sparc/t-linux64 (SHLIB_MAPFILES): Removed.
++	* config/sparc/t-linux: New file.
++	* config/sparc/libgcc-sparc-glibc.ver (__fixtfdi, __fixunstfdi,
++	__floatditf): Export at GCC_LDBL_3.0 if -m32 -mlong-double-128.
++	(__divtc3, __multc3, __powitf2): Export at GCC_LDBL_4.0.0 if
++	-m32 -mlong-double-128.
++
++	* config.gcc (alpha*-*-linux*): Add alpha/t-linux to tmake_file.
++	* config/alpha/t-linux: New file.
++	* config/alpha/libgcc-alpha-ldbl.ver: New file.
++
++	* config/sparc/linux.h (TARGET_OS_CPP_BUILTINS): Define
++	__LONG_DOUBLE_128__ if TARGET_LONG_DOUBLE_128.
++	(CPP_SUBTARGET_SPEC): Don't add -D__LONG_DOUBLE_128__ here.
++	* config/sparc/linux64.h (TARGET_OS_CPP_BUILTINS): Define
++	__LONG_DOUBLE_128__ if TARGET_LONG_DOUBLE_128 and TARGET_ARCH32.
++	(CPP_ARCH32_SPEC): Remove.
++
++	* config/s390/s390.c (override_options): Handle
++	TARGET_DEFAULT_LONG_DOUBLE_128.
++
++	* config/alpha/alpha.c (override_options): Handle
++	TARGET_DEFAULT_LONG_DOUBLE_128.
++
++	* config/sparc/sparc.c (sparc_override_options): Handle
++	TARGET_DEFAULT_LONG_DOUBLE_128.
++
++	* config/rs6000/linux.h [TARGET_DEFAULT_LONG_DOUBLE_128]
++	(RS6000_DEFAULT_LONG_DOUBLE_SIZE): Define to 128.
++	* config/rs6000/linux64.h [TARGET_DEFAULT_LONG_DOUBLE_128]
++	(RS6000_DEFAULT_LONG_DOUBLE_SIZE): Define to 128.
++
+ 2006-02-19  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+ 
+ 	* doc/install.texi: Add missing `@samp'.
+diff -urpN -X /home/bergner/cvs/dontdiff gcc-41-20060515.orig/gcc/config/alpha/alpha.c gcc-41-20060515/gcc/config/alpha/alpha.c
+--- gcc-41-20060515.orig/gcc/config/alpha/alpha.c	2006-05-15 11:13:49.000000000 -0500
++++ gcc-41-20060515/gcc/config/alpha/alpha.c	2006-05-15 13:47:27.566272961 -0500
+@@ -516,6 +516,11 @@ override_options (void)
+       REAL_MODE_FORMAT (DFmode) = &vax_g_format;
+       REAL_MODE_FORMAT (TFmode) = NULL;
+     }
++
++#ifdef TARGET_DEFAULT_LONG_DOUBLE_128
++  if (!(target_flags_explicit & MASK_LONG_DOUBLE_128))
++    target_flags |= MASK_LONG_DOUBLE_128;
++#endif
+ }
+ 
+ /* Returns 1 if VALUE is a mask that contains full bytes of zero or ones.  */
+diff -urpN -X /home/bergner/cvs/dontdiff gcc-41-20060515.orig/gcc/config/alpha/libgcc-alpha-ldbl.ver gcc-41-20060515/gcc/config/alpha/libgcc-alpha-ldbl.ver
+--- gcc-41-20060515.orig/gcc/config/alpha/libgcc-alpha-ldbl.ver	1969-12-31 18:00:00.000000000 -0600
++++ gcc-41-20060515/gcc/config/alpha/libgcc-alpha-ldbl.ver	2006-05-15 13:47:27.566272961 -0500
+@@ -0,0 +1,32 @@
++%ifdef __LONG_DOUBLE_128__
++
++# long double 128 bit support in libgcc_s.so.1 is only available
++# when configured with --with-long-double-128.  Make sure all the
++# symbols are available at @@GCC_LDBL_* versions to make it clear
++# there is a configurable symbol set.
++
++%exclude {
++  __fixtfdi
++  __fixunstfdi
++  __floatditf
++
++  __divtc3
++  __multc3
++  __powitf2
++}
++
++%inherit GCC_LDBL_3.0 GCC_3.0
++GCC_LDBL_3.0 {
++  __fixtfdi
++  __fixunstfdi
++  __floatditf
++}
++
++%inherit GCC_LDBL_4.0.0 GCC_4.0.0
++GCC_LDBL_4.0.0 {
++  __divtc3
++  __multc3
++  __powitf2
++}
++
++%endif
+diff -urpN -X /home/bergner/cvs/dontdiff gcc-41-20060515.orig/gcc/config/alpha/t-linux gcc-41-20060515/gcc/config/alpha/t-linux
+--- gcc-41-20060515.orig/gcc/config/alpha/t-linux	1969-12-31 18:00:00.000000000 -0600
++++ gcc-41-20060515/gcc/config/alpha/t-linux	2006-05-15 13:47:27.567272807 -0500
+@@ -0,0 +1 @@
++SHLIB_MAPFILES += $(srcdir)/config/alpha/libgcc-alpha-ldbl.ver
+diff -urpN -X /home/bergner/cvs/dontdiff gcc-41-20060515.orig/gcc/config/rs6000/linux64.h gcc-41-20060515/gcc/config/rs6000/linux64.h
+--- gcc-41-20060515.orig/gcc/config/rs6000/linux64.h	2006-05-15 11:14:02.000000000 -0500
++++ gcc-41-20060515/gcc/config/rs6000/linux64.h	2006-05-15 13:47:27.568272653 -0500
+@@ -570,3 +570,8 @@ while (0)
+ #endif
+ 
+ #define POWERPC_LINUX
++
++/* ppc{32,64} linux has 128-bit long double support in glibc 2.4 and later.  */
++#ifdef TARGET_DEFAULT_LONG_DOUBLE_128
++#define RS6000_DEFAULT_LONG_DOUBLE_SIZE 128
++#endif
+diff -urpN -X /home/bergner/cvs/dontdiff gcc-41-20060515.orig/gcc/config/rs6000/linux.h gcc-41-20060515/gcc/config/rs6000/linux.h
+--- gcc-41-20060515.orig/gcc/config/rs6000/linux.h	2006-05-15 11:14:02.000000000 -0500
++++ gcc-41-20060515/gcc/config/rs6000/linux.h	2006-05-15 13:47:27.567272807 -0500
+@@ -120,3 +120,8 @@
+ #endif
+ 
+ #define POWERPC_LINUX
++
++/* ppc linux has 128-bit long double support in glibc 2.4 and later.  */
++#ifdef TARGET_DEFAULT_LONG_DOUBLE_128
++#define RS6000_DEFAULT_LONG_DOUBLE_SIZE 128
++#endif
+diff -urpN -X /home/bergner/cvs/dontdiff gcc-41-20060515.orig/gcc/config/s390/s390.c gcc-41-20060515/gcc/config/s390/s390.c
+--- gcc-41-20060515.orig/gcc/config/s390/s390.c	2006-05-15 11:13:50.000000000 -0500
++++ gcc-41-20060515/gcc/config/s390/s390.c	2006-05-15 13:47:27.574271730 -0500
+@@ -1415,6 +1415,11 @@ override_options (void)
+     }
+   else if (s390_stack_guard)
+     error ("-mstack-guard implies use of -mstack-size"); 
++
++#ifdef TARGET_DEFAULT_LONG_DOUBLE_128
++  if (!(target_flags_explicit & MASK_LONG_DOUBLE_128))
++    target_flags |= MASK_LONG_DOUBLE_128;
++#endif
+ }
+ 
+ /* Map for smallest class containing reg regno.  */
+diff -urpN -X /home/bergner/cvs/dontdiff gcc-41-20060515.orig/gcc/config/sparc/libgcc-sparc-glibc.ver gcc-41-20060515/gcc/config/sparc/libgcc-sparc-glibc.ver
+--- gcc-41-20060515.orig/gcc/config/sparc/libgcc-sparc-glibc.ver	2006-05-15 11:13:55.000000000 -0500
++++ gcc-41-20060515/gcc/config/sparc/libgcc-sparc-glibc.ver	2006-05-15 13:47:27.574271730 -0500
+@@ -26,3 +26,36 @@ GLIBC_VER {
+   __frame_state_for
+   __register_frame_info_table
+ }
++
++%if !defined (__arch64__) && defined (__LONG_DOUBLE_128__)
++
++# long double 128 bit support from 32-bit libgcc_s.so.1 is only available
++# when configured with --with-long-double-128.  Make sure all the
++# symbols are available at @@GCC_LDBL_* versions to make it clear
++# there is a configurable symbol set.
++
++%exclude {
++  __fixtfdi
++  __fixunstfdi
++  __floatditf
++
++  __divtc3
++  __multc3
++  __powitf2
++}
++
++%inherit GCC_LDBL_3.0 GCC_3.0
++GCC_LDBL_3.0 {
++  __fixtfdi
++  __fixunstfdi
++  __floatditf
++}
++
++%inherit GCC_LDBL_4.0.0 GCC_4.0.0
++GCC_LDBL_4.0.0 {
++  __divtc3
++  __multc3
++  __powitf2
++}
++
++%endif
+diff -urpN -X /home/bergner/cvs/dontdiff gcc-41-20060515.orig/gcc/config/sparc/linux64.h gcc-41-20060515/gcc/config/sparc/linux64.h
+--- gcc-41-20060515.orig/gcc/config/sparc/linux64.h	2006-05-15 11:13:55.000000000 -0500
++++ gcc-41-20060515/gcc/config/sparc/linux64.h	2006-05-15 13:47:27.576271422 -0500
+@@ -20,22 +20,24 @@ along with GCC; see the file COPYING.  I
+ the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.  */
+ 
+-#define TARGET_OS_CPP_BUILTINS()		\
+-  do						\
+-    {						\
+-	builtin_define_std ("unix");		\
+-	builtin_define_std ("linux");		\
+-	builtin_define ("_LONGLONG");		\
+-	builtin_define ("__gnu_linux__");	\
+-	builtin_assert ("system=linux");	\
+-	builtin_assert ("system=unix");		\
+-	builtin_assert ("system=posix");	\
+-	if (flag_pic)				\
+-	  {					\
+-		builtin_define ("__PIC__");	\
+-		builtin_define ("__pic__");	\
+-	  }					\
+-    }						\
++#define TARGET_OS_CPP_BUILTINS()			\
++  do							\
++    {							\
++      builtin_define_std ("unix");			\
++      builtin_define_std ("linux");			\
++      builtin_define ("_LONGLONG");			\
++      builtin_define ("__gnu_linux__");			\
++      builtin_assert ("system=linux");			\
++      builtin_assert ("system=unix");			\
++      builtin_assert ("system=posix");			\
++      if (flag_pic)					\
++	{						\
++	  builtin_define ("__PIC__");			\
++	  builtin_define ("__pic__");			\
++	}						\
++      if (TARGET_ARCH32 && TARGET_LONG_DOUBLE_128)	\
++	builtin_define ("__LONG_DOUBLE_128__");		\
++    }							\
+   while (0)
+ 
+ /* Don't assume anything about the header files.  */
+@@ -59,13 +61,6 @@ Boston, MA 02110-1301, USA.  */
+ #undef ASM_CPU_DEFAULT_SPEC
+ #define ASM_CPU_DEFAULT_SPEC "-Av9a"
+ 
+-#ifdef SPARC_BI_ARCH
+-
+-#undef CPP_ARCH32_SPEC
+-#define CPP_ARCH32_SPEC "%{mlong-double-128:-D__LONG_DOUBLE_128__}"
+-
+-#endif
+-
+ /* Provide a STARTFILE_SPEC appropriate for GNU/Linux.  Here we add
+    the GNU/Linux magical crtbegin.o file (see crtstuff.c) which
+    provides part of the support for getting C++ file-scope static
+diff -urpN -X /home/bergner/cvs/dontdiff gcc-41-20060515.orig/gcc/config/sparc/linux.h gcc-41-20060515/gcc/config/sparc/linux.h
+--- gcc-41-20060515.orig/gcc/config/sparc/linux.h	2006-05-15 11:13:55.000000000 -0500
++++ gcc-41-20060515/gcc/config/sparc/linux.h	2006-05-15 13:47:27.575271576 -0500
+@@ -23,17 +23,19 @@ Boston, MA 02110-1301, USA.  */
+ #define TARGET_OS_CPP_BUILTINS()		\
+   do						\
+     {						\
+-	builtin_define_std ("unix");		\
+-	builtin_define_std ("linux");		\
+-	builtin_define ("__gnu_linux__");	\
+-	builtin_assert ("system=linux");	\
+-	builtin_assert ("system=unix");		\
+-	builtin_assert ("system=posix");	\
+-	if (flag_pic)				\
+-	  {					\
+-		builtin_define ("__PIC__");	\
+-		builtin_define ("__pic__");	\
+-	  }					\
++      builtin_define_std ("unix");		\
++      builtin_define_std ("linux");		\
++      builtin_define ("__gnu_linux__");		\
++      builtin_assert ("system=linux");		\
++      builtin_assert ("system=unix");		\
++      builtin_assert ("system=posix");		\
++      if (flag_pic)				\
++	{					\
++	  builtin_define ("__PIC__");		\
++	  builtin_define ("__pic__");		\
++	}					\
++      if (TARGET_LONG_DOUBLE_128)		\
++	builtin_define ("__LONG_DOUBLE_128__");	\
+     }						\
+   while (0)
+ 
+@@ -100,8 +102,7 @@ Boston, MA 02110-1301, USA.  */
+ 
+ #undef CPP_SUBTARGET_SPEC
+ #define CPP_SUBTARGET_SPEC \
+-"%{posix:-D_POSIX_SOURCE} \
+-%{pthread:-D_REENTRANT} %{mlong-double-128:-D__LONG_DOUBLE_128__}"
++"%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
+ 
+ #undef LIB_SPEC
+ #define LIB_SPEC \
+diff -urpN -X /home/bergner/cvs/dontdiff gcc-41-20060515.orig/gcc/config/sparc/sparc.c gcc-41-20060515/gcc/config/sparc/sparc.c
+--- gcc-41-20060515.orig/gcc/config/sparc/sparc.c	2006-05-15 11:13:55.000000000 -0500
++++ gcc-41-20060515/gcc/config/sparc/sparc.c	2006-05-15 13:47:27.581270653 -0500
+@@ -790,6 +790,11 @@ sparc_override_options (void)
+       sparc_costs = &ultrasparc3_costs;
+       break;
+     };
++
++#ifdef TARGET_DEFAULT_LONG_DOUBLE_128
++  if (!(target_flags_explicit & MASK_LONG_DOUBLE_128))
++    target_flags |= MASK_LONG_DOUBLE_128;
++#endif
+ }
+ 
+ #ifdef SUBTARGET_ATTRIBUTE_TABLE
+diff -urpN -X /home/bergner/cvs/dontdiff gcc-41-20060515.orig/gcc/config/sparc/t-linux gcc-41-20060515/gcc/config/sparc/t-linux
+--- gcc-41-20060515.orig/gcc/config/sparc/t-linux	1969-12-31 18:00:00.000000000 -0600
++++ gcc-41-20060515/gcc/config/sparc/t-linux	2006-05-15 13:47:27.582270499 -0500
+@@ -0,0 +1,5 @@
++# Override t-slibgcc-elf-ver to export some libgcc symbols with
++# the symbol versions that glibc used.
++# Avoid the t-linux version file.
++SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver \
++		 $(srcdir)/config/sparc/libgcc-sparc-glibc.ver
+diff -urpN -X /home/bergner/cvs/dontdiff gcc-41-20060515.orig/gcc/config/sparc/t-linux64 gcc-41-20060515/gcc/config/sparc/t-linux64
+--- gcc-41-20060515.orig/gcc/config/sparc/t-linux64	2006-05-15 11:13:55.000000000 -0500
++++ gcc-41-20060515/gcc/config/sparc/t-linux64	2006-05-15 13:47:27.582270499 -0500
+@@ -8,12 +8,6 @@ INSTALL_LIBGCC = install-multilib
+ EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o \
+ 	crtfastmath.o
+ 
+-# Override t-slibgcc-elf-ver to export some libgcc symbols with
+-# the symbol versions that glibc used.
+-# Avoid the t-linux version file.
+-SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver \
+-		 $(srcdir)/config/sparc/libgcc-sparc-glibc.ver
+-
+ CRTSTUFF_T_CFLAGS = `if test x$$($(GCC_FOR_TARGET) $(MULTILIB_CFLAGS) \
+ 				 -print-multi-os-directory) \
+ 			= x../lib64; then echo -mcmodel=medany; fi`
+diff -urpN -X /home/bergner/cvs/dontdiff gcc-41-20060515.orig/gcc/config.gcc gcc-41-20060515/gcc/config.gcc
+--- gcc-41-20060515.orig/gcc/config.gcc	2006-05-15 11:14:20.000000000 -0500
++++ gcc-41-20060515/gcc/config.gcc	2006-05-15 13:47:27.555274654 -0500
+@@ -568,7 +568,7 @@ alpha*-*-unicosmk*)
+ alpha*-*-linux*)
+ 	tm_file="${tm_file} alpha/elf.h alpha/linux.h alpha/linux-elf.h"
+ 	target_cpu_default="MASK_GAS"
+-	tmake_file="${tmake_file} alpha/t-crtfm alpha/t-alpha alpha/t-ieee"
++	tmake_file="${tmake_file} alpha/t-crtfm alpha/t-alpha alpha/t-ieee alpha/t-linux"
+ 	;;
+ alpha*-*-gnu*)
+ 	target_cpu_default="MASK_GAS"
+@@ -2056,7 +2056,7 @@ sparc-*-elf*)
+ sparc-*-linux*)		# SPARC's running GNU/Linux, libc6
+ 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/linux.h"
+ 	extra_options="${extra_options} sparc/long-double-switch.opt"
+-	tmake_file="${tmake_file} sparc/t-crtfm"
++	tmake_file="${tmake_file} sparc/t-linux sparc/t-crtfm"
+ 	;;
+ sparc-*-rtems*)
+ 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h"
+@@ -2175,7 +2175,7 @@ sparc64-*-freebsd*|ultrasparc-*-freebsd*
+ sparc64-*-linux*)		# 64-bit SPARC's running GNU/Linux
+ 	tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/linux64.h"
+ 	extra_options="${extra_options} sparc/long-double-switch.opt"
+-	tmake_file="${tmake_file} sparc/t-linux64 sparc/t-crtfm"
++	tmake_file="${tmake_file} sparc/t-linux sparc/t-linux64 sparc/t-crtfm"
+ 	;;
+ sparc64-*-netbsd*)
+ 	tm_file="sparc/biarch64.h ${tm_file}"
+diff -urpN -X /home/bergner/cvs/dontdiff gcc-41-20060515.orig/gcc/config.in gcc-41-20060515/gcc/config.in
+--- gcc-41-20060515.orig/gcc/config.in	2006-05-15 11:14:20.000000000 -0500
++++ gcc-41-20060515/gcc/config.in	2006-05-15 13:47:27.559274038 -0500
+@@ -1277,6 +1277,12 @@
+ #endif
+ 
+ 
++/* Define if TFmode long double should be the default */
++#ifndef USED_FOR_TARGET
++#undef TARGET_DEFAULT_LONG_DOUBLE_128
++#endif
++
++
+ /* Define if your target C library provides stack protector support */
+ #ifndef USED_FOR_TARGET
+ #undef TARGET_LIBC_PROVIDES_SSP
+diff -urpN -X /home/bergner/cvs/dontdiff gcc-41-20060515.orig/gcc/configure gcc-41-20060515/gcc/configure
+--- gcc-41-20060515.orig/gcc/configure	2006-05-15 11:14:19.000000000 -0500
++++ gcc-41-20060515/gcc/configure	2006-05-15 13:47:27.594268652 -0500
+@@ -931,6 +931,7 @@ Optional Packages:
+   --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
+   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
+   --with-system-libunwind use installed libunwind
++  --with-long-double-128  Use 128-bit long double by default.
+   --with-gc={page,zone}   choose the garbage collection mechanism to use
+                           with the compiler
+   --with-system-zlib      use installed libz
+@@ -7492,7 +7493,7 @@ if test "${gcc_cv_prog_makeinfo_modern+s
+ else
+     ac_prog_version=`$MAKEINFO --version 2>&1 |
+                    sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
+-  echo "configure:7495: version of makeinfo is $ac_prog_version" >&5
++  echo "configure:7496: version of makeinfo is $ac_prog_version" >&5
+   case $ac_prog_version in
+     '')     gcc_cv_prog_makeinfo_modern=no;;
+     4.[2-9]*)
+@@ -16213,6 +16214,46 @@ _ACEOF
+ 
+ fi
+ 
++# Check if TFmode long double should be used by default or not.
++# Some glibc targets used DFmode long double, but with glibc 2.4
++# and later they can use TFmode.
++case "$target" in
++  powerpc*-*-*gnu* | \
++  sparc*-*-linux* | \
++  s390*-*-linux* | \
++  alpha*-*-linux*)
++
++# Check whether --with-long-double-128 or --without-long-double-128 was given.
++if test "${with_long_double_128+set}" = set; then
++  withval="$with_long_double_128"
++  gcc_cv_target_ldbl128="$with_long_double_128"
++else
++  gcc_cv_target_ldbl128=no
++      if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then
++	if test "x$with_sysroot" = x; then
++	  glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-include"
++	elif test "x$with_sysroot" = xyes; then
++	  glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-root/usr/include"
++	else
++	  glibc_header_dir="${with_sysroot}/usr/include"
++	fi
++      else
++	glibc_header_dir=/usr/include
++      fi
++      grep '^ 	*#[ 	]*define[ 	][ 	]*__LONG_DOUBLE_MATH_OPTIONAL' \
++        $glibc_header_dir/bits/wordsize.h > /dev/null 2>&1 \
++      && gcc_cv_target_ldbl128=yes
++fi;
++    ;;
++esac
++if test x$gcc_cv_target_ldbl128 = xyes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define TARGET_DEFAULT_LONG_DOUBLE_128 1
++_ACEOF
++
++fi
++
+ # Find out what GC implementation we want, or may, use.
+ 
+ # Check whether --with-gc or --without-gc was given.
+diff -urpN -X /home/bergner/cvs/dontdiff gcc-41-20060515.orig/gcc/configure.ac gcc-41-20060515/gcc/configure.ac
+--- gcc-41-20060515.orig/gcc/configure.ac	2006-05-15 11:14:20.000000000 -0500
++++ gcc-41-20060515/gcc/configure.ac	2006-05-15 13:47:27.597400000 -0500
+@@ -3130,6 +3130,39 @@ if test x$gcc_cv_libc_provides_ssp = xye
+ 	    [Define if your target C library provides stack protector support])
+ fi
+ 
++# Check if TFmode long double should be used by default or not.
++# Some glibc targets used DFmode long double, but with glibc 2.4
++# and later they can use TFmode.
++case "$target" in
++  powerpc*-*-*gnu* | \
++  sparc*-*-linux* | \
++  s390*-*-linux* | \
++  alpha*-*-linux*)
++    AC_ARG_WITH(long-double-128,
++[  --with-long-double-128  Use 128-bit long double by default.],
++      gcc_cv_target_ldbl128="$with_long_double_128",
++      [gcc_cv_target_ldbl128=no
++      if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then
++	if test "x$with_sysroot" = x; then
++	  glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-include"
++	elif test "x$with_sysroot" = xyes; then
++	  glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-root/usr/include"
++	else
++	  glibc_header_dir="${with_sysroot}/usr/include"
++	fi
++      else
++	glibc_header_dir=/usr/include
++      fi
++      grep '^[ 	]*#[ 	]*define[ 	][ 	]*__LONG_DOUBLE_MATH_OPTIONAL' \
++        $glibc_header_dir/bits/wordsize.h > /dev/null 2>&1 \
++      && gcc_cv_target_ldbl128=yes])
++    ;;
++esac
++if test x$gcc_cv_target_ldbl128 = xyes; then
++  AC_DEFINE(TARGET_DEFAULT_LONG_DOUBLE_128, 1,
++	    [Define if TFmode long double should be the default])
++fi
++
+ # Find out what GC implementation we want, or may, use.
+ AC_ARG_WITH(gc,
+ [  --with-gc={page,zone}   choose the garbage collection mechanism to use
+diff -urpN -X /home/bergner/cvs/dontdiff gcc-41-20060515.orig/gcc/doc/install.texi gcc-41-20060515/gcc/doc/install.texi
+--- gcc-41-20060515.orig/gcc/doc/install.texi	2006-05-15 11:10:10.000000000 -0500
++++ gcc-41-20060515/gcc/doc/install.texi	2006-05-15 13:47:27.600399538 -0500
+@@ -1224,6 +1224,14 @@ error message.
+ All support for systems which have been obsoleted in one release of GCC
+ is removed entirely in the next major release, unless someone steps
+ forward to maintain the port.
++
++@item --with-long-double-128
++Specify if @code{long double} type should b