denes
/
genkernel_fork
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enable CONFIG_HEXDUMP globally for busybox

Browse Source 
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
cleanup-cruft
Andrew Gaffney 17 years ago
parent 7fab7bb1f9
commit bfd3e14a07
16 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File

9
ChangeLog
Unescape View File

@ -2,6 +2,15 @@
# Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $ # $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, 10 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_cmdline.sh,
gen_determineargs.sh, gen_initramfs.sh, genkernel.conf: gen_determineargs.sh, gen_initramfs.sh, genkernel.conf:
Add support for --firmware-files option to make robbat2 happy Add support for --firmware-files option to make robbat2 happy

2
alpha/busy-config
Unescape View File

@ -369,7 +369,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_MKFS_MINIX is not set # CONFIG_MKFS_MINIX is not set
# CONFIG_FEATURE_MINIX2 is not set # CONFIG_FEATURE_MINIX2 is not set
# CONFIG_GETOPT is not set # CONFIG_GETOPT is not set
# CONFIG_HEXDUMP is not set CONFIG_HEXDUMP=y
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
# CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set # CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set

9
gen_initrd.sh
Unescape View File

@ -49,15 +49,6 @@ create_base_initrd_sys() {
echo "/dev/ram0 / ext2 defaults 0 0" > ${TEMP}/initrd-temp/etc/fstab echo "/dev/ram0 / ext2 defaults 0 0" > ${TEMP}/initrd-temp/etc/fstab
echo "proc /proc proc 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 cd ${TEMP}/initrd-temp/dev
MAKEDEV std MAKEDEV std
MAKEDEV console MAKEDEV console

4
generic/initrd.scripts
Unescape View File

@ -937,3 +937,7 @@ find_looptype() {
[ "${LOOP}" == "/zisofs" ] && LOOPTYPE="${LOOP#/}" [ "${LOOP}" == "/zisofs" ] && LOOPTYPE="${LOOP#/}"
[ -z "${LOOPTYPE}" ] && LOOPTYPE="noloop" [ -z "${LOOPTYPE}" ] && LOOPTYPE="noloop"
} }
getdvhoff() {
echo $(( $(hexdump -n 4 -s $((316 + 12 * $2)) -e '"%i"' $1) * 512))
}

2
generic/linuxrc
Unescape View File

@ -492,7 +492,7 @@ then
# the LiveCD rootfs # the LiveCD rootfs
good_msg 'Locating the SGI LiveCD Root Partition' good_msg 'Locating the SGI LiveCD Root Partition'
echo ' ' | \ echo ' ' | \
losetup -o $(/bin/getdvhoff "${NEW_ROOT}${REAL_ROOT}" 0) \ losetup -o $(getdvhoff "${NEW_ROOT}${REAL_ROOT}" 0) \
"${NEW_ROOT}${CDROOT_DEV}" \ "${NEW_ROOT}${CDROOT_DEV}" \
"${NEW_ROOT}${REAL_ROOT}" "${NEW_ROOT}${REAL_ROOT}"
test_success 'losetup /dev/sr0 /dev/loop0' test_success 'losetup /dev/sr0 /dev/loop0'

2
ia64/busy-config
Unescape View File

@ -369,7 +369,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_MKFS_MINIX is not set # CONFIG_MKFS_MINIX is not set
# CONFIG_FEATURE_MINIX2 is not set # CONFIG_FEATURE_MINIX2 is not set
# CONFIG_GETOPT is not set # CONFIG_GETOPT is not set
# CONFIG_HEXDUMP is not set CONFIG_HEXDUMP=y
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
# CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set # CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set

2
mips/busy-config
Unescape View File

@ -365,7 +365,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_MKFS_MINIX is not set # CONFIG_MKFS_MINIX is not set
# CONFIG_FEATURE_MINIX2 is not set # CONFIG_FEATURE_MINIX2 is not set
# CONFIG_GETOPT is not set # CONFIG_GETOPT is not set
# CONFIG_HEXDUMP is not set CONFIG_HEXDUMP=y
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
# CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set # CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set

2
parisc/busy-config
Unescape View File

