Cleanup remaining references to ${ARCH}/ without arch/ prefix

diff --git a/gen_arch.sh b/gen_arch.sh
index 387da50019cf91b689bf749d9d58eb422f35e432..ccd317de2d671ba107e80852fc0856e034e491a2 100755 (executable)
--- a/gen_arch.sh
+++ b/gen_arch.sh
@@ -39,7 +39,7 @@ get_official_arch() {
                UTILS_ARCH='sparc'
        fi
        
-       ARCH_CONFIG="${GK_SHARE}/${ARCH}/config.sh"
+       ARCH_CONFIG="${GK_SHARE}/arch/${ARCH}/config.sh"
        [ -f "${ARCH_CONFIG}" ] || gen_die "${ARCH} not yet supported by genkernel. Please add the arch-specific config file, ${ARCH_CONFIG}"
 }
 

diff --git a/genkernel b/genkernel
index 77170ed815cfbca54de2de238f053dbf217d5383..9be5df4e06faaa1c6ffe720fe85ebfd57499a035 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -101,7 +101,7 @@ get_official_arch
 
 # Read arch-specific config
 source ${ARCH_CONFIG} || gen_die "Could not read ${ARCH_CONFIG}"
-source ${GK_SHARE}/${ARCH}/modules_load || gen_die "Could not read ${GK_SHARE}/${ARCH}/modules_load"
+source ${GK_SHARE}/arch/${ARCH}/modules_load || gen_die "Could not read ${GK_SHARE}/arch/${ARCH}/modules_load"
 
 # Merge modules_load from config
 for group_modules in ${!AMODULES_*}; do