Keep split usr if original system has it, add extra logic if no split usr

7 files changed, 51 insertions, 21 deletions

diff --git a/helper/fileutil.inc b/helper/fileutil.inc
index 525e46a7..10b4bbc7 100644
--- a/helper/fileutil.inc
+++ b/helper/fileutil.inc
@@ -23,7 +23,9 @@ tarcopy () {
 	[ -z "$TO" ] && perror "tarcopy called with empty destination."
 	[ ! -d "$TO" ] && { mkdir -p "$TO" || perror "could not create destination "$TO" for tar-copy."; } 
 	# TODO count files copied? would remove the need to do it everywhere :)
-	tar $IGNORE_ERROR -cpP $FROM | tar -xp -C "$TO" 2> /dev/null
+	tar $IGNORE_ERROR -cpP $FROM | tar -xp -C "$TO" \
+		--transform 's,^/lib/udev/rules.d,/usr/lib/udev/rules.d,' \
+		2> /dev/null
 	local PS=(${PIPESTATUS[*]})
 	[ "x$IGNORE_ERROR" == "x" -a "x${PS[0]}" != "x0" ] && perror "packing-part of tar-copy from '$SHORT' to '$TO' failed. (${PS[0]})"
 	[ "x${PS[1]}" != "x0" ] && perror "unpacking-part of tar-copy from '$SHORT' to '$TO' failed. (${PS[1]})"
diff --git a/remote/includes/paths.inc b/remote/includes/paths.inc
index 2f7c3303..ca692adb 100644
--- a/remote/includes/paths.inc
+++ b/remote/includes/paths.inc
@@ -12,5 +12,21 @@ done
 
 [ -z "$SYS_PAM_MODULES_PATH" ] && perror "Failed to find pam_unix.so on this system."
 
+#
+# Figure out if we have split usr
+if [ -L "/bin" -a -L "/lib" ]; then
+	declare -rg USR_SPLIT="no"
+else
+	declare -rg USR_SPLIT="yes"
+fi
+pdebug "/bin and /lib are split from /usr/bin and /usr/lib (they are not symlinks): $USR_SPLIT"
+
+SYS_LIB_PATHS=""
+for DIR in /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64; do
+	[ -d "$DIR" -a ! -L "$DIR" ] && SYS_LIB_PATHS+=" $DIR"
+done
+declare -rg SYS_LIB_PATHS=$SYS_LIB_PATHS
+pdebug "System lib paths: $SYS_LIB_PATHS"
+
 true
 
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="
diff --git a/remote/setup_target b/remote/setup_target
index 0d28db29..02400cd1 100755
--- a/remote/setup_target
+++ b/remote/setup_target
@@ -246,6 +246,28 @@ copy_files_with_deps () {
 
 #
 #
+# If the system has no usr split, recreate the structure in the given
+# directory, otherwise, do nothing
+#
+#
+prepare_usr_split () {
+	local DIR DEST
+	local BASE=$1
+	[ -z "$BASE" ] && perror "prepare_usr_split called with empty base dir"
+	if [ "$USR_SPLIT" == "no" ]; then # no usr split, /bin /lib etc are symlinks
+		for DIR in lib lib32 lib64 bin sbin; do
+			[ -L "/${DIR}" ] || continue
+			DEST=$(readlink "/${DIR}")
+			if [ ! -L "/${DEST}" ]; then
+				mkdir -p "${BASE}/${DEST}" || perror "Could not create '${BASE}/${DEST}'"
+			fi
+			[ -L "${BASE}/${DIR}" ] || ln -s "${DEST}" "${BASE}/${DIR}" || perror "Could not symlink '${BASE}/${DIR}' to '${DEST}'"
+		done
+	fi
+}
+
+#
+#
 # main public function. Requires the TARGET to be given as argument.
 # this will simply go over all the modules as found in the remote/target/<TARGET>
 # and run following functions:
@@ -255,7 +277,6 @@ generate_target() {
 
 	initial_checks
 
-	local DIR
 	TARGET=$1 && shift
 	TARGET_DIR="${MODE_DIR}/targets/${TARGET}"
 	TARGET_BUILD_DIR="${MODE_DIR}/builds/${TARGET}"
@@ -267,10 +288,8 @@ generate_target() {
 		perror "Target directory cannot be named 'builds' or 'modules'."
 
 	pdebug "Generating '$TARGET_BUILD_DIR' for '$TARGET'"
-	for DIR in lib lib64 bin sbin; do
-		mkdir -p "${TARGET_BUILD_DIR}/usr/${DIR}" || perror "Could not create '${TARGET_BUILD_DIR}/usr/${DIR}'"
-		[ -L "${TARGET_BUILD_DIR}/${DIR}" ] || ln -s "usr/${DIR}" "${TARGET_BUILD_DIR}/${DIR}" || perror "Could not symlink '${TARGET_BUILD_DIR}/${DIR}' to 'usr/${DIR}"
-	done
+	mkdir -p "$TARGET_BUILD_DIR" || perror "Failed to create $TARGET_BUILD_DIR"
+	prepare_usr_split "${TARGET_BUILD_DIR}"
 
 	# if no arguments assume all.
 	if [ "x$1" = "x" -o "x$1" = "xall" ]; then
@@ -373,13 +392,7 @@ process_module() {
 	read_config
 	# Prepare build directory
 	mkdir -p "${MODULE_BUILD_DIR}" || perror "Could not create build dir"
-	if [ -z "${REQUIRED_ORIGINAL_USR_SPLIT}" -o "x${REQUIRED_ORIGINAL_USR_SPLIT}" = "xno" ]; then
-		local DIR
-		for DIR in lib lib64 bin sbin; do
-			mkdir -p "${MODULE_BUILD_DIR}/usr/${DIR}" || perror "Could not create '${MODULE_BUILD_DIR}/usr/${DIR}'"
-			[ -L "${MODULE_BUILD_DIR}/${DIR}" ] || ln -s "usr/${DIR}" "${MODULE_BUILD_DIR}/${DIR}" || perror "Could not symlink '${MODULE_BUILD_DIR}/${DIR}' to 'usr/${DIR}"
-		done
-	fi
+	prepare_usr_split "${MODULE_BUILD_DIR}"
 	# Check if this module has a dependency that wasn't built yet:
 	if [ ! -z "$REQUIRED_MODULES" ]; then
 		pdebug "$MODULE depends on ${REQUIRED_MODULES}...."