From 72820f254560edeaab997e7fa0e87e3ea9075357 Mon Sep 17 00:00:00 2001
From: Mike Westerhof <mwester@dls.net>
Date: Mon, 31 Jul 2006 05:10:36 +0000
Subject: Unslung: slingbox: added built-in fdisk support, but without the
 /bin/fdisk link so as not to overwrite the Linksys fdisk utility.

---
 packages/busybox/slingbox-1.1.3/defconfig | 2 +-
 packages/busybox/slingbox_1.1.3.bb        | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'packages/busybox')

diff --git a/packages/busybox/slingbox-1.1.3/defconfig b/packages/busybox/slingbox-1.1.3/defconfig
index c297988ea5..8729e243b1 100644
--- a/packages/busybox/slingbox-1.1.3/defconfig
+++ b/packages/busybox/slingbox-1.1.3/defconfig
@@ -352,7 +352,7 @@ CONFIG_FEATURE_GREP_FGREP_ALIAS=y
 # CONFIG_FEATURE_FBSET_READMODE 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 is not set
 # CONFIG_FEATURE_AIX_LABEL is not set
diff --git a/packages/busybox/slingbox_1.1.3.bb b/packages/busybox/slingbox_1.1.3.bb
index 5fc31dec41..8cd85ce540 100644
--- a/packages/busybox/slingbox_1.1.3.bb
+++ b/packages/busybox/slingbox_1.1.3.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://defconfig \
@@ -40,6 +40,8 @@ do_configure () {
 do_compile () {
 	unset CFLAGS
 	base_do_compile
+	# Just in case fdisk is compiled in, do not overwrite the Linksys one
+	sed -i -e '/fdisk/d' ${S}/busybox.links
 }
 
 do_install () {
-- 
cgit v1.2.3