From 2ab02c410b713912dc41b593e8650c6d474b4901 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Mon, 17 Sep 2007 21:43:35 +0000 Subject: [PATCH] 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 --- ChangeLog | 4 ++++ gen_bootloader.sh | 2 +- genkernel | 22 +++++++++++----------- genkernel.conf | 2 -- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b1998a..1cd2aab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 17 Sep 2007; Chris Gianelloni gen_bootloader.sh, + genkernel, genkernel.conf: + Removed the use of GK_BIN variable, since it isn't necessary. + 17 Sep 2007; Chris Gianelloni TODO, genkernel.conf: Updated TODO and cleaning up genkernel.conf a bit. diff --git a/gen_bootloader.sh b/gen_bootloader.sh index 3615d0d..7f772cf 100644 --- 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 a4fc1de..55aa1ae 100755 --- 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 d7e87a4..79386e1 100755 --- 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 -- 2.26.2