From 7300eb14210c373480ee73f142970f0d77f205c9 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 13 Jun 2013 13:56:37 +0200
Subject: [kernel] fix copying firmware

---
 helper/kernel.inc | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/helper/kernel.inc b/helper/kernel.inc
index 70294357..a5989b15 100644
--- a/helper/kernel.inc
+++ b/helper/kernel.inc
@@ -151,9 +151,13 @@ copy_firmware() {
 
 	# post-process to fix the path of the firmwares found on the system unter /lib/firmware/$(uname -r)
 	# which have to be copied to /lib/firmware/${KERNEL_NEW_VERSION}
-	mkdir -p "${TARGET_BUILD_DIR}/lib/firmware/${KERNEL_NEW_VERSION}/"
-	mv "${TARGET_BUILD_DIR}/lib/firmware/${KERNEL_VERSION}/"* "${TARGET_BUILD_DIR}/lib/firmware/${KERNEL_NEW_VERSION}/"
-	rmdir "${TARGET_BUILD_DIR}/lib/firmware/${KERNEL_VERSION}/" || perror "something went very wrong..."
+	if [ -d "${TARGET_BUILD_DIR}/lib/firmware/${KERNEL_VERSION}" ]; then
+		mkdir -p "${TARGET_BUILD_DIR}/lib/firmware/${KERNEL_NEW_VERSION}/"
+		mv "${TARGET_BUILD_DIR}/lib/firmware/${KERNEL_VERSION}/"* "${TARGET_BUILD_DIR}/lib/firmware/${KERNEL_NEW_VERSION}/"
+		rmdir "${TARGET_BUILD_DIR}/lib/firmware/${KERNEL_VERSION}/" || perror "something went very wrong..."
+	else
+		pdebug "No ${TARGET_BUILD_DIR}/lib/firmware/${KERNEL_VERSION} directory, skipping the merge."
+	fi
 
 	cd - >/dev/null
 }
-- 
cgit v1.2.3-55-g7522


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