From: John Bowler <jbowler@nslu2-linux.org>
Date: Mon, 30 Jan 2006 00:02:45 +0000 (+0000)
Subject: busybox: put fdisk back in to slugos defconfig in 1.01
X-Git-Tag: Release-2010-05/1~9453^2~2509
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2888504628539f5df3c4b1dbe894fe0b51422875;p=openembedded.git

busybox: put fdisk back in to slugos defconfig in 1.01
 - util-linux fdisk does not work on ARM (alignment problems) so use
   the busybox one in preference
---

diff --git a/packages/busybox/busybox-1.01/slugos/defconfig b/packages/busybox/busybox-1.01/slugos/defconfig
index 51bfa5b3e8..7eca339d2d 100644
--- a/packages/busybox/busybox-1.01/slugos/defconfig
+++ b/packages/busybox/busybox-1.01/slugos/defconfig
@@ -413,8 +413,14 @@ CONFIG_DMESG=y
 # CONFIG_FBSET is not set
 # CONFIG_FDFLUSH is not set
 # CONFIG_FDFORMAT is not set
-# CONFIG_FDISK is not set
+CONFIG_FDISK=y
 FDISK_SUPPORT_LARGE_DISKS=y
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+CONFIG_FEATURE_OSF_LABEL=y
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
 # CONFIG_FREERAMDISK is not set
 # CONFIG_FSCK_MINIX is not set
 # CONFIG_MKFS_MINIX is not set
diff --git a/packages/busybox/busybox_1.01.bb b/packages/busybox/busybox_1.01.bb
index 37c691e746..7e537d746d 100644
--- a/packages/busybox/busybox_1.01.bb
+++ b/packages/busybox/busybox_1.01.bb
@@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://udhcppidfile.patch;patch=1 \
@@ -27,6 +27,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://readlink.patch;patch=1 \
 	   file://rmmod.patch;patch=1 \
 	   file://udhcpscript.patch;patch=1 \
+	   file://thumb-bsdlabel.patch;patch=1 \
            file://defconfig \
            file://busybox-cron \
 	   file://busybox-httpd \