diff options
| author | Jonathan Bauer | 2013-06-13 14:23:42 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2013-06-13 14:23:42 +0200 |
| commit | 876012964f5dfbe67e04f3b4c184083f1c6442b0 (patch) | |
| tree | e2db566dc770e0238486a54574a316616fb773b8 | |
| parent | [kdm] blacklist libGL.so.1 to prevent that if proprietary drivers are install... (diff) | |
| parent | [ConsoleKit] KDM can't live without ConsoleKit... Maybe look into lightdm aga... (diff) | |
| download | tm-scripts-876012964f5dfbe67e04f3b4c184083f1c6442b0.tar.gz tm-scripts-876012964f5dfbe67e04f3b4c184083f1c6442b0.tar.xz tm-scripts-876012964f5dfbe67e04f3b4c184083f1c6442b0.zip | |
Merge branch 'master' of git:openslx-ng/tm-scripts
| -rw-r--r-- | helper/kernel.inc | 10 | ||||
| -rw-r--r-- | remote/modules/xorg/xorg.build | 4 | ||||
| l--------- | remote/targets/stage32/consolekit | 1 |
3 files changed, 11 insertions, 4 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 } 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() { 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 |