diff options
| -rwxr-xr-x | core/bin/setup_target | 2 | ||||
| -rw-r--r-- | core/includes/packagemanager.inc | 2 | ||||
| -rw-r--r-- | core/modules/xorg/module.build | 7 |
3 files changed, 4 insertions, 7 deletions
diff --git a/core/bin/setup_target b/core/bin/setup_target index 8574ceae..9022c732 100755 --- a/core/bin/setup_target +++ b/core/bin/setup_target @@ -538,7 +538,7 @@ process_module() { if [ ! -e "$BUILD_FLAG" ]; then list_packet_files > "$PKG_CONTENT_FILE" || perror "Could not write packet content list to $PKG_CONTENT_FILE" # Copy all required packages' contents to build dir, but not in install mode - if [ -z "$MLTK_INSTALL" ]; then + if [ -z "$MLTK_INSTALL" ] && [ -s "$PKG_CONTENT_FILE" ]; then pinfo "## Copying required packages to build dir" tarcopy "$( sort -u "$PKG_CONTENT_FILE" )" "${MODULE_BUILD_DIR}" fi diff --git a/core/includes/packagemanager.inc b/core/includes/packagemanager.inc index a196748b..864366eb 100644 --- a/core/includes/packagemanager.inc +++ b/core/includes/packagemanager.inc @@ -15,7 +15,7 @@ list_content_packages() { if [ -z "$REQUIRED_CONTENT_PACKAGES" ]; then - pinfo "No required packages for $TOOL" + pinfo "No required packages for $MODULE" return 0 fi [ $# -gt 2 ] && perror "'list_content_packages' accepts only 1 or no args. $# given." diff --git a/core/modules/xorg/module.build b/core/modules/xorg/module.build index bb6be5ba..3e730932 100644 --- a/core/modules/xorg/module.build +++ b/core/modules/xorg/module.build @@ -16,13 +16,10 @@ fetch_source() { build() { # copy udev rules to correct location - 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/" + cp -r "${MODULE_BUILD_DIR}/etc/udev" "${MODULE_BUILD_DIR}/lib/" fi - rm -rf -- "${MODULE_BUILD_DIR}/lib/udev" "${MODULE_BUILD_DIR}/etc/udev" + rm -rf -- "${MODULE_BUILD_DIR}/etc/udev" # This used to freeze/crashe X with certain gfx cards (radeon R240) # /usr/lib/xorg/modules/libglamoregl.so |