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

diff --git a/ChangeLog b/ChangeLog
index 8b1998aaa35fea9a2dcaab985b25ba60dbdb4cae..1cd2aab6b131372a2fd231a52386fc113b433ad3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $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:
   Updated TODO and cleaning up genkernel.conf a bit.
 

diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index 3615d0d242383cc66d8dacaf22f8a3e7b164c726..7f772cf8248e58bba5ac1c495d633d272fa24bb5 100644 (file)
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -90,7 +90,7 @@ EOF
                if [ "$?" -eq '0' ]
                then
                        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
                        print_info 1 "GRUB: Definition found, not duplicating."
                fi

diff --git a/genkernel b/genkernel
index a4fc1de4390620af5650b977821f403be0ae09eb..55aa1ae3c045889ed174c7647c36c2cdf1ff0d5d 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -16,17 +16,17 @@ small_die() {
 }
 
 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_BIN}/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_BIN}/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_BIN}/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_BIN}/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_BIN}/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_funcs.sh || small_die "Could not read ${GK_BIN}/gen_funcs.sh"
+source ${GK_SHARE}/gen_cmdline.sh || gen_die "Could not read ${GK_BIN}/gen_cmdline.sh"
+source ${GK_SHARE}/gen_arch.sh || gen_die "Could not read ${GK_BIN}/gen_arch.sh"
+source ${GK_SHARE}/gen_determineargs.sh || gen_die "Could not read ${GK_BIN}/gen_determineargs.sh"
+source ${GK_SHARE}/gen_compile.sh || gen_die "Could not read ${GK_BIN}/gen_compile.sh"
+source ${GK_SHARE}/gen_configkernel.sh || gen_die "Could not read ${GK_BIN}/gen_configkernel.sh"
+source ${GK_SHARE}/gen_initrd.sh || gen_die "Could not read ${GK_BIN}/gen_initrd.sh"
+source ${GK_SHARE}/gen_initramfs.sh || gen_die "Could not read ${GK_BIN}/gen_initramfs.sh"
+source ${GK_SHARE}/gen_moddeps.sh || gen_die "Could not read ${GK_BIN}/gen_moddeps.sh"
+source ${GK_SHARE}/gen_package.sh || gen_die "Could not read ${GK_BIN}/gen_package.sh"
+source ${GK_SHARE}/gen_bootloader.sh || gen_die "Could not read ${GK_BIN}/gen_bootloader.sh"
 
 TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$
 

diff --git a/genkernel.conf b/genkernel.conf
index d7e87a4a32dc5294b616cf6e6dbd99551effc05d..79386e1345036cfc0687e286ad03660e1795d8c0 100755 (executable)
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -67,8 +67,6 @@ USECOLOR="yes"
 # Default share directory location
 GK_SHARE="/usr/share/genkernel"
 
-# Location of helper-scripts
-GK_BIN="${GK_SHARE}"
 # Location of the default cache
 CACHE_DIR="/var/cache/genkernel/%%ARCH%%"
 # Log output file