From a24ce9c9fdbcbfd798913e2804965bfb81f59a2e Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 27 Apr 2018 08:53:40 +0200 Subject: [PATCH] xorg-server: fix xorg.conf installation from project/device dir find_file_path has to be put into an if, otherwise its return code (which is usually 1) will leak into post_makeinstall_target Signed-off-by: Matthias Reichl --- packages/x11/xserver/xorg-server/package.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/x11/xserver/xorg-server/package.mk b/packages/x11/xserver/xorg-server/package.mk index 55d60e6a1f..aa4060beac 100644 --- a/packages/x11/xserver/xorg-server/package.mk +++ b/packages/x11/xserver/xorg-server/package.mk @@ -156,8 +156,9 @@ post_makeinstall_target() { fi mkdir -p $INSTALL/etc/X11 - find_file_path config/xorg.conf && + if find_file_path config/xorg.conf ; then cp $FOUND_PATH $INSTALL/etc/X11 + fi if [ ! "$DEVTOOLS" = yes ]; then rm -rf $INSTALL/usr/bin/cvt