diff options
| author | root | 2014-07-24 23:26:00 +0200 |
|---|---|---|
| committer | root | 2014-07-24 23:26:00 +0200 |
| commit | ec9fb42e19ed245baf9915f7da9209253ffbec98 (patch) | |
| tree | ffb011af7e836669a6f98a5c11a0c06233901f3a /remote/modules | |
| parent | [kernel] Remove set -x call (diff) | |
| download | tm-scripts-ec9fb42e19ed245baf9915f7da9209253ffbec98.tar.gz tm-scripts-ec9fb42e19ed245baf9915f7da9209253ffbec98.tar.xz tm-scripts-ec9fb42e19ed245baf9915f7da9209253ffbec98.zip | |
Keep split usr if original system has it, add extra logic if no split usr
Diffstat (limited to 'remote/modules')
| -rw-r--r-- | remote/modules/busybox/module.conf | 4 | ||||
| -rw-r--r-- | remote/modules/kernel/module.build | 9 | ||||
| -rw-r--r-- | remote/modules/nvidia_libs/module.conf | 1 | ||||
| -rw-r--r-- | remote/modules/vmware/module.conf | 1 |
4 files changed, 7 insertions, 8 deletions
diff --git a/remote/modules/busybox/module.conf b/remote/modules/busybox/module.conf index 82d1731e..6acfa16c 100644 --- a/remote/modules/busybox/module.conf +++ b/remote/modules/busybox/module.conf @@ -2,6 +2,6 @@ REQUIRED_GIT="git://git.busybox.net/busybox" REQUIRED_BRANCH="1_22_1" REQUIRED_BINARIES="busybox" REQUIRED_DIRECTORIES=" - /usr/bin - /usr/sbin + /bin + /sbin " diff --git a/remote/modules/kernel/module.build b/remote/modules/kernel/module.build index 78179df6..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'" diff --git a/remote/modules/nvidia_libs/module.conf b/remote/modules/nvidia_libs/module.conf index 274b3d4d..f54c114c 100644 --- a/remote/modules/nvidia_libs/module.conf +++ b/remote/modules/nvidia_libs/module.conf @@ -1,7 +1,6 @@ REQUIRED_VERSION="331.38" REQUIRED_NVIDIA="NVIDIA-Linux-x86_64-$REQUIRED_VERSION.run" REQUIRED_URL="http://download.nvidia.com/XFree86/Linux-x86_64/$REQUIRED_VERSION/$REQUIRED_NVIDIA" -REQUIRED_ORIGINAL_USR_SPLIT="yes" # Don't symlink /bin to /usr/bin etc. in build dir REQUIRED_FILES=" /etc/OpenCL/vendors/nvidia.icd diff --git a/remote/modules/vmware/module.conf b/remote/modules/vmware/module.conf index 42d73343..749a0838 100644 --- a/remote/modules/vmware/module.conf +++ b/remote/modules/vmware/module.conf @@ -1,5 +1,4 @@ REQUIRED_DOWNLOAD_BASE="http://softwareupdate.vmware.com/cds/vmw-desktop/ws/10.0.1/1379776/linux/core/" -REQUIRED_ORIGINAL_USR_SPLIT="yes" # Don't symlink /bin to /usr/bin etc. in build dir REQUIRED_TYPE="workstation" REQUIRED_MODULES="kernel" REQUIRED_DIRECTORIES=" |