Enable CONFIG_HEXDUMP globally for busybox

Add getdvhoff replacement function from vapier
Remove copying of getdvhoff from system

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@614 67a159dc-881f-0410-a524-ba9dfbe2cb84

16 files changed, 26 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index 566ecba..662c6bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> alpha/busy-config,
+  gen_initrd.sh, generic/initrd.scripts, generic/linuxrc, ia64/busy-config,
+  mips/busy-config, parisc/busy-config, parisc64/busy-config,
+  ppc/busy-config, ppc64/busy-config, sparc/busy-config,
+  sparc64/busy-config, um/busy-config, x86/busy-config, x86_64/busy-config:
+  Enable CONFIG_HEXDUMP globally for busybox
+  Add getdvhoff replacement function from vapier
+  Remove copying of getdvhoff from system
+
   10 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_cmdline.sh,
   gen_determineargs.sh, gen_initramfs.sh, genkernel.conf:
   Add support for --firmware-files option to make robbat2 happy
diff --git a/alpha/busy-config b/alpha/busy-config
index 3ca42fa..b80b613 100644
--- a/alpha/busy-config
+++ b/alpha/busy-config
@@ -369,7 +369,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_MKFS_MINIX is not set
 # CONFIG_FEATURE_MINIX2 is not set
 # CONFIG_GETOPT is not set
-# CONFIG_HEXDUMP is not set
+CONFIG_HEXDUMP=y
 # CONFIG_HWCLOCK is not set
 # CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
 # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
