summaryrefslogtreecommitdiffstats
path: root/patches/busybox-1.16.1
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2010-03-29 10:42:33 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2010-04-01 17:09:57 +0200
commit19139693a313d0e00ab1ce3a91a7bd827f6db9f0 (patch)
treee0080a05c4c4a6e0a50d6a19252d62d756bcddbf /patches/busybox-1.16.1
parentd1eb53f0c424b9874d2840544cae4083c458b7fa (diff)
downloadptxdist-19139693a313d0e00ab1ce3a91a7bd827f6db9f0.tar.gz
ptxdist-19139693a313d0e00ab1ce3a91a7bd827f6db9f0.tar.xz
[busybox] version bump -> 1.16.1
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'patches/busybox-1.16.1')
-rw-r--r--patches/busybox-1.16.1/0001-reactivate-check-for-tty.patch32
-rw-r--r--patches/busybox-1.16.1/0002-silence-errors-on-BE-platforms.patch78
-rw-r--r--patches/busybox-1.16.1/series2
3 files changed, 112 insertions, 0 deletions
diff --git a/patches/busybox-1.16.1/0001-reactivate-check-for-tty.patch b/patches/busybox-1.16.1/0001-reactivate-check-for-tty.patch
new file mode 100644
index 000000000..b76dc60bf
--- /dev/null
+++ b/patches/busybox-1.16.1/0001-reactivate-check-for-tty.patch
@@ -0,0 +1,32 @@
+From 8bc1ce004ac5cddb2c1f14a60308ac5675899f24 Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Fri, 6 Nov 2009 09:19:58 +0100
+Subject: [PATCH 1/2] reactivate check for tty
+
+The busybox crew switched of the test for a tty in silentoldconfig,
+we use this feature to break when oldconfig needs interaction
+in automated build.
+
+This patch reactivates this feature.
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ scripts/kconfig/conf.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
+index 9befa2b..e65e25c 100644
+--- a/scripts/kconfig/conf.c
++++ b/scripts/kconfig/conf.c
+@@ -503,7 +503,7 @@ int main(int ac, char **av)
+ break;
+ case 's':
+ input_mode = ask_silent;
+- valid_stdin = isatty(0); //bbox: && isatty(1) && isatty(2);
++ valid_stdin = isatty(0) && isatty(1) && isatty(2);
+ break;
+ case 'd':
+ input_mode = set_default;
+--
+1.7.0.3
+
diff --git a/patches/busybox-1.16.1/0002-silence-errors-on-BE-platforms.patch b/patches/busybox-1.16.1/0002-silence-errors-on-BE-platforms.patch
new file mode 100644
index 000000000..ec5bcce1d
--- /dev/null
+++ b/patches/busybox-1.16.1/0002-silence-errors-on-BE-platforms.patch
@@ -0,0 +1,78 @@
+From dc2ebb53bd52743bc643462c7ebe3fa8488c9a13 Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Fri, 6 Nov 2009 09:26:56 +0100
+Subject: [PATCH 2/2] silence errors on BE platforms
+
+Silence this warning, which crashes when CONFIG_WERROR is active:
+
+cc1: warnings being treated as errors
+util-linux/mkfs_vfat.c: In function 'mkfs_vfat_main':
+util-linux/mkfs_vfat.c:468: error: large integer implicitly truncated to unsigned type
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ util-linux/mkfs_ext2.c | 6 +++---
+ util-linux/mkfs_reiser.c | 6 +++---
+ util-linux/mkfs_vfat.c | 6 +++---
+ 3 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c
+index 19c3c67..27abb00 100644
+--- a/util-linux/mkfs_ext2.c
++++ b/util-linux/mkfs_ext2.c
+@@ -29,11 +29,11 @@ char BUG_wrong_field_size(void);
+ #define STORE_LE(field, value) \
+ do { \
+ if (sizeof(field) == 4) \
+- field = cpu_to_le32(value); \
++ field = (typeof(field))cpu_to_le32(value); \
+ else if (sizeof(field) == 2) \
+- field = cpu_to_le16(value); \
++ field = (typeof(field))cpu_to_le16(value); \
+ else if (sizeof(field) == 1) \
+- field = (value); \
++ field = (typeof(field))(value); \
+ else \
+ BUG_wrong_field_size(); \
+ } while (0)
+diff --git a/util-linux/mkfs_reiser.c b/util-linux/mkfs_reiser.c
+index 7f37eb8..084a611 100644
+--- a/util-linux/mkfs_reiser.c
++++ b/util-linux/mkfs_reiser.c
+@@ -14,11 +14,11 @@ char BUG_wrong_field_size(void);
+ #define STORE_LE(field, value) \
+ do { \
+ if (sizeof(field) == 4) \
+- field = cpu_to_le32(value); \
++ field = (typeof(field))cpu_to_le32(value); \
+ else if (sizeof(field) == 2) \
+- field = cpu_to_le16(value); \
++ field = (typeof(field))cpu_to_le16(value); \
+ else if (sizeof(field) == 1) \
+- field = (value); \
++ field = (typeof(field))(value); \
+ else \
+ BUG_wrong_field_size(); \
+ } while (0)
+diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c
+index a9a65aa..51c5b78 100644
+--- a/util-linux/mkfs_vfat.c
++++ b/util-linux/mkfs_vfat.c
+@@ -174,11 +174,11 @@ void BUG_unsupported_field_size(void);
+ #define STORE_LE(field, value) \
+ do { \
+ if (sizeof(field) == 4) \
+- field = cpu_to_le32(value); \
++ field = (typeof(field))cpu_to_le32(value); \
+ else if (sizeof(field) == 2) \
+- field = cpu_to_le16(value); \
++ field = (typeof(field))cpu_to_le16(value); \
+ else if (sizeof(field) == 1) \
+- field = (value); \
++ field = (typeof(field))(value); \
+ else \
+ BUG_unsupported_field_size(); \
+ } while (0)
+--
+1.7.0.3
+
diff --git a/patches/busybox-1.16.1/series b/patches/busybox-1.16.1/series
new file mode 100644
index 000000000..7e2b3684c
--- /dev/null
+++ b/patches/busybox-1.16.1/series
@@ -0,0 +1,2 @@
+0001-reactivate-check-for-tty.patch
+0002-silence-errors-on-BE-platforms.patch