From d544d57ce1fdf8010b80a2007eed6641f41c7ae8 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Mon, 28 Jul 2008 14:44:13 -0700 Subject: [PATCH] Moved architecture folders under the arch subfolder. --- ChangeLog | 47 +++++++++++++++++++++++- {alpha => arch/alpha}/busy-config | 0 {alpha => arch/alpha}/config.sh | 0 {alpha => arch/alpha}/kernel-config | 0 {alpha => arch/alpha}/modules_load | 0 {ia64 => arch/ia64}/busy-config | 0 {ia64 => arch/ia64}/config.sh | 0 {ia64 => arch/ia64}/kernel-config | 0 {ia64 => arch/ia64}/modules_load | 0 {mips => arch/mips}/busy-config | 0 {mips => arch/mips}/config.sh | 0 {mips => arch/mips}/ip22r4k-2006_1.cf | 0 {mips => arch/mips}/ip22r5k-2006_1.cf | 0 {mips => arch/mips}/ip27r10k-2006_1.cf | 0 {mips => arch/mips}/ip28r10k-2006_1.cf | 0 {mips => arch/mips}/ip30r10k-2006_1.cf | 0 {mips => arch/mips}/ip32r5k-2006_1.cf | 0 {mips => arch/mips}/ip32rm5k-2006_1.cf | 0 {mips => arch/mips}/modules_load | 0 {mips => arch/mips}/nb-busybox.cf | 0 {parisc => arch/parisc}/busy-config | 0 {parisc => arch/parisc}/config.sh | 0 {parisc => arch/parisc}/modules_load | 0 {parisc64 => arch/parisc64}/busy-config | 0 {parisc64 => arch/parisc64}/config.sh | 0 {parisc64 => arch/parisc64}/modules_load | 0 {ppc => arch/ppc}/busy-config | 0 {ppc => arch/ppc}/config.sh | 0 {ppc => arch/ppc}/kernel-config | 0 {ppc => arch/ppc}/modules_load | 0 {ppc64 => arch/ppc64}/busy-config | 0 {ppc64 => arch/ppc64}/config.sh | 0 {ppc64 => arch/ppc64}/kernel-2.6-pSeries | 0 {ppc64 => arch/ppc64}/kernel-2.6.g5 | 0 {ppc64 => arch/ppc64}/modules_load | 0 {sparc => arch/sparc}/busy-config | 0 {sparc => arch/sparc}/config.sh | 0 {sparc => arch/sparc}/kernel-config | 0 {sparc => arch/sparc}/modules_load | 0 {sparc64 => arch/sparc64}/busy-config | 0 {sparc64 => arch/sparc64}/config.sh | 0 {sparc64 => arch/sparc64}/kernel-config | 0 {sparc64 => arch/sparc64}/modules_load | 0 {x86 => arch/x86}/busy-config | 0 {x86 => arch/x86}/config.sh | 0 {x86 => arch/x86}/kernel-config | 0 {x86 => arch/x86}/modules_load | 0 {x86 => arch/x86}/nb-busybox.cf | 0 {x86_64 => arch/x86_64}/busy-config | 0 {x86_64 => arch/x86_64}/config.sh | 0 {x86_64 => arch/x86_64}/kernel-config | 0 {x86_64 => arch/x86_64}/modules_load | 0 gen_configkernel.sh | 12 +++--- genkernel.conf | 4 +- 54 files changed, 53 insertions(+), 10 deletions(-) rename {alpha => arch/alpha}/busy-config (100%) rename {alpha => arch/alpha}/config.sh (100%) rename {alpha => arch/alpha}/kernel-config (100%) rename {alpha => arch/alpha}/modules_load (100%) rename {ia64 => arch/ia64}/busy-config (100%) rename {ia64 => arch/ia64}/config.sh (100%) rename {ia64 => arch/ia64}/kernel-config (100%) rename {ia64 => arch/ia64}/modules_load (100%) rename {mips => arch/mips}/busy-config (100%) rename {mips => arch/mips}/config.sh (100%) rename {mips => arch/mips}/ip22r4k-2006_1.cf (100%) rename {mips => arch/mips}/ip22r5k-2006_1.cf (100%) rename {mips => arch/mips}/ip27r10k-2006_1.cf (100%) rename {mips => arch/mips}/ip28r10k-2006_1.cf (100%) rename {mips => arch/mips}/ip30r10k-2006_1.cf (100%) rename {mips => arch/mips}/ip32r5k-2006_1.cf (100%) rename {mips => arch/mips}/ip32rm5k-2006_1.cf (100%) rename {mips => arch/mips}/modules_load (100%) rename {mips => arch/mips}/nb-busybox.cf (100%) rename {parisc => arch/parisc}/busy-config (100%) rename {parisc => arch/parisc}/config.sh (100%) rename {parisc => arch/parisc}/modules_load (100%) rename {parisc64 => arch/parisc64}/busy-config (100%) rename {parisc64 => arch/parisc64}/config.sh (100%) rename {parisc64 => arch/parisc64}/modules_load (100%) rename {ppc => arch/ppc}/busy-config (100%) rename {ppc => arch/ppc}/config.sh (100%) rename {ppc => arch/ppc}/kernel-config (100%) rename {ppc => arch/ppc}/modules_load (100%) rename {ppc64 => arch/ppc64}/busy-config (100%) rename {ppc64 => arch/ppc64}/config.sh (100%) rename {ppc64 => arch/ppc64}/kernel-2.6-pSeries (100%) rename {ppc64 => arch/ppc64}/kernel-2.6.g5 (100%) rename {ppc64 => arch/ppc64}/modules_load (100%) rename {sparc => arch/sparc}/busy-config (100%) rename {sparc => arch/sparc}/config.sh (100%) rename {sparc => arch/sparc}/kernel-config (100%) rename {sparc => arch/sparc}/modules_load (100%) rename {sparc64 => arch/sparc64}/busy-config (100%) rename {sparc64 => arch/sparc64}/config.sh (100%) rename {sparc64 => arch/sparc64}/kernel-config (100%) rename {sparc64 => arch/sparc64}/modules_load (100%) rename {x86 => arch/x86}/busy-config (100%) rename {x86 => arch/x86}/config.sh (100%) rename {x86 => arch/x86}/kernel-config (100%) rename {x86 => arch/x86}/modules_load (100%) rename {x86 => arch/x86}/nb-busybox.cf (100%) rename {x86_64 => arch/x86_64}/busy-config (100%) rename {x86_64 => arch/x86_64}/config.sh (100%) rename {x86_64 => arch/x86_64}/kernel-config (100%) rename {x86_64 => arch/x86_64}/modules_load (100%) diff --git a/ChangeLog b/ChangeLog index 936b36e..f6455ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,10 +2,53 @@ # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 28 Jul 2008; Chris Gianelloni -alpha/busy-config, + -alpha/config.sh, -alpha/kernel-config, -alpha/modules_load, + +arch/alpha/busy-config, +arch/alpha/config.sh, +arch/alpha/kernel-config, + +arch/alpha/modules_load, +arch/ia64/busy-config, +arch/ia64/config.sh, + +arch/ia64/kernel-config, +arch/mips/ip22r4k-2006_1.cf, + -mips/ip22r4k-2006_1.cf, +arch/ia64/modules_load, + +arch/mips/ip22r5k-2006_1.cf, +arch/mips/ip27r10k-2006_1.cf, + +arch/mips/ip28r10k-2006_1.cf, +arch/mips/ip30r10k-2006_1.cf, + +arch/mips/ip32r5k-2006_1.cf, +arch/mips/ip32rm5k-2006_1.cf, + -mips/ip22r5k-2006_1.cf, -mips/ip27r10k-2006_1.cf, + -mips/ip28r10k-2006_1.cf, -mips/ip30r10k-2006_1.cf, + -mips/ip32r5k-2006_1.cf, -mips/ip32rm5k-2006_1.cf, +arch/mips/busy-config, + +arch/mips/config.sh, +arch/mips/modules_load, +arch/mips/nb-busybox.cf, + +arch/parisc/busy-config, +arch/parisc/config.sh, + +arch/parisc/modules_load, +arch/parisc64/busy-config, + +arch/parisc64/config.sh, +arch/parisc64/modules_load, + +arch/ppc/busy-config, +arch/ppc/config.sh, +arch/ppc/kernel-config, + +arch/ppc/modules_load, +arch/ppc64/busy-config, +arch/ppc64/config.sh, + +arch/ppc64/kernel-2.6-pSeries, +arch/ppc64/kernel-2.6.g5, + +arch/ppc64/modules_load, +arch/sparc/busy-config, +arch/sparc/config.sh, + +arch/sparc/kernel-config, +arch/sparc/modules_load, + +arch/sparc64/busy-config, +arch/sparc64/config.sh, + +arch/sparc64/kernel-config, +arch/sparc64/modules_load, + +arch/x86/busy-config, +arch/x86/config.sh, +arch/x86/kernel-config, + +arch/x86/modules_load, +arch/x86/nb-busybox.cf, +arch/x86_64/busy-config, + +arch/x86_64/config.sh, +arch/x86_64/kernel-config, + +arch/x86_64/modules_load, gen_configkernel.sh, genkernel.conf, + -ia64/busy-config, -ia64/config.sh, -ia64/kernel-config, + -ia64/modules_load, -mips/busy-config, -mips/config.sh, + -mips/modules_load, -mips/nb-busybox.cf, -parisc/busy-config, + -parisc/config.sh, -parisc/modules_load, -parisc64/busy-config, + -parisc64/config.sh, -parisc64/modules_load, -ppc/busy-config, + -ppc/config.sh, -ppc/kernel-config, -ppc/modules_load, -ppc64/busy-config, + -ppc64/config.sh, -ppc64/kernel-2.6-pSeries, -ppc64/kernel-2.6.g5, + -ppc64/modules_load, -sparc/busy-config, -sparc/config.sh, + -sparc/kernel-config, -sparc/modules_load, -sparc64/busy-config, + -sparc64/config.sh, -sparc64/kernel-config, -sparc64/modules_load, + -x86/busy-config, -x86/config.sh, -x86/kernel-config, -x86/modules_load, + -x86/nb-busybox.cf, -x86_64/busy-config, -x86_64/config.sh, + -x86_64/kernel-config, -x86_64/modules_load: + Moved architecture folders under the arch subfolder. + 05 Jun 2008; Chris Gianelloni -um/kernel-config-2.6, -ppc/kernel-config-2.6, -alpha/kernel-config-2.6, -ia64/kernel-config-2.6, - -x86/kernel-config-2.6, -x86_64/kernel-config-2.6, ++, ++, ++, ++, ++, ++, - genkernel: + -x86/kernel-config-2.6, -x86_64/kernel-config-2.6, +um/kernel-config, + +ppc/kernel-config, +alpha/kernel-config, +ia64/kernel-config, + +x86/kernel-config, +x86_64/kernel-config, genkernel: Rename kernel-config-2.6 to kernel-config, since we no longer support 2.4 kernels. This is genkernel 3.4.10 for release. diff --git a/alpha/busy-config b/arch/alpha/busy-config similarity index 100% rename from alpha/busy-config rename to arch/alpha/busy-config diff --git a/alpha/config.sh b/arch/alpha/config.sh similarity index 100% rename from alpha/config.sh rename to arch/alpha/config.sh diff --git a/alpha/kernel-config b/arch/alpha/kernel-config similarity index 100% rename from alpha/kernel-config rename to arch/alpha/kernel-config diff --git a/alpha/modules_load b/arch/alpha/modules_load similarity index 100% rename from alpha/modules_load rename to arch/alpha/modules_load diff --git a/ia64/busy-config b/arch/ia64/busy-config similarity index 100% rename from ia64/busy-config rename to arch/ia64/busy-config diff --git a/ia64/config.sh b/arch/ia64/config.sh similarity index 100% rename from ia64/config.sh rename to arch/ia64/config.sh diff --git a/ia64/kernel-config b/arch/ia64/kernel-config similarity index 100% rename from ia64/kernel-config rename to arch/ia64/kernel-config diff --git a/ia64/modules_load b/arch/ia64/modules_load similarity index 100% rename from ia64/modules_load rename to arch/ia64/modules_load diff --git a/mips/busy-config b/arch/mips/busy-config similarity index 100% rename from mips/busy-config rename to arch/mips/busy-config diff --git a/mips/config.sh b/arch/mips/config.sh similarity index 100% rename from mips/config.sh rename to arch/mips/config.sh diff --git a/mips/ip22r4k-2006_1.cf b/arch/mips/ip22r4k-2006_1.cf similarity index 100% rename from mips/ip22r4k-2006_1.cf rename to arch/mips/ip22r4k-2006_1.cf diff --git a/mips/ip22r5k-2006_1.cf b/arch/mips/ip22r5k-2006_1.cf similarity index 100% rename from mips/ip22r5k-2006_1.cf rename to arch/mips/ip22r5k-2006_1.cf diff --git a/mips/ip27r10k-2006_1.cf b/arch/mips/ip27r10k-2006_1.cf similarity index 100% rename from mips/ip27r10k-2006_1.cf rename to arch/mips/ip27r10k-2006_1.cf diff --git a/mips/ip28r10k-2006_1.cf b/arch/mips/ip28r10k-2006_1.cf similarity index 100% rename from mips/ip28r10k-2006_1.cf rename to arch/mips/ip28r10k-2006_1.cf diff --git a/mips/ip30r10k-2006_1.cf b/arch/mips/ip30r10k-2006_1.cf similarity index 100% rename from mips/ip30r10k-2006_1.cf rename to arch/mips/ip30r10k-2006_1.cf diff --git a/mips/ip32r5k-2006_1.cf b/arch/mips/ip32r5k-2006_1.cf similarity index 100% rename from mips/ip32r5k-2006_1.cf rename to arch/mips/ip32r5k-2006_1.cf diff --git a/mips/ip32rm5k-2006_1.cf b/arch/mips/ip32rm5k-2006_1.cf similarity index 100% rename from mips/ip32rm5k-2006_1.cf rename to arch/mips/ip32rm5k-2006_1.cf diff --git a/mips/modules_load b/arch/mips/modules_load similarity index 100% rename from mips/modules_load rename to arch/mips/modules_load diff --git a/mips/nb-busybox.cf b/arch/mips/nb-busybox.cf similarity index 100% rename from mips/nb-busybox.cf rename to arch/mips/nb-busybox.cf diff --git a/parisc/busy-config b/arch/parisc/busy-config similarity index 100% rename from parisc/busy-config rename to arch/parisc/busy-config diff --git a/parisc/config.sh b/arch/parisc/config.sh similarity index 100% rename from parisc/config.sh rename to arch/parisc/config.sh diff --git a/parisc/modules_load b/arch/parisc/modules_load similarity index 100% rename from parisc/modules_load rename to arch/parisc/modules_load diff --git a/parisc64/busy-config b/arch/parisc64/busy-config similarity index 100% rename from parisc64/busy-config rename to arch/parisc64/busy-config diff --git a/parisc64/config.sh b/arch/parisc64/config.sh similarity index 100% rename from parisc64/config.sh rename to arch/parisc64/config.sh diff --git a/parisc64/modules_load b/arch/parisc64/modules_load similarity index 100% rename from parisc64/modules_load rename to arch/parisc64/modules_load diff --git a/ppc/busy-config b/arch/ppc/busy-config similarity index 100% rename from ppc/busy-config rename to arch/ppc/busy-config diff --git a/ppc/config.sh b/arch/ppc/config.sh similarity index 100% rename from ppc/config.sh rename to arch/ppc/config.sh diff --git a/ppc/kernel-config b/arch/ppc/kernel-config similarity index 100% rename from ppc/kernel-config rename to arch/ppc/kernel-config diff --git a/ppc/modules_load b/arch/ppc/modules_load similarity index 100% rename from ppc/modules_load rename to arch/ppc/modules_load diff --git a/ppc64/busy-config b/arch/ppc64/busy-config similarity index 100% rename from ppc64/busy-config rename to arch/ppc64/busy-config diff --git a/ppc64/config.sh b/arch/ppc64/config.sh similarity index 100% rename from ppc64/config.sh rename to arch/ppc64/config.sh diff --git a/ppc64/kernel-2.6-pSeries b/arch/ppc64/kernel-2.6-pSeries similarity index 100% rename from ppc64/kernel-2.6-pSeries rename to arch/ppc64/kernel-2.6-pSeries diff --git a/ppc64/kernel-2.6.g5 b/arch/ppc64/kernel-2.6.g5 similarity index 100% rename from ppc64/kernel-2.6.g5 rename to arch/ppc64/kernel-2.6.g5 diff --git a/ppc64/modules_load b/arch/ppc64/modules_load similarity index 100% rename from ppc64/modules_load rename to arch/ppc64/modules_load diff --git a/sparc/busy-config b/arch/sparc/busy-config similarity index 100% rename from sparc/busy-config rename to arch/sparc/busy-config diff --git a/sparc/config.sh b/arch/sparc/config.sh similarity index 100% rename from sparc/config.sh rename to arch/sparc/config.sh diff --git a/sparc/kernel-config b/arch/sparc/kernel-config similarity index 100% rename from sparc/kernel-config rename to arch/sparc/kernel-config diff --git a/sparc/modules_load b/arch/sparc/modules_load similarity index 100% rename from sparc/modules_load rename to arch/sparc/modules_load diff --git a/sparc64/busy-config b/arch/sparc64/busy-config similarity index 100% rename from sparc64/busy-config rename to arch/sparc64/busy-config diff --git a/sparc64/config.sh b/arch/sparc64/config.sh similarity index 100% rename from sparc64/config.sh rename to arch/sparc64/config.sh diff --git a/sparc64/kernel-config b/arch/sparc64/kernel-config similarity index 100% rename from sparc64/kernel-config rename to arch/sparc64/kernel-config diff --git a/sparc64/modules_load b/arch/sparc64/modules_load similarity index 100% rename from sparc64/modules_load rename to arch/sparc64/modules_load diff --git a/x86/busy-config b/arch/x86/busy-config similarity index 100% rename from x86/busy-config rename to arch/x86/busy-config diff --git a/x86/config.sh b/arch/x86/config.sh similarity index 100% rename from x86/config.sh rename to arch/x86/config.sh diff --git a/x86/kernel-config b/arch/x86/kernel-config similarity index 100% rename from x86/kernel-config rename to arch/x86/kernel-config diff --git a/x86/modules_load b/arch/x86/modules_load similarity index 100% rename from x86/modules_load rename to arch/x86/modules_load diff --git a/x86/nb-busybox.cf b/arch/x86/nb-busybox.cf similarity index 100% rename from x86/nb-busybox.cf rename to arch/x86/nb-busybox.cf diff --git a/x86_64/busy-config b/arch/x86_64/busy-config similarity index 100% rename from x86_64/busy-config rename to arch/x86_64/busy-config diff --git a/x86_64/config.sh b/arch/x86_64/config.sh similarity index 100% rename from x86_64/config.sh rename to arch/x86_64/config.sh diff --git a/x86_64/kernel-config b/arch/x86_64/kernel-config similarity index 100% rename from x86_64/kernel-config rename to arch/x86_64/kernel-config diff --git a/x86_64/modules_load b/arch/x86_64/modules_load similarity index 100% rename from x86_64/modules_load rename to arch/x86_64/modules_load diff --git a/gen_configkernel.sh b/gen_configkernel.sh index 016d631..6b23a8d 100644 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -7,18 +7,18 @@ determine_config_file() { elif [ -f "/etc/kernels/kernel-config-${ARCH}-${KV}" ] then KERNEL_CONFIG="/etc/kernels/kernel-config-${ARCH}-${KV}" - elif [ -f "${GK_SHARE}/${ARCH}/kernel-config-${KV}" ] + elif [ -f "${GK_SHARE}/arch/${ARCH}/kernel-config-${KV}" ] then - KERNEL_CONFIG="${GK_SHARE}/${ARCH}/kernel-config-${KV}" + KERNEL_CONFIG="${GK_SHARE}/arch/${ARCH}/kernel-config-${KV}" elif [ "${DEFAULT_KERNEL_CONFIG}" != "" -a -f "${DEFAULT_KERNEL_CONFIG}" ] then KERNEL_CONFIG="${DEFAULT_KERNEL_CONFIG}" - elif [ -f "${GK_SHARE}/${ARCH}/kernel-config-${VER}.${PAT}" ] + elif [ -f "${GK_SHARE}/arch/${ARCH}/kernel-config-${VER}.${PAT}" ] then - KERNEL_CONFIG="${GK_SHARE}/${ARCH}/kernel-config-${VER}.${PAT}" - elif [ -f "${GK_SHARE}/${ARCH}/kernel-config" ] + KERNEL_CONFIG="${GK_SHARE}/arch/${ARCH}/kernel-config-${VER}.${PAT}" + elif [ -f "${GK_SHARE}/arch/${ARCH}/kernel-config" ] then - KERNEL_CONFIG="${GK_SHARE}/${ARCH}/kernel-config" + KERNEL_CONFIG="${GK_SHARE}/arch/${ARCH}/kernel-config" else gen_die 'Error: No kernel .config specified, or file not found!' fi diff --git a/genkernel.conf b/genkernel.conf index 9b09ad1..9c8107d 100755 --- a/genkernel.conf +++ b/genkernel.conf @@ -134,8 +134,8 @@ LOGLEVEL=1 # Default location of kernel source DEFAULT_KERNEL_SOURCE="/usr/src/linux" # Default kernel config (only use to override using -# %%ARCH%%/kernel-config-${VER}.${PAT} !) -# DEFAULT_KERNEL_CONFIG="${GK_SHARE}/%%ARCH%%/kernel-config" +# arch/%%ARCH%%/kernel-config-${VER}.${PAT} !) +# DEFAULT_KERNEL_CONFIG="${GK_SHARE}/arch/%%ARCH%%/kernel-config" # Configuration file for busybox BUSYBOX_CONFIG="${GK_SHARE}/%%ARCH%%/busy-config"