From 2d845f15fcb61bb35684f31dffc0d02ab6dbb847 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Thu, 13 Jun 2013 12:26:41 +0200 Subject: Revert "[xorg] udev rules are copied to correct location now" This breaks building on SUSE, also duplicates files in target. This reverts commit 4eb0bb893fa57c3ddd7af7f529a98e0c96456a75. --- remote/modules/xorg/xorg.build | 4 ---- remote/modules/xorg/xorg.conf | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/remote/modules/xorg/xorg.build b/remote/modules/xorg/xorg.build index 976f4615..5b1b0847 100644 --- a/remote/modules/xorg/xorg.build +++ b/remote/modules/xorg/xorg.build @@ -16,9 +16,5 @@ build() { 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 - #copy udev rules to correct location - cd "${MODULE_BUILD_DIR}" - tarcopy "lib/udev" "${TARGET_BUILD_DIR}/usr/" - cd - >/dev/null } diff --git a/remote/modules/xorg/xorg.conf b/remote/modules/xorg/xorg.conf index 50eec4c8..81b5530b 100644 --- a/remote/modules/xorg/xorg.conf +++ b/remote/modules/xorg/xorg.conf @@ -40,6 +40,7 @@ REQUIRED_BINARIES=" Xorg xkbbell xkbevd vmmouse_detect" -REQUIRED_DIRECTORIES=" /usr/lib +REQUIRED_DIRECTORIES=" /lib/udev + /usr/lib /usr/share/X11" REQUIRED_FILES="" -- cgit v1.2.3-55-g7522