diff options
| author | Christian Rößler | 2016-11-04 15:59:25 +0100 |
|---|---|---|
| committer | Christian Rößler | 2016-11-04 15:59:25 +0100 |
| commit | 13a665d7317615b472a66ce08fe6c0d126cdea39 (patch) | |
| tree | d5fd4b5f9879f97b5032fc99951d6d3aafc7e7df /remote/modules/xorg/module.build | |
| parent | [run-virt] resolution scripts now detect first connected output device (not o... (diff) | |
| parent | [rfs-stage32] Run update-issue after setup_partitions for proper /tmp display (diff) | |
| download | tm-scripts-13a665d7317615b472a66ce08fe6c0d126cdea39.tar.gz tm-scripts-13a665d7317615b472a66ce08fe6c0d126cdea39.tar.xz tm-scripts-13a665d7317615b472a66ce08fe6c0d126cdea39.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/xorg/module.build')
| -rw-r--r-- | remote/modules/xorg/module.build | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/remote/modules/xorg/module.build b/remote/modules/xorg/module.build index 16e0bb5b..f7678f65 100644 --- a/remote/modules/xorg/module.build +++ b/remote/modules/xorg/module.build @@ -12,11 +12,17 @@ build() { tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}" # copy udev rules to correct location - [ -d "${MODULE_BUILD_DIR}/lib/udev" ] && mv "${MODULE_BUILD_DIR}/lib/udev" "${MODULE_BUILD_DIR}/usr/lib/" + if [ -d "${MODULE_BUILD_DIR}/lib/udev" ]; then + cp -r "${MODULE_BUILD_DIR}/lib/udev" "${MODULE_BUILD_DIR}/usr/lib/" + fi + if [ -d "${MODULE_BUILD_DIR}/etc/udev" ]; then + cp -r "${MODULE_BUILD_DIR}/etc/udev" "${MODULE_BUILD_DIR}/usr/lib/" + fi + rm -rf -- "${MODULE_BUILD_DIR}/lib/udev" "${MODULE_BUILD_DIR}/etc/udev" } post_copy() { mkdir -p "${TARGET_BUILD_DIR}/etc/X11" - [ ! -e ${TARGET_BUILD_DIR}/etc/X11/X ] && ln -s /usr/bin/Xorg ${TARGET_BUILD_DIR}/etc/X11/X + [ ! -e ${TARGET_BUILD_DIR}/etc/X11/X ] && ln -s /usr/bin/Xorg ${TARGET_BUILD_DIR}/etc/X11/X } |