From ce852b70f719c9bc1707838f7440e3b4019c6f69 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 22 Apr 2013 18:18:11 +0200
Subject: Fix xorg for openSUSE 12.3

---
 remote/modules/xorg/xorg.conf.zypper | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/remote/modules/xorg/xorg.conf.zypper b/remote/modules/xorg/xorg.conf.zypper
index d9259257..22a6bdd8 100644
--- a/remote/modules/xorg/xorg.conf.zypper
+++ b/remote/modules/xorg/xorg.conf.zypper
@@ -3,9 +3,25 @@ REQUIRED_PACKAGES="	xorg-x11
 			xorg-x11-driver-input
 			xorg-x11-driver-video
 			xorg-x11-driver-video-nouveau
+			xf86-video-vmware
+			xf86-video-ati
+			xf86-video-nv
+			xf86-video-intel
+			xf86-video-i128
+			xf86-video-geode
+			xf86-video-vesa
+			xf86-video-fbdev
+			xf86-video-modesetting
 			xf86-input-vmmouse
 			xf86-input-wacom
+			xf86-input-evdev
+			xf86-input-joystick
+			xf86-input-keyboard
+			xf86-input-mouse
+			xf86-input-synaptics
+			xf86-input-void
 			xkeyboard-config
+			xkbcomp
 			dejavu-fonts
 			kdm-branding-openSUSE"
 REQUIRED_BINARIES="	Xorg
@@ -20,6 +36,7 @@ REQUIRED_BINARIES="	Xorg
 			xkbevd 
 			vmmouse_detect"
 REQUIRED_DIRECTORIES="	/usr/lib 
+			/usr/bin
 			/usr/share/X11
 			/usr/share/fonts"
 REQUIRED_FILES="/var/adm/fillup-templates/sysconfig.displaymanager-kdm"
-- 
cgit v1.2.3-55-g7522


From 680a8cd722b9cd59fd9ac2520b131756e1823444 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 22 Apr 2013 19:24:48 +0200
Subject: "Fix" rsyslogd on suse (systemctl status still says it's not running
 when it really is) Might be broken on ubuntu now - the whole module is a mess
 really...

---
 remote/modules/rsyslogd/rsyslogd.build       | 30 ++++++++++------------------
 remote/modules/rsyslogd/rsyslogd.conf.zypper |  6 +++++-
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/remote/modules/rsyslogd/rsyslogd.build b/remote/modules/rsyslogd/rsyslogd.build
index 43aa112d..cee5c7ed 100644
--- a/remote/modules/rsyslogd/rsyslogd.build
+++ b/remote/modules/rsyslogd/rsyslogd.build
@@ -3,30 +3,22 @@ fetch_source() {
 }
 
 build() {
+	COPYLIST="list_dpkg_output"
+	[ -e "$COPYLIST" ] && rm "$COPYLIST"
 
-	FILELIST="list_binaries_and_files"
-	BIN_LOCATION=$(which rsyslogd)
-	if [ ! -z ${BIN_LOCATION} -a -e ${BIN_LOCATION} ];
-	then
-		get_link_chain "${BIN_LOCATION}" >> "${FILELIST}"
-	else
-		perror "${BIN} not found on the system! Please install it."
-		exit 1
-	fi
-
-	for ENTRY in ${REQUIRED_FILES} ${REQUIRED_DIRECTORIES}; do
-		get_link_chain "${ENTRY}" >> "${FILELIST}"
-	done
-	
-	tarcopy "$(cat ${FILELIST}|sort -u)" "${MODULE_BUILD_DIR}"
+	list_packet_files >> "$COPYLIST"
+	tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
 
+	return 0
 }
 
-post_copy() {	
+post_copy() {
+	# pwd = module's build dir
 	mkdir -p "${TARGET_BUILD_DIR}"/var/spool/rsyslog
-	
-	[ -e /lib/systemd/system/rsyslog.service ] \
-		&& cp /lib/systemd/system/rsyslog.service "${TARGET_BUILD_DIR}"/etc/systemd/system/
+
+	local RSL="$(find /usr/lib/ /lib/ -name rsyslog.service | head -1)"
+	[ -z "$RSL" -o ! -e "$RSL" ] && perror "rsyslog.service not found on vorlage"
+	cp -L "$RSL" "$TARGET_BUILD_DIR/etc/systemd/system/"
 	sed -i 's/\/bin\/systemctl/-\/usr\/bin\/systemctl/g' "${TARGET_BUILD_DIR}"/etc/systemd/system/rsyslog.service
 	sed -i 's/^Before=udev/#&/' "${TARGET_BUILD_DIR}"/etc/systemd/system/rsyslog.service
 	
diff --git a/remote/modules/rsyslogd/rsyslogd.conf.zypper b/remote/modules/rsyslogd/rsyslogd.conf.zypper
index e826768a..a70940e8 100644
--- a/remote/modules/rsyslogd/rsyslogd.conf.zypper
+++ b/remote/modules/rsyslogd/rsyslogd.conf.zypper
@@ -1,2 +1,6 @@
+REQUIRED_BINARIES="	rsyslogd
+			rsyslog-service-prepare"
+REQUIRED_PACKAGES="	rsyslog"
 REQUIRED_DIRECTORIES="	/etc/rsyslog.d
-			/usr/lib/rsyslog"
+			/usr/lib/rsyslog
+			/var/run"
-- 
cgit v1.2.3-55-g7522