From: Todd Blumer <todd@sdgsystems.com>
Date: Sat, 22 Jul 2006 17:13:19 +0000 (+0200)
Subject: busybox: fix df.patch
X-Git-Tag: familiar-v0.8.4-rc3~19
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a99c976aa95f0f8457df914e50297288cb2ed10e;p=familiar-h63xx-build.git

busybox: fix df.patch

Signed-off-by: Rene Wagner <rw@handhelds.org>
---

diff --git a/org.handhelds.familiar/packages/busybox/busybox-1.00/df.patch b/org.handhelds.familiar/packages/busybox/busybox-1.00/df.patch
index 5acb28d..4988829 100644
--- a/org.handhelds.familiar/packages/busybox/busybox-1.00/df.patch
+++ b/org.handhelds.familiar/packages/busybox/busybox-1.00/df.patch
@@ -1,15 +1,14 @@
---- busybox-1.00/coreutils/df.c	2004-08-02 20:14:01.000000000 -0400
-+++ busybox-1.00/coreutils/df.c.new	2006-06-29 10:56:43.256528750 -0400
-@@ -117,6 +117,8 @@
- 		}
+--- busybox-1.00/coreutils/df.c.orig	2006-07-14 09:50:47.914912750 -0400
++++ busybox-1.00/coreutils/df.c	2006-07-14 09:52:32.613456000 -0400
+@@ -60,6 +60,7 @@
+ 	struct statfs s;
+ 	static const char hdr_1k[] = "1k-blocks"; /* default display is kilobytes */
+ 	const char *disp_units_hdr = hdr_1k;
++	int root_done = 0;
  
- 		if ((s.f_blocks > 0) || !mount_table){
-+			int root_done = 0;
-+
- 			blocks_used = s.f_blocks - s.f_bfree;
- 			blocks_percent_used = 0;
- 			if (blocks_used + s.f_bavail) {
-@@ -125,14 +127,14 @@
+ #ifdef CONFIG_FEATURE_HUMAN_READABLE
+ 	bb_opt_complementaly = "h-km:k-hm:m-hk";
+@@ -125,14 +126,14 @@
  									   ) / (blocks_used + s.f_bavail);
  			}
  
diff --git a/org.handhelds.familiar/packages/busybox/busybox-1.01/df.patch b/org.handhelds.familiar/packages/busybox/busybox-1.01/df.patch
index 5acb28d..4988829 100644
--- a/org.handhelds.familiar/packages/busybox/busybox-1.01/df.patch
+++ b/org.handhelds.familiar/packages/busybox/busybox-1.01/df.patch
@@ -1,15 +1,14 @@
---- busybox-1.00/coreutils/df.c	2004-08-02 20:14:01.000000000 -0400
-+++ busybox-1.00/coreutils/df.c.new	2006-06-29 10:56:43.256528750 -0400
-@@ -117,6 +117,8 @@
- 		}
+--- busybox-1.00/coreutils/df.c.orig	2006-07-14 09:50:47.914912750 -0400
++++ busybox-1.00/coreutils/df.c	2006-07-14 09:52:32.613456000 -0400
+@@ -60,6 +60,7 @@
+ 	struct statfs s;
+ 	static const char hdr_1k[] = "1k-blocks"; /* default display is kilobytes */
+ 	const char *disp_units_hdr = hdr_1k;
++	int root_done = 0;
  
- 		if ((s.f_blocks > 0) || !mount_table){
-+			int root_done = 0;
-+
- 			blocks_used = s.f_blocks - s.f_bfree;
- 			blocks_percent_used = 0;
- 			if (blocks_used + s.f_bavail) {
-@@ -125,14 +127,14 @@
+ #ifdef CONFIG_FEATURE_HUMAN_READABLE
+ 	bb_opt_complementaly = "h-km:k-hm:m-hk";
+@@ -125,14 +126,14 @@
  									   ) / (blocks_used + s.f_bavail);
  			}
  
diff --git a/org.handhelds.familiar/packages/busybox/busybox_1.00.bb b/org.handhelds.familiar/packages/busybox/busybox_1.00.bb
index 8659a49..9f3c837 100644
--- a/org.handhelds.familiar/packages/busybox/busybox_1.00.bb
+++ b/org.handhelds.familiar/packages/busybox/busybox_1.00.bb
@@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r34"
+PR = "r35"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://add-getkey-applet.patch;patch=1 \
diff --git a/org.handhelds.familiar/packages/busybox/busybox_1.01.bb b/org.handhelds.familiar/packages/busybox/busybox_1.01.bb
index 62482c6..e4cacee 100644
--- a/org.handhelds.familiar/packages/busybox/busybox_1.01.bb
+++ b/org.handhelds.familiar/packages/busybox/busybox_1.01.bb
@@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r1"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_nslu2 = ""