diff --git a/gen_initrd.sh b/gen_initrd.sh
index a633f98..0a5155e 100644
--- a/gen_initrd.sh
+++ b/gen_initrd.sh
@@ -49,15 +49,6 @@ create_base_initrd_sys() {
 	echo "/dev/ram0     /           ext2    defaults	0 0" > ${TEMP}/initrd-temp/etc/fstab
 	echo "proc          /proc       proc    defaults    0 0" >> ${TEMP}/initrd-temp/etc/fstab
 
-	# SGI LiveCDs need the following binary (no better place for it than here)
-	# getdvhoff is a DEPEND of genkernel, so it *should* exist
-	if [ ${BUILD_INITRAMFS} -eq '1' ]
-	then
-		[ -e /usr/lib/getdvhoff/getdvhoff ] \
-			&& cp /usr/lib/getdvhoff/getdvhoff ${TEMP}/initrd-temp/bin \
-			|| gen_die "sys-boot/getdvhoff not merged!"
-	fi
-
 	cd ${TEMP}/initrd-temp/dev
 	MAKEDEV std
 	MAKEDEV console
diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index 6c0e742..52dee17 100644
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -937,3 +937,7 @@ find_looptype() {
 	[ "${LOOP}" == "/zisofs" ] && LOOPTYPE="${LOOP#/}"
 	[ -z "${LOOPTYPE}" ] && LOOPTYPE="noloop"
 }
+
+getdvhoff() {
+	echo $(( $(hexdump -n 4 -s $((316 + 12 * $2)) -e '"%i"' $1) * 512))
+}
diff --git a/generic/linuxrc b/generic/linuxrc
index f07329c..6b4d4d5 100644
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -492,7 +492,7 @@ then
 			# the LiveCD rootfs
 			good_msg 'Locating the SGI LiveCD Root Partition'
 			echo ' ' | \
-				losetup -o $(/bin/getdvhoff "${NEW_ROOT}${REAL_ROOT}" 0) \
+				losetup -o $(getdvhoff "${NEW_ROOT}${REAL_ROOT}" 0) \
 					"${NEW_ROOT}${CDROOT_DEV}" \
 					"${NEW_ROOT}${REAL_ROOT}"
 			test_success 'losetup /dev/sr0 /dev/loop0'
diff --git a/ia64/busy-config b/ia64/busy-config
index 3ca42fa..b80b613 100644
--- a/ia64/busy-config
+++ b/ia64/busy-config
@@ -369,7 +369,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_MKFS_MINIX is not set
 # CONFIG_FEATURE_MINIX2 is not set
 # CONFIG_GETOPT is not set
-# CONFIG_HEXDUMP is not set
+CONFIG_HEXDUMP=y
 # CONFIG_HWCLOCK is not set
 # CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
 # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
diff --git a/mips/busy-config b/mips/busy-config
index 9553536..ec89c3e 100644
--- a/mips/busy-config
+++ b/mips/busy-config
@@ -365,7 +365,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_MKFS_MINIX is not set
 # CONFIG_FEATURE_MINIX2 is not set
 # CONFIG_GETOPT is not set
-# CONFIG_HEXDUMP is not set
+CONFIG_HEXDUMP=y
 # CONFIG_HWCLOCK is not set
 # CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
 # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
diff --git a/parisc/busy-config b/parisc/busy-config
index 3ca42fa..b80b613 100644
--- a/parisc/busy-config
+++ b/parisc/busy-config
@@ -369,7 +369,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_MKFS_MINIX is not set
 # CONFIG_FEATURE_MINIX2 is not set
 # CONFIG_GETOPT is not set
-# CONFIG_HEXDUMP is not set
+CONFIG_HEXDUMP=y
 # CONFIG_HWCLOCK is not set
 # CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
 # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
diff --git a/parisc64/busy-config b/parisc64/busy-config
index 3ca42fa..b80b613 100644
--- a/parisc64/busy-config
+++ b/parisc64/busy-config
@@ -369,7 +369,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_MKFS_MINIX is not set
 # CONFIG_FEATURE_MINIX2 is not set
 # CONFIG_GETOPT is not set
-# CONFIG_HEXDUMP is not set
+CONFIG_HEXDUMP=y
 # CONFIG_HWCLOCK is not set
 # CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
 # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
diff --git a/ppc/busy-config b/ppc/busy-config
index 3ca42fa..b80b613 100644
--- a/ppc/busy-config
+++ b/ppc/busy-config
@@ -369,7 +369,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_MKFS_MINIX is not set
 # CONFIG_FEATURE_MINIX2 is not set
 # CONFIG_GETOPT is not set
-# CONFIG_HEXDUMP is not set
+CONFIG_HEXDUMP=y
 # CONFIG_HWCLOCK is not set
 # CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
 # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
diff --git a/ppc64/busy-config b/ppc64/busy-config
index 3ca42fa..b80b613 100644
--- a/ppc64/busy-config
+++ b/ppc64/busy-config
@@ -369,7 +369,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_MKFS_MINIX is not set
 # CONFIG_FEATURE_MINIX2 is not set
 # CONFIG_GETOPT is not set
-# CONFIG_HEXDUMP is not set
+CONFIG_HEXDUMP=y
 # CONFIG_HWCLOCK is not set
 # CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
 # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
diff --git a/sparc/busy-config b/sparc/busy-config
index 3ca42fa..b80b613 100644
--- a/sparc/busy-config
+++ b/sparc/busy-config
@@ -369,7 +369,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_MKFS_MINIX is not set
 # CONFIG_FEATURE_MINIX2 is not set
 # CONFIG_GETOPT is not set
-# CONFIG_HEXDUMP is not set
+CONFIG_HEXDUMP=y
 # CONFIG_HWCLOCK is not set
 # CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
 # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
diff --git a/sparc64/busy-config b/sparc64/busy-config
index 3ca42fa..b80b613 100644
--- a/sparc64/busy-config
+++ b/sparc64/busy-config
@@ -369,7 +369,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_MKFS_MINIX is not set
 # CONFIG_FEATURE_MINIX2 is not set
 # CONFIG_GETOPT is not set
-# CONFIG_HEXDUMP is not set
+CONFIG_HEXDUMP=y
 # CONFIG_HWCLOCK is not set
 # CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
 # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
diff --git a/um/busy-config b/um/busy-config
index 77aa4fd..da9ff92 100644
--- a/um/busy-config
+++ b/um/busy-config
@@ -370,7 +370,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_FSCK_MINIX is not set
 # CONFIG_MKFS_MINIX is not set
 # CONFIG_GETOPT is not set
-# CONFIG_HEXDUMP is not set
+CONFIG_HEXDUMP=y
 # CONFIG_HWCLOCK is not set
 CONFIG_LOSETUP=y
 CONFIG_MDADM=y
diff --git a/x86/busy-config b/x86/busy-config
index 3ca42fa..b80b613 100644
--- a/x86/busy-config
+++ b/x86/busy-config
@@ -369,7 +369,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_MKFS_MINIX is not set
 # CONFIG_FEATURE_MINIX2 is not set
 # CONFIG_GETOPT is not set
-# CONFIG_HEXDUMP is not set
+CONFIG_HEXDUMP=y
 # CONFIG_HWCLOCK is not set
 # CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
 # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
diff --git a/x86_64/busy-config b/x86_64/busy-config
index 3ca42fa..b80b613 100644
--- a/x86_64/busy-config
+++ b/x86_64/busy-config
@@ -369,7 +369,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_MKFS_MINIX is not set
 # CONFIG_FEATURE_MINIX2 is not set
 # CONFIG_GETOPT is not set
-# CONFIG_HEXDUMP is not set
+CONFIG_HEXDUMP=y
 # CONFIG_HWCLOCK is not set
 # CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
 # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set