aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-06-05 22:40:08 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-06-05 22:40:08 +0000
commitaae956dac8c16eb6a11c3aff7b14d39fdfdc9a8c (patch)
treedc45a7597cde59912ad70097e3c7d62b54331571
parent82d857100b28a0290601b9e58da03ee4d6b296c6 (diff)
downloadopenembedded-aae956dac8c16eb6a11c3aff7b14d39fdfdc9a8c.tar.gz
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/06/05 23:33:13+01:00 reciva.com!pb apply patch for modutils compile failure with gcc4 2005/06/05 23:18:11+01:00 reciva.com!pb patch busybox bogosities causing compile failure with gcc 4.0.0 BKrev: 42a37f48ppNNsV-Yx-ZlvvH3bDCi7Q
-rw-r--r--packages/busybox/busybox-1.00/gzip-spurious-const.patch0
-rw-r--r--packages/busybox/busybox-1.00/ifupdown-spurious-environ.patch0
-rw-r--r--packages/busybox/busybox_1.00.bb2
-rw-r--r--packages/modutils/modutils-2.4.27/gcc4.patch0
-rw-r--r--packages/modutils/modutils_2.4.27.bb3
5 files changed, 4 insertions, 1 deletions
diff --git a/packages/busybox/busybox-1.00/gzip-spurious-const.patch b/packages/busybox/busybox-1.00/gzip-spurious-const.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/busybox/busybox-1.00/gzip-spurious-const.patch
diff --git a/packages/busybox/busybox-1.00/ifupdown-spurious-environ.patch b/packages/busybox/busybox-1.00/ifupdown-spurious-environ.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/busybox/busybox-1.00/ifupdown-spurious-environ.patch
diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb
index b15d568aef..2f192946e2 100644
--- a/packages/busybox/busybox_1.00.bb
+++ b/packages/busybox/busybox_1.00.bb
@@ -27,6 +27,8 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://mount-all-type.patch;patch=1 \
file://celf-ash-builtins.patch;patch=1 \
file://dhcp-hostname.patch;patch=1 \
+ file://ifupdown-spurious-environ.patch;patch=1 \
+ file://gzip-spurious-const.patch;patch=1 \
file://defconfig \
file://busybox-cron \
file://busybox-httpd \
diff --git a/packages/modutils/modutils-2.4.27/gcc4.patch b/packages/modutils/modutils-2.4.27/gcc4.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/modutils/modutils-2.4.27/gcc4.patch
diff --git a/packages/modutils/modutils_2.4.27.bb b/packages/modutils/modutils_2.4.27.bb
index 0b7463240c..9fa7cef105 100644
--- a/packages/modutils/modutils_2.4.27.bb
+++ b/packages/modutils/modutils_2.4.27.bb
@@ -10,7 +10,8 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils/v2.4/modutils-${
file://modutils-notest.patch;patch=1 \
file://configure.patch;patch=1 \
file://program_prefix.patch;patch=1 \
- file://armeb.patch;patch=1"
+ file://armeb.patch;patch=1 \
+ file://gcc4.patch;patch=1"
inherit autotools