diff options
| author | Jonathan Bauer | 2014-07-25 15:56:48 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2014-07-25 15:56:48 +0200 |
| commit | b063cb9e530760acdfc16819fd1d21ab797666bb (patch) | |
| tree | fa75dd8a01d7e8ed72e081454861d5a816d305e5 /remote/modules/kernel | |
| parent | [rfs-s31] fix copying of the busybox (diff) | |
| parent | [pvs2 + x11vnc] Add conf files for fedora (diff) | |
| download | tm-scripts-b063cb9e530760acdfc16819fd1d21ab797666bb.tar.gz tm-scripts-b063cb9e530760acdfc16819fd1d21ab797666bb.tar.xz tm-scripts-b063cb9e530760acdfc16819fd1d21ab797666bb.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/kernel')
| -rw-r--r-- | remote/modules/kernel/module.build | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/remote/modules/kernel/module.build b/remote/modules/kernel/module.build index 1d2aad7a..7d840c7b 100644 --- a/remote/modules/kernel/module.build +++ b/remote/modules/kernel/module.build @@ -2,17 +2,18 @@ # This overrides get_kernel_version from kernel.inc, so the variables will be set properly get_kernel_version() { + # Do not use MODULE_DIR here as this function might run when we process another module! [ -n "${TARGET_KERNEL_LONG}" ] && return 0 - [ ! -e "${MODULE_DIR}/ksrc/include/generated/utsrelease.h" ] && return 0 + [ ! -e "${TARGET_DIR}/kernel/ksrc/include/generated/utsrelease.h" ] && return 0 # determine kernel version that will be running in the generated system # declare kernel version stuff - declare -rg TARGET_KERNEL_LONG=$(grep 'UTS_RELEASE' "${MODULE_DIR}/ksrc/include/generated/utsrelease.h" | awk -F '"' '{print $2}') + declare -rg TARGET_KERNEL_LONG=$(grep 'UTS_RELEASE' "${TARGET_DIR}/kernel/ksrc/include/generated/utsrelease.h" | awk -F '"' '{print $2}') declare -rg TARGET_KERNEL_SHORT=$(echo "$TARGET_KERNEL_LONG" | grep -o -E '^[0-9\.]+') # declare path to kernel headers and modules/firmware - declare -rg KERNEL_HEADERS_DIR="${MODULE_DIR}/ksrc" - declare -rg KERNEL_BASE_DIR="${MODULE_DIR}/build" + declare -rg KERNEL_HEADERS_DIR="${TARGET_DIR}/kernel/ksrc" + declare -rg KERNEL_BASE_DIR="${TARGET_DIR}/kernel/build" # print debug info pinfo "TARGET_KERNEL_LONG: '$TARGET_KERNEL_LONG'" @@ -23,7 +24,6 @@ get_kernel_version() { fetch_source() { pdebug "getting kernel sources via git ...." [ -d ./ksrc ] && rm -rf ./ksrc - set -x git clone --depth 1 "${REQUIRED_GIT}" -b "${REQUIRED_GIT_BRANCH}" ksrc || perror "Could not clone kernel git." # check for aufs local RSL=$(find ksrc/ -type d -name aufs) |