From 88d1277c8286c88e7adb1fe0db5d1d0add90d2a2 Mon Sep 17 00:00:00 2001
From: Michael Neves
Date: Thu, 13 Jun 2013 14:05:58 +0200
Subject: Revert Revert '[xorg] udev rules are copied to correct location now'

---
 remote/modules/xorg/xorg.build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/remote/modules/xorg/xorg.build b/remote/modules/xorg/xorg.build
index 5b1b0847..16e0bb5b 100644
--- a/remote/modules/xorg/xorg.build
+++ b/remote/modules/xorg/xorg.build
@@ -10,7 +10,9 @@ build() {
 
 	list_packet_files >> "$COPYLIST"
 	tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
-	pdebug ....
+
+	# copy udev rules to correct location
+	[ -d "${MODULE_BUILD_DIR}/lib/udev" ] && mv "${MODULE_BUILD_DIR}/lib/udev" "${MODULE_BUILD_DIR}/usr/lib/"	
 }
 
 post_copy() {
-- 
cgit v1.2.3-55-g7522


From 786659881f05e6d76ae04c0ccb875b3ed65337ac Mon Sep 17 00:00:00 2001
From: Michael Neves
Date: Thu, 13 Jun 2013 14:16:33 +0200
Subject: [ConsoleKit] KDM can't live without ConsoleKit... Maybe look into
 lightdm again...

---
 remote/targets/stage32/consolekit | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 remote/targets/stage32/consolekit

diff --git a/remote/targets/stage32/consolekit b/remote/targets/stage32/consolekit
new file mode 120000
index 00000000..261968c7
--- /dev/null
+++ b/remote/targets/stage32/consolekit
@@ -0,0 +1 @@
+../../modules/consolekit
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522


From fe95e8cb05e2d761664958b354039ed28b58846a Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 13 Jun 2013 14:23:37 +0200
Subject: [kdm] blacklist libGL.so.1 to prevent that if proprietary drivers are
 installed, that libGL does not get copied

---
 remote/modules/kdm/kdm.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/remote/modules/kdm/kdm.conf b/remote/modules/kdm/kdm.conf
index dd054cc2..b716418c 100644
--- a/remote/modules/kdm/kdm.conf
+++ b/remote/modules/kdm/kdm.conf
@@ -30,4 +30,4 @@ REQUIRED_SYSTEM_FILES="	/usr/share/icons/oxygen/16x16/actions/system-reboot.png
 			/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
 			/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-R.ttf
 			/usr/share/icons/default/index.theme"
-REQUIRED_LDD_BLACKLIST="\|libQtWebKit"
+REQUIRED_LDD_BLACKLIST="\|libQtWebKit\|libGL"
-- 
cgit v1.2.3-55-g7522


From a39f240dae983bdb9e2ba081483f55e8dfdc2e43 Mon Sep 17 00:00:00 2001
From: Michael Neves
Date: Thu, 13 Jun 2013 15:13:38 +0200
Subject: [xorg] remove /lib/udev from config

---
 remote/modules/xorg/xorg.conf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/remote/modules/xorg/xorg.conf b/remote/modules/xorg/xorg.conf
index 81b5530b..50eec4c8 100644
--- a/remote/modules/xorg/xorg.conf
+++ b/remote/modules/xorg/xorg.conf
@@ -40,7 +40,6 @@ REQUIRED_BINARIES="	Xorg
 			xkbbell 
 			xkbevd 
 			vmmouse_detect"
-REQUIRED_DIRECTORIES="	/lib/udev 
-			/usr/lib 
+REQUIRED_DIRECTORIES="	/usr/lib 
 			/usr/share/X11"
 REQUIRED_FILES=""
-- 
cgit v1.2.3-55-g7522


From 958df63741a4927591aa4ac682b2075052a13a38 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 13 Jun 2013 15:27:48 +0200
Subject: [xorg] add pacakge libgl1-mesa-glx needed for libGL.so.1

---
 remote/modules/xorg/xorg.conf | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/remote/modules/xorg/xorg.conf b/remote/modules/xorg/xorg.conf
index 81b5530b..74d162e7 100644
--- a/remote/modules/xorg/xorg.conf
+++ b/remote/modules/xorg/xorg.conf
@@ -1,6 +1,7 @@
 REQUIRED_CONTENT_PACKAGES="	xserver-xorg
 			xserver-xorg-core
 			libgl1-mesa-dri
+			libgl1-mesa-glx
 			xkb-data
 			x11-xkb-utils
 			xserver-xorg-input-evdev
@@ -40,7 +41,8 @@ REQUIRED_BINARIES="	Xorg
 			xkbbell 
 			xkbevd 
 			vmmouse_detect"
-REQUIRED_DIRECTORIES="	/lib/udev 
+REQUIRED_DIRECTORIES="
 			/usr/lib 
-			/usr/share/X11"
+			/usr/share/X11
+"
 REQUIRED_FILES=""
-- 
cgit v1.2.3-55-g7522


From 24489511404cb9fd471fd3508d3021ec75fa00e1 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 13 Jun 2013 15:34:12 +0200
Subject: oops

---
 remote/modules/xorg/xorg.conf | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/remote/modules/xorg/xorg.conf b/remote/modules/xorg/xorg.conf
index a3e5e6a0..74d162e7 100644
--- a/remote/modules/xorg/xorg.conf
+++ b/remote/modules/xorg/xorg.conf
@@ -41,13 +41,8 @@ REQUIRED_BINARIES="	Xorg
 			xkbbell 
 			xkbevd 
 			vmmouse_detect"
-<<<<<<< HEAD
 REQUIRED_DIRECTORIES="
 			/usr/lib 
 			/usr/share/X11
 "
-=======
-REQUIRED_DIRECTORIES="	/usr/lib 
-			/usr/share/X11"
->>>>>>> a39f240dae983bdb9e2ba081483f55e8dfdc2e43
 REQUIRED_FILES=""
-- 
cgit v1.2.3-55-g7522


From b52a5106ab8a2a96b63392a283f6473d07b57daf Mon Sep 17 00:00:00 2001
From: Michael Neves
Date: Thu, 13 Jun 2013 15:58:25 +0200
Subject: [kdm] shutdown and reboot immediately

---
 remote/modules/kdm/data/etc/kde4/kdm/kdmrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/remote/modules/kdm/data/etc/kde4/kdm/kdmrc b/remote/modules/kdm/data/etc/kde4/kdm/kdmrc
index 3126f70d..26da07d2 100644
--- a/remote/modules/kdm/data/etc/kde4/kdm/kdmrc
+++ b/remote/modules/kdm/data/etc/kde4/kdm/kdmrc
@@ -32,8 +32,8 @@ PreselectUser=None
 UseAdminSession=false
 
 [Shutdown]
-HaltCmd=/usr/bin/systemctl poweroff
-RebootCmd=/usr/bin/systemctl reboot
+HaltCmd=/usr/bin/systemctl -ff poweroff
+RebootCmd=/usr/bin/systemctl -ff reboot
 
 [xdmcp]
 Enable=false
-- 
cgit v1.2.3-55-g7522


From d61ad95c7690155a18b2abd39bf8df37e9a02908 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 14 Jun 2013 13:32:45 +0200
Subject: ldconfig: Include system's default paths

---
 remote/rootfs/rootfs-stage31/rootfs-stage31.conf | 8 ++++----
 remote/setup_target                              | 7 ++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
index b493c370..47f77c0a 100644
--- a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
+++ b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
@@ -55,7 +55,7 @@ REQUIRED_FIRMWARE="     3com/
                         RTL8192SE/
                         rtl_nic/
                         tigon/"
-REQUIRED_FILES="        /etc/netconfig
-                        /etc/networks
-                        /etc/protocols
-                        /etc/services"
+REQUIRED_FILES="
+	/etc/protocols
+	/etc/services
+"
diff --git a/remote/setup_target b/remote/setup_target
index b0565550..54ed0cb0 100755
--- a/remote/setup_target
+++ b/remote/setup_target
@@ -314,7 +314,12 @@ post_process_target() {
 		rm -r "${TARGET_BUILD_DIR}/lib/systemd"
 	fi
 
-	ldconfig -r "${TARGET_BUILD_DIR}"
+	# figure out all relevant ld-paths
+	local LDTEMP="$TARGET_BUILD_DIR/ldconf-temp"
+	grep -h '^\s*/' /etc/ld.so.conf /etc/ld.so.conf.d/* > "$LDTEMP"
+	# TODO: Echo other stuff to $LDTEMP (but figure out if first or last match wins)
+	ldconfig -v -r "${TARGET_BUILD_DIR}" -f "/ldconf-temp"
+	unlink "$LDTEMP"
 
 }
 
-- 
cgit v1.2.3-55-g7522


From cf35ac015534781cc3abdee8e0114a4842d9543d Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 14 Jun 2013 17:04:38 +0200
Subject: [systemd] enable pam support (fixes pam_systemd.so missing)

---
 remote/modules/systemd/systemd.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build
index 027024cf..8f4081e3 100644
--- a/remote/modules/systemd/systemd.build
+++ b/remote/modules/systemd/systemd.build
@@ -21,7 +21,7 @@ build () {
 	pinfo "Building systemd"
 	cd "${MODULE_DIR}/src/$REQUIRED_VERSION"
 	pinfo "calling configure"
-	./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no --disable-nls --disable-microhttpd --disable-bootchart --disable-quotacheck --disable-hostnamed --disable-timedated --disable-localed --disable-coredump --disable-keymap --without-python --enable-blkid --enable-acl || perror "configure failed."
+	./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no --disable-nls --disable-microhttpd --disable-bootchart --disable-quotacheck --disable-hostnamed --disable-timedated --disable-localed --disable-coredump --disable-keymap --without-python --enable-blkid --enable-acl --enable-pam|| perror "configure failed."
 	pinfo "calling make"
 	make || perror "make failed."
 	pinfo "calling make install"
-- 
cgit v1.2.3-55-g7522


From bf735f4076f7703dee868346a76697c968fd4371 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 14 Jun 2013 17:51:12 +0200
Subject: [systemd] add missing pam header

---
 remote/modules/systemd/systemd.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/remote/modules/systemd/systemd.conf b/remote/modules/systemd/systemd.conf
index 2a81a5b9..fbe5cb8b 100644
--- a/remote/modules/systemd/systemd.conf
+++ b/remote/modules/systemd/systemd.conf
@@ -35,6 +35,7 @@ REQUIRED_INSTALLED_PACKAGES="
 			xsltproc
 			libblkid-dev
 			libacl1-dev
+			libpam-dev
 "
 REQUIRED_BINARIES="	hostnamectl
 			journalctl
-- 
cgit v1.2.3-55-g7522