@ -369,7 +369,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_MKFS_MINIX is not set # CONFIG_MKFS_MINIX is not set
# CONFIG_FEATURE_MINIX2 is not set # CONFIG_FEATURE_MINIX2 is not set
# CONFIG_GETOPT is not set # CONFIG_GETOPT is not set
# CONFIG_HEXDUMP is not set CONFIG_HEXDUMP=y
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
# CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set # CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set

2
parisc64/busy-config
Unescape View File

@ -369,7 +369,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_MKFS_MINIX is not set # CONFIG_MKFS_MINIX is not set
# CONFIG_FEATURE_MINIX2 is not set # CONFIG_FEATURE_MINIX2 is not set
# CONFIG_GETOPT is not set # CONFIG_GETOPT is not set
# CONFIG_HEXDUMP is not set CONFIG_HEXDUMP=y
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
# CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set # CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set

2
ppc/busy-config
Unescape View File

@ -369,7 +369,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_MKFS_MINIX is not set # CONFIG_MKFS_MINIX is not set
# CONFIG_FEATURE_MINIX2 is not set # CONFIG_FEATURE_MINIX2 is not set
# CONFIG_GETOPT is not set # CONFIG_GETOPT is not set
# CONFIG_HEXDUMP is not set CONFIG_HEXDUMP=y
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
# CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set # CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set

2
ppc64/busy-config
Unescape View File

@ -369,7 +369,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_MKFS_MINIX is not set # CONFIG_MKFS_MINIX is not set
# CONFIG_FEATURE_MINIX2 is not set # CONFIG_FEATURE_MINIX2 is not set
# CONFIG_GETOPT is not set # CONFIG_GETOPT is not set
# CONFIG_HEXDUMP is not set CONFIG_HEXDUMP=y
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
# CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set # CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set

2
sparc/busy-config
Unescape View File

@ -369,7 +369,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_MKFS_MINIX is not set # CONFIG_MKFS_MINIX is not set
# CONFIG_FEATURE_MINIX2 is not set # CONFIG_FEATURE_MINIX2 is not set
# CONFIG_GETOPT is not set # CONFIG_GETOPT is not set
# CONFIG_HEXDUMP is not set CONFIG_HEXDUMP=y
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
# CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set # CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set

2
sparc64/busy-config
Unescape View File

@ -369,7 +369,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_MKFS_MINIX is not set # CONFIG_MKFS_MINIX is not set
# CONFIG_FEATURE_MINIX2 is not set # CONFIG_FEATURE_MINIX2 is not set
# CONFIG_GETOPT is not set # CONFIG_GETOPT is not set
# CONFIG_HEXDUMP is not set CONFIG_HEXDUMP=y
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
# CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set # CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set

2
um/busy-config
Unescape View File

@ -370,7 +370,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_FSCK_MINIX is not set # CONFIG_FSCK_MINIX is not set
# CONFIG_MKFS_MINIX is not set # CONFIG_MKFS_MINIX is not set
# CONFIG_GETOPT is not set # CONFIG_GETOPT is not set
# CONFIG_HEXDUMP is not set CONFIG_HEXDUMP=y
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
CONFIG_LOSETUP=y CONFIG_LOSETUP=y
CONFIG_MDADM=y CONFIG_MDADM=y

2
x86/busy-config
Unescape View File

@ -369,7 +369,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_MKFS_MINIX is not set # CONFIG_MKFS_MINIX is not set
# CONFIG_FEATURE_MINIX2 is not set # CONFIG_FEATURE_MINIX2 is not set
# CONFIG_GETOPT is not set # CONFIG_GETOPT is not set
# CONFIG_HEXDUMP is not set CONFIG_HEXDUMP=y
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
# CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set # CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set

2
x86_64/busy-config
Unescape View File

@ -369,7 +369,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_MKFS_MINIX is not set # CONFIG_MKFS_MINIX is not set
# CONFIG_FEATURE_MINIX2 is not set # CONFIG_FEATURE_MINIX2 is not set
# CONFIG_GETOPT is not set # CONFIG_GETOPT is not set
# CONFIG_HEXDUMP is not set CONFIG_HEXDUMP=y
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
# CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set # CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set

Write Preview
Loading…
Cancel
Save