Removed the use of GK_BIN variable, since it isn't necessary.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@539 67a159dc-881f-0410-a524-ba9dfbe2cb84
cleanup-cruft
Chris Gianelloni 18 years ago
parent 3c0bcf90c9
commit 2ab02c410b

@ -2,6 +2,10 @@
# Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
# $Header: $ # $Header: $
17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_bootloader.sh,
genkernel, genkernel.conf:
Removed the use of GK_BIN variable, since it isn't necessary.
17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> TODO, genkernel.conf: 17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> TODO, genkernel.conf:
Updated TODO and cleaning up genkernel.conf a bit. Updated TODO and cleaning up genkernel.conf a bit.

@ -90,7 +90,7 @@ EOF
if [ "$?" -eq '0' ] if [ "$?" -eq '0' ]
then then
local LIMIT=$(wc -l ${GRUB_CONF}.bak) local LIMIT=$(wc -l ${GRUB_CONF}.bak)
awk -f ${GK_BIN}/gen_bootloader_grub.awk LIMIT=${LIMIT/ */} KNAME=${KNAME} ARCH=${ARCH} KV=${KV} TYPE=${TYPE} ${GRUB_CONF}.bak > ${GRUB_CONF} awk -f ${GK_SHARE}/gen_bootloader_grub.awk LIMIT=${LIMIT/ */} KNAME=${KNAME} ARCH=${ARCH} KV=${KV} TYPE=${TYPE} ${GRUB_CONF}.bak > ${GRUB_CONF}
else else
print_info 1 "GRUB: Definition found, not duplicating." print_info 1 "GRUB: Definition found, not duplicating."
fi fi

@ -16,17 +16,17 @@ small_die() {
} }
source /etc/genkernel.conf || small_die "Could not read /etc/genkernel.conf" source /etc/genkernel.conf || small_die "Could not read /etc/genkernel.conf"
source ${GK_BIN}/gen_funcs.sh || small_die "Could not read ${GK_BIN}/gen_funcs.sh" source ${GK_SHARE}/gen_funcs.sh || small_die "Could not read ${GK_BIN}/gen_funcs.sh"
source ${GK_BIN}/gen_cmdline.sh || gen_die "Could not read ${GK_BIN}/gen_cmdline.sh" source ${GK_SHARE}/gen_cmdline.sh || gen_die "Could not read ${GK_BIN}/gen_cmdline.sh"
source ${GK_BIN}/gen_arch.sh || gen_die "Could not read ${GK_BIN}/gen_arch.sh" source ${GK_SHARE}/gen_arch.sh || gen_die "Could not read ${GK_BIN}/gen_arch.sh"
source ${GK_BIN}/gen_determineargs.sh || gen_die "Could not read ${GK_BIN}/gen_determineargs.sh" source ${GK_SHARE}/gen_determineargs.sh || gen_die "Could not read ${GK_BIN}/gen_determineargs.sh"
source ${GK_BIN}/gen_compile.sh || gen_die "Could not read ${GK_BIN}/gen_compile.sh" source ${GK_SHARE}/gen_compile.sh || gen_die "Could not read ${GK_BIN}/gen_compile.sh"
source ${GK_BIN}/gen_configkernel.sh || gen_die "Could not read ${GK_BIN}/gen_configkernel.sh" source ${GK_SHARE}/gen_configkernel.sh || gen_die "Could not read ${GK_BIN}/gen_configkernel.sh"
source ${GK_BIN}/gen_initrd.sh || gen_die "Could not read ${GK_BIN}/gen_initrd.sh" source ${GK_SHARE}/gen_initrd.sh || gen_die "Could not read ${GK_BIN}/gen_initrd.sh"
source ${GK_BIN}/gen_initramfs.sh || gen_die "Could not read ${GK_BIN}/gen_initramfs.sh" source ${GK_SHARE}/gen_initramfs.sh || gen_die "Could not read ${GK_BIN}/gen_initramfs.sh"
source ${GK_BIN}/gen_moddeps.sh || gen_die "Could not read ${GK_BIN}/gen_moddeps.sh" source ${GK_SHARE}/gen_moddeps.sh || gen_die "Could not read ${GK_BIN}/gen_moddeps.sh"
source ${GK_BIN}/gen_package.sh || gen_die "Could not read ${GK_BIN}/gen_package.sh" source ${GK_SHARE}/gen_package.sh || gen_die "Could not read ${GK_BIN}/gen_package.sh"
source ${GK_BIN}/gen_bootloader.sh || gen_die "Could not read ${GK_BIN}/gen_bootloader.sh" source ${GK_SHARE}/gen_bootloader.sh || gen_die "Could not read ${GK_BIN}/gen_bootloader.sh"
TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$ TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$

@ -67,8 +67,6 @@ USECOLOR="yes"
# Default share directory location # Default share directory location
GK_SHARE="/usr/share/genkernel" GK_SHARE="/usr/share/genkernel"
# Location of helper-scripts
GK_BIN="${GK_SHARE}"
# Location of the default cache # Location of the default cache
CACHE_DIR="/var/cache/genkernel/%%ARCH%%" CACHE_DIR="/var/cache/genkernel/%%ARCH%%"
# Log output file # Log output file

Loading…
Cancel
Save