diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2019-07-13 12:48:21 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2019-07-14 13:58:09 +0200 |
| commit | 13b7b4d353bf8f1eb7869f7c83e4c7549b47035b (patch) | |
| tree | 09b53c12f13eba70a9c248067f5a47c26400ad4b | |
| parent | manpage: Sort content (diff) | |
| download | genkernel-13b7b4d353bf8f1eb7869f7c83e4c7549b47035b.tar.gz genkernel-13b7b4d353bf8f1eb7869f7c83e4c7549b47035b.tar.bz2 genkernel-13b7b4d353bf8f1eb7869f7c83e4c7549b47035b.zip | |
gen_arch.sh: Refactor set_kernel_arch()
- Rename to determine_kernel_arch().
- Adjust error message.
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
| -rwxr-xr-x | gen_arch.sh | 17 | ||||
| -rwxr-xr-x | genkernel | 2 |
2 files changed, 9 insertions, 10 deletions
diff --git a/gen_arch.sh b/gen_arch.sh index 79eb6503..b66ded30 100755 --- a/gen_arch.sh +++ b/gen_arch.sh @@ -47,17 +47,17 @@ get_official_arch() { [ -f "${ARCH_CONFIG}" ] || gen_die "${ARCH} not yet supported by genkernel. Please add the arch-specific config file, ${ARCH_CONFIG}" } -set_kernel_arch() { - [ -z "${VER}" ] && gen_die "cannot set KERNEL_ARCH without VER!" - [ -z "${SUB}" ] && gen_die "cannot set KERNEL_ARCH without SUB!" - [ -z "${PAT}" ] && gen_die "cannot set KERNEL_ARCH without PAT!" +determine_kernel_arch() { + [ -z "${VER}" ] && gen_die "Cannot determine KERNEL_ARCH without \$VER!" + [ -z "${SUB}" ] && gen_die "Cannot determine KERNEL_ARCH without \$SUB!" + [ -z "${PAT}" ] && gen_die "Cannot determine KERNEL_ARCH without \$PAT!" KERNEL_ARCH=${ARCH} case ${ARCH} in ppc|ppc64*) if [ "${VER}" -ge "3" ] then - KERNEL_ARCH=powerpc + KERNEL_ARCH=powerpc elif [ "${VER}" -eq "2" -a "${PAT}" -ge "6" ] then if [ "${PAT}" -eq "6" -a "${SUB}" -ge "16" ] || [ "${PAT}" -gt "6" ] @@ -69,7 +69,7 @@ set_kernel_arch() { x86) if [ "${VER}" -ge "3" ] then - KERNEL_ARCH=x86 + KERNEL_ARCH=x86 elif [ "${VER}" -eq "2" -a "${PAT}" -ge "6" ] || [ "${VER}" -gt "2" ] then if [ "${PAT}" -eq "6" -a "${SUB}" -ge "24" ] || [ "${PAT}" -gt "6" ] @@ -83,7 +83,7 @@ set_kernel_arch() { x86_64) if [ "${VER}" -ge "3" ] then - KERNEL_ARCH=x86 + KERNEL_ARCH=x86 elif [ "${VER}" -eq "2" -a "${PAT}" -ge "6" ] || [ "${VER}" -gt "2" ] then if [ "${PAT}" -eq "6" -a "${SUB}" -ge "24" ] || [ "${PAT}" -gt "6" ] @@ -93,6 +93,5 @@ set_kernel_arch() { fi ;; esac - export KERNEL_ARCH - print_info 2 "KERNEL_ARCH=${KERNEL_ARCH}" + print_info 2 "KERNEL_ARCH set to '${KERNEL_ARCH}' ..." } @@ -146,7 +146,7 @@ determine_KV determine_config_file -set_kernel_arch +determine_kernel_arch setup_cache_dir |