Update for openSUSE 12.3

13 files changed, 31 insertions, 26 deletions

diff --git a/helper/fileutil.inc b/helper/fileutil.inc
index 8639aea0..ba1be103 100644
--- a/helper/fileutil.inc
+++ b/helper/fileutil.inc
@@ -52,6 +52,7 @@ list_packet_files() {
 		[ "x$LPRET" != "x0" -a "x$OPTIONAL" != "x@" ] && perror "dpkg/rpm existed with code '$LPRET' for required package ${PACKAGE}."
 		[ "x$LPRET" != "x0" ] && pwarning "dpkg/rpm exited with code '$LPRET' for optional package ${PACKAGE}." && continue
 		[ -z "$FILES" ] && pwarning "list_packet_files empty for packet ${PACKAGE}." && continue
+		pdebug "Packet $PACKAGE has $(echo $FILES | wc -w) files..."
 		for FILE in $FILES; do
 			[ ! -d "$FILE" ] && echo "$FILE"
 		done
diff --git a/helper/kernel.inc b/helper/kernel.inc
index bae07afa..3d1e0dc0 100644
--- a/helper/kernel.inc
+++ b/helper/kernel.inc
@@ -21,7 +21,7 @@ KERNEL_NFS_DIR=""
 mount_kernel_dir() {
 	[ -z "$KERNEL_NFS_DIR" ] || return 0
 	KERNEL_NFS_DIR="$(mktemp -d)"
-	mount -t nfs -o ro "132.230.8.228:/srv/openslx/kernel" "$KERNEL_NFS_DIR"
+	mount -t nfs -o ro "132.230.8.113:/srv/openslx/kernel" "$KERNEL_NFS_DIR"
 	local RET=$?
 	if [ "x$RET" != "x0" ]; then
 		local BROKEN_KERNEL_NFS_DIR="${KERNEL_NFS_DIR}"
@@ -142,6 +142,7 @@ fetch_source() {
 		apt-get source linux-image-${KERNEL_VERSION}
 	elif [ "x$PACKET_MANAGER" == "zypper" ]; then
 		# TODO
+		:
 	fi
 }
 build_kernel() {
diff --git a/remote/modules/dbus/dbus.build b/remote/modules/dbus/dbus.build
index 31c75fc9..7f6d663f 100644
--- a/remote/modules/dbus/dbus.build
+++ b/remote/modules/dbus/dbus.build
@@ -16,7 +16,8 @@ post_copy() {
 
 	# quick fix to get the unit files from the package
 	# moved them from lib/systemd to usr/lib/systemd
-	cd "${BUILDDIR}"
-	tarcopy lib/systemd "${TARGET_BUILD_DIR}"/usr
-	cd - &> /dev/null
+	#cd "${BUILDDIR}"
+	#tarcopy lib/systemd "${TARGET_BUILD_DIR}"/usr
+	#cd - &> /dev/null
+	:
 }
diff --git a/remote/modules/pam/pam.conf.zypper b/remote/modules/pam/pam.conf.zypper
index 1562ec7f..7c1dc5d6 100644
--- a/remote/modules/pam/pam.conf.zypper
+++ b/remote/modules/pam/pam.conf.zypper
@@ -3,9 +3,7 @@ REQUIRED_PACKAGES="	pam_ldap pam pam-devel nss_ldap"
 REQUIRED_DIRECTORIES="	/lib
 			/usr/lib
 			/etc/security"
-REQUIRED_SYSTEM_FILES="	/etc/pam.conf
-			/etc/login.defs
-			/etc/nsswitch.conf
-			/etc/securetty
-			/etc/default/locale
-			/lib/security"
+REQUIRED_SYSTEM_FILES=" /etc/login.defs
+                        /etc/securetty
+                        /lib/security"
+
diff --git a/remote/modules/rsyslogd/rsyslogd.conf.zypper b/remote/modules/rsyslogd/rsyslogd.conf.zypper
index c41d7922..e826768a 100644
--- a/remote/modules/rsyslogd/rsyslogd.conf.zypper
+++ b/remote/modules/rsyslogd/rsyslogd.conf.zypper
@@ -1,2 +1,2 @@
 REQUIRED_DIRECTORIES="	/etc/rsyslog.d
-			/lib/rsyslog"
+			/usr/lib/rsyslog"
diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build
index ee74d53a..fb56f231 100644
--- a/remote/modules/systemd/systemd.build
+++ b/remote/modules/systemd/systemd.build
@@ -8,9 +8,9 @@ fetch_source () {
 build () {
 	#build libkmod
 	cd "${MODULE_DIR}/src/$LIBKMOD_VERSION"
-	./configure
-	make || perror "make failed."
-	make install || perror "make install failed."
+	./configure || perror "./configure kmod failed."
+	make || perror "kmod make failed."
+	make install || perror "kmod make install failed."
 	cd - &> /dev/null
 
 	#build systemd
diff --git a/remote/modules/systemd/systemd.conf.zypper b/remote/modules/systemd/systemd.conf.zypper
index d76d008e..8fd38a30 100644
--- a/remote/modules/systemd/systemd.conf.zypper
+++ b/remote/modules/systemd/systemd.conf.zypper
@@ -1,11 +1,12 @@
-VERSION=systemd-197
+VERSION=systemd-201
 URL=http://www.freedesktop.org/software/systemd/${VERSION}.tar.xz
 REQUIRED_DEPENDENCIES="	intltool
 			gperf
 			pkg-config
 			libcap-devel
 			libudev-devel
-			dbus-1-devel"
+			dbus-1-devel
+			libxslt-tools"
 REQUIRED_BINARIES="	hostnamectl
 			journalctl
 			localectl
diff --git a/remote/modules/xorg/xorg.build b/remote/modules/xorg/xorg.build
index 34750ef5..5b1b0847 100644
--- a/remote/modules/xorg/xorg.build
+++ b/remote/modules/xorg/xorg.build
@@ -10,6 +10,7 @@ build() {
 
 	list_packet_files >> "$COPYLIST"
 	tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
+	pdebug ....
 }
 
 post_copy() {
diff --git a/remote/modules/xorg/xorg.conf.zypper b/remote/modules/xorg/xorg.conf.zypper
index 8d02136c..d9259257 100644
--- a/remote/modules/xorg/xorg.conf.zypper
+++ b/remote/modules/xorg/xorg.conf.zypper
@@ -3,15 +3,15 @@ REQUIRED_PACKAGES="	xorg-x11
 			xorg-x11-driver-input
 			xorg-x11-driver-video
 			xorg-x11-driver-video-nouveau
-			xorg-x11-driver-video-radeonhd
+			xf86-input-vmmouse
+			xf86-input-wacom
 			xkeyboard-config
-			dejavu
+			dejavu-fonts
 			kdm-branding-openSUSE"
 REQUIRED_BINARIES="	Xorg
 			gtf
 			cvt 
 			X 
-			xkbcomp 
 			xkbvleds 
 			xkbprint 
 			setxkbmap 
@@ -19,8 +19,7 @@ REQUIRED_BINARIES="	Xorg
 			xkbbell 
 			xkbevd 
 			vmmouse_detect"
-REQUIRED_DIRECTORIES="	/lib/udev 
-			/usr/lib 
+REQUIRED_DIRECTORIES="	/usr/lib 
 			/usr/share/X11
 			/usr/share/fonts"
 REQUIRED_FILES="/var/adm/fillup-templates/sysconfig.displaymanager-kdm"
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
index a14bdfa4..8b056e1b 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
@@ -4,6 +4,12 @@ fetch_source() {
 }
 
 build() {
+	if [ ! -z "$REQUIRED_PACKAGES" ]; then
+		COPYLIST="list_dpkg_output"
+		[ -e "${COPYLIST}" ] && rm "${COPYLIST}"
+		list_packet_files >> "${COPYLIST}"
+		tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}"
+	fi
 
 	FILELIST="list_binaries_and_files"
 	[ -e "${FILELIST}" ] && rm "${FILELIST}"
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
index 15bd0908..1ff35bcb 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
@@ -48,8 +48,6 @@ REQUIRED_FILES="	/etc/environment
 			/etc/localtime
 			/etc/login.defs
 			/etc/securetty
-			/etc/default/locale
-			/etc/default/aufs
 			/etc/protocols
 			/etc/services
 			/etc/networks
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
index ec489fd1..a8a8c1b3 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
@@ -1,4 +1,6 @@
+pinfo "If aufs install fails, run zypper addrepo http://jftp.inai.de/openSUSE_12.3/ j.eng-i586"
 REQUIRED_DEPENDENCIES="nfs-client aufs squashfs"
+REQUIRED_PACKAGES="timezone"
 REQUIRED_BINARIES="	bash
 			agetty
 			cat
@@ -47,8 +49,6 @@ REQUIRED_FILES="	/etc/environment
 			/etc/login.defs
 			/etc/nsswitch.conf
 			/etc/securetty
-			/etc/default/locale
-			/etc/default/aufs
 			/etc/protocols
 			/etc/services
 			/etc/networks
diff --git a/remote/targets/stage3.2-opensuse/consolekit b/remote/targets/stage3.2-opensuse/consolekit
deleted file mode 120000
index 261968c7..00000000
--- a/remote/targets/stage3.2-opensuse/consolekit
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/consolekit
\ No newline at end of file