Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts

6 files changed, 64 insertions, 11 deletions

diff --git a/remote/modules/german/german.build b/remote/modules/german/german.build
new file mode 100644
index 00000000..49ce31d7
--- /dev/null
+++ b/remote/modules/german/german.build
@@ -0,0 +1,30 @@
+fetch_source() {
+	:
+}
+
+build() {
+	# Make sure uncompressed locales are present, so we can fetch german utf8
+	if [ ! -d "/usr/lib/locale/de_DE.utf8" ]; then
+		pinfo "Generating locales..."
+		locale-gen --purge --no-archive || perror "Could not run locale-gen"
+		[ ! -d "/usr/lib/locale/de_DE.utf8" ] && perror "locale-gen was executed, but de_DE.utf8 does not exist."
+	fi
+
+	# Put everything we build or get from the system in build dir
+	local FILELIST="$MODULE_DIR/list_copy_build"
+	rm -f "$FILELIST"
+
+	# Copy required directories from source system to build dir
+	for FILE in ${REQUIRED_DIRECTORIES}; do
+		[ ! -d "${FILE}" ] && perror "Missing required directory $FILE"
+		echo ${FILE} >> "${FILELIST}"
+	done
+
+	# Done collecting file and directory names, copy everything
+	tarcopy "$(sort -u "$FILELIST")" "$MODULE_BUILD_DIR"
+}
+
+post_copy() {
+	:
+}
+
diff --git a/remote/modules/german/german.conf b/remote/modules/german/german.conf
new file mode 100644
index 00000000..ec22c760
--- /dev/null
+++ b/remote/modules/german/german.conf
@@ -0,0 +1,7 @@
+REQUIRED_CONTENT_PACKAGES=""
+REQUIRED_BINARIES=""
+REQUIRED_FILES=""
+REQUIRED_DIRECTORIES="
+	/usr/lib/locale/de_DE.utf8
+"
+
diff --git a/remote/modules/kernel/kernel.build b/remote/modules/kernel/kernel.build
index 63b0a336..27e00ac1 100644
--- a/remote/modules/kernel/kernel.build
+++ b/remote/modules/kernel/kernel.build
@@ -107,19 +107,35 @@ update_config() {
 # helper to patch aufs
 patch_aufs() {
 	pinfo "Cloning aufs3 standalone git"
-	git clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git || perror "Cloning aufs3 failed."
+	cd "$MODULE_DIR"
+	if [ ! -d "aufs3-standalone/.git" ]; then
+		rm -rf "aufs3-standalone"
+		git clone "git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git" || perror "Cloning aufs3 failed."
+	fi
 	# get the needed version
 	[ ! -z ${KERNEL_VERSION} ] && local NEEDED_BRANCH=$(echo $KERNEL_VERSION | awk -F "." '{print $1"."$2}') \
 				|| perror "KERNEL_VERSION not set, this should not happen!"
 	pinfo "Getting branch origin/$NEEDED_BRANCH"
-	cd aufs3-standalone/
-	git checkout origin/aufs$NEEDED_BRANCH
+	cd "$MODULE_DIR/aufs3-standalone" || perror "Could not CD to aufs3-standalone"
+	git checkout "origin/aufs$NEEDED_BRANCH"
 	pinfo "Starting to patch..."
-	tar c include/linux/aufs_type.h Documentation fs | tar x -C ../ksrc
-	cd ../ksrc || perror "cd nicht geklappt: ../ksrc"
-	patch -p1 < ../aufs3-standalone/aufs3-kbuild.patch || perror "aufs3-standalone/aufs3-kbuild.patch failed"  
-	patch -p1 < ../aufs3-standalone/aufs3-base.patch || perror "aufs3-standalone/aufs3-base.patch failed"
-	patch -p1 < ../aufs3-standalone/aufs3-proc_map.patch || perror "aufs3-standalone/aufs3-proc_map.patch failed"
-	cp ../aufs3-standalone/include/linux/aufs_type.h include/linux/
+	tarcopy "Documentation fs" "$MODULE_DIR/ksrc"
+	local AUFSH
+	if [ ! -e "include/linux/aufs_type.h" ]; then
+		[ ! -e "include/uapi/linux/aufs_type.h" ] && perror "No aufs_type.h in aufs3-git"
+		AUFSH="include/uapi/linux/aufs_type.h"
+	elif [ -e "include/uapi/linux/aufs_type.h" -a "$(stat -c %s "include/uapi/linux/aufs_type.h")" -gt "$(stat -c %s "include/linux/aufs_type.h")" ]; then
+		AUFSH="include/uapi/linux/aufs_type.h"
+	else
+		AUFSH="include/linux/aufs_type.h"
+	fi
+	pinfo "Using $AUFSH"
+	cp "$AUFSH" "$MODULE_DIR/ksrc/include/linux/" || perror "could not copy $AUFSH"
+	cd "$MODULE_DIR/ksrc" || perror "Could not CD to kernel-source dir ksrc"
+	patch -p1 < "$MODULE_DIR/aufs3-standalone/aufs3-kbuild.patch" || perror "aufs3-standalone/aufs3-kbuild.patch failed"  
+	patch -p1 < "$MODULE_DIR/aufs3-standalone/aufs3-base.patch" || perror "aufs3-standalone/aufs3-base.patch failed"
+	#patch -p1 < "$MODULE_DIR/aufs3-standalone/aufs3-proc_map.patch" || perror "aufs3-standalone/aufs3-proc_map.patch failed"
 	pinfo "Patched kernel source with aufs-${NEEDED_BRANCH}"
+	cd "$MODULE_DIR"
 }
+
diff --git a/remote/modules/kernel/kernel.conf b/remote/modules/kernel/kernel.conf
index 0cd03752..cb7ce13a 100644
--- a/remote/modules/kernel/kernel.conf
+++ b/remote/modules/kernel/kernel.conf
@@ -1,3 +1,4 @@
 REQUIRED_BINARIES=""
 REQUIRED_LIBRARIES=""
 REQUIRED_DIRECTORIES=""
+REQUIRED_INSTALLED_PACKAGES="patch"
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
index 1aec84df..ced39207 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
@@ -48,7 +48,7 @@ REQUIRED_LIBRARIES="	libcap
 			libtinfo
 			libresolv
 			libau"
-REQUIRED_DIRECTORIES="	"
+REQUIRED_DIRECTORIES=""
 REQUIRED_FILES="	/etc/environment
 			/etc/issue
 			/etc/inputrc
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
index 3f7f446e..2fd5af1a 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
@@ -48,7 +48,6 @@ REQUIRED_LIBRARIES="	libcap
 			libtinfo
 			libresolv
 			libau"
-REQUIRED_DIRECTORIES=""
 REQUIRED_FILES="	/etc/environment
 			/etc/issue
 			/etc/inputrc