[ptxdist] [PATCH 1/8] rules/xorg-driver-input-evdev.make: Use CROSS_LIB_DIR.

[ptxdist] [PATCH 1/8] rules/xorg-driver-input-evdev.make: Use CROSS_LIB_DIR.

[Christian Melki]

Let xorg-driver-input install libraries in CROSS_LIB_DIR.
---
 rules/xorg-driver-input-evdev.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/xorg-driver-input-evdev.make b/rules/xorg-driver-input-evdev.make
index 8937a5ae5..2049ea100 100644
--- a/rules/xorg-driver-input-evdev.make
+++ b/rules/xorg-driver-input-evdev.make
@@ -50,7 +50,7 @@ $(STATEDIR)/xorg-driver-input-evdev.targetinstall:
 	@$(call install_fixup, xorg-driver-input-evdev,DESCRIPTION,missing)
 
 	@$(call install_copy, xorg-driver-input-evdev, 0, 0, 0755, -, \
-		/usr/lib/xorg/modules/input/evdev_drv.so)
+		/usr/$(CROSS_LIB_DIR)/xorg/modules/input/evdev_drv.so)
 
 	@$(call install_finish, xorg-driver-input-evdev)
 
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 2/8] rules/xorg-driver-input-keyboard.make: Use CROSS_LIB_DIR.

[Christian Melki]

Let xorg-driver-input install libraries	in CROSS_LIB_DIR.
---
 rules/xorg-driver-input-keyboard.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/xorg-driver-input-keyboard.make b/rules/xorg-driver-input-keyboard.make
index fb2af0541..65b3a255f 100644
--- a/rules/xorg-driver-input-keyboard.make
+++ b/rules/xorg-driver-input-keyboard.make
@@ -46,7 +46,7 @@ $(STATEDIR)/xorg-driver-input-keyboard.targetinstall:
 	@$(call install_fixup, xorg-driver-input-keyboard,DESCRIPTION,missing)
 
 	@$(call install_copy, xorg-driver-input-keyboard, 0, 0, 0755, -, \
-		/usr/lib/xorg/modules/input/kbd_drv.so)
+		/usr/$(CROSS_LIB_DIR)/xorg/modules/input/kbd_drv.so)
 
 	@$(call install_finish, xorg-driver-input-keyboard)
 
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 3/8] rules/xorg-driver-input-mouse.make: Use CROSS_LIB_DIR.

[Christian Melki]

Let xorg-driver-input install libraries in CROSS_LIB_DIR.
---
 rules/xorg-driver-input-mouse.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/xorg-driver-input-mouse.make b/rules/xorg-driver-input-mouse.make
index 71f8c8d47..4db743669 100644
--- a/rules/xorg-driver-input-mouse.make
+++ b/rules/xorg-driver-input-mouse.make
@@ -50,7 +50,7 @@ $(STATEDIR)/xorg-driver-input-mouse.targetinstall:
 	@$(call install_fixup, xorg-driver-input-mouse,DESCRIPTION,missing)
 
 	@$(call install_copy, xorg-driver-input-mouse, 0, 0, 0755, -, \
-		/usr/lib/xorg/modules/input/mouse_drv.so)
+		/usr/$(CROSS_LIB_DIR)/xorg/modules/input/mouse_drv.so)
 
 	@$(call install_finish, xorg-driver-input-mouse)
 
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 4/8] rules/xorg-driver-input-tslib.make: Use CROSS_LIB_DIR.

[Christian Melki]

Let xorg-driver-input install libraries in CROSS_LIB_DIR.
---
 rules/xorg-driver-input-tslib.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/xorg-driver-input-tslib.make b/rules/xorg-driver-input-tslib.make
index f9874fc78..af229b3a4 100644
--- a/rules/xorg-driver-input-tslib.make
+++ b/rules/xorg-driver-input-tslib.make
@@ -48,7 +48,7 @@ $(STATEDIR)/xorg-driver-input-tslib.targetinstall:
 	@$(call install_fixup, xorg-driver-input-tslib,DESCRIPTION,missing)
 
 	@$(call install_copy, xorg-driver-input-tslib, 0, 0, 0755, -, \
-		/usr/lib/xorg/modules/input/tslib_drv.so)
+		/usr/$(CROSS_LIB_DIR)/xorg/modules/input/tslib_drv.so)
 
 	@$(call install_finish, xorg-driver-input-tslib)
 
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 5/8] rules/xorg-driver-input-void.make: Use CROSS_LIB_DIR.

[Christian Melki]

Let xorg-driver-input install libraries in CROSS_LIB_DIR.
---
 rules/xorg-driver-input-void.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/xorg-driver-input-void.make b/rules/xorg-driver-input-void.make
index 90fe87c13..1466083b7 100644
--- a/rules/xorg-driver-input-void.make
+++ b/rules/xorg-driver-input-void.make
@@ -46,7 +46,7 @@ $(STATEDIR)/xorg-driver-input-void.targetinstall:
 	@$(call install_fixup, xorg-driver-input-void,DESCRIPTION,missing)
 
 	@$(call install_copy, xorg-driver-input-void, 0, 0, 0755, -, \
-		/usr/lib/xorg/modules/input/void_drv.so)
+		/usr/$(CROSS_LIB_DIR)/xorg/modules/input/void_drv.so)
 
 	@$(call install_finish, xorg-driver-input-void)
 
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 6/8] rules/xorg-driver-video-vesa.make: Use CROSS_LIB_DIR.

[Christian Melki]

Let xorg-driver-video install libraries in CROSS_LIB_DIR.
---
 rules/xorg-driver-video-vesa.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/xorg-driver-video-vesa.make b/rules/xorg-driver-video-vesa.make
index 3e249fe76..ca702df05 100644
--- a/rules/xorg-driver-video-vesa.make
+++ b/rules/xorg-driver-video-vesa.make
@@ -45,7 +45,7 @@ $(STATEDIR)/xorg-driver-video-vesa.targetinstall:
 	@$(call install_fixup, xorg-driver-video-vesa,DESCRIPTION,missing)
 
 	@$(call install_copy, xorg-driver-video-vesa, 0, 0, 0755, -, \
-		/usr/lib/xorg/modules/drivers/vesa_drv.so)
+		/usr/$(CROSS_LIB_DIR)/xorg/modules/drivers/vesa_drv.so)
 
 	@$(call install_finish, xorg-driver-video-vesa)
 
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 7/8] rules/xorg-fonts.make: Use CROSS_LIB_DIR.

[Christian Melki]

Let xorg-fonts install libraries in CROSS_LIB_DIR.
---
 rules/xorg-fonts.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/xorg-fonts.make b/rules/xorg-fonts.make
index c6787875e..88e6873ab 100644
--- a/rules/xorg-fonts.make
+++ b/rules/xorg-fonts.make
@@ -82,7 +82,7 @@ ifdef PTXCONF_XORG_FONTS_QT4_LINKS
 		name=`basename $$file`; \
 		$(call install_link, xorg-fonts, \
 			../../..$(XORG_FONTDIR)/$$file, \
-			/usr/lib/fonts/$$name); \
+			/usr/$(CROSS_LIB_DIR)/fonts/$$name); \
 	done
 endif
 
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 8/8] rules/mesalib.make: Use CROSS_LIB_DIR.

[Christian Melki]

Let mesalib install various libraries in CROSS_LIB_DIR.
---
 rules/mesalib.make | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/rules/mesalib.make b/rules/mesalib.make
index 945b7c523..a1f92224b 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -123,12 +123,12 @@ MESALIB_CONF_OPT	:= \
 	-Dbuild-aco-tests=false \
 	-Dbuild-tests=false \
 	-Dcustom-shader-replacement= \
-	-Dd3d-drivers-path=/usr/lib/d3d \
+	-Dd3d-drivers-path=/usr/$(CROSS_LIB_DIR)/d3d \
 	-Ddatasources=auto \
 	-Ddraw-use-llvm=true \
 	-Ddri-drivers=$(subst $(space),$(comma),$(MESALIB_DRI_DRIVERS-y)) \
-	-Ddri-drivers-path=/usr/lib/dri \
-	-Ddri-search-path=/usr/lib/dri \
+	-Ddri-drivers-path=/usr/$(CROSS_LIB_DIR)/dri \
+	-Ddri-search-path=/usr/$(CROSS_LIB_DIR)/dri \
 	-Ddri3=$(call ptx/endis, PTXCONF_MESALIB_DRI3)d \
 	-Degl=$(call ptx/endis, PTXCONF_MESALIB_EGL)d \
 	-Degl-lib-suffix= \
@@ -161,7 +161,7 @@ MESALIB_CONF_OPT	:= \
 	-Dlmsensors=$(call ptx/endis, PTXCONF_MESALIB_LMSENSORS)d \
 	-Dmicrosoft-clc=disabled \
 	-Dmoltenvk-dir= \
-	-Domx-libs-path=/usr/lib/dri \
+	-Domx-libs-path=/usr/$(CROSS_LIB_DIR)/dri \
 	-Dopencl-native=false \
 	-Dopencl-spirv=false \
 	-Dopengl=$(call ptx/truefalse, PTXCONF_MESALIB_OPENGL) \
@@ -185,14 +185,14 @@ MESALIB_CONF_OPT	:= \
 	-Dstatic-libclc=[] \
 	-Dswr-arches=[] \
 	-Dtools=[] \
-	-Dva-libs-path=/usr/lib/dri \
+	-Dva-libs-path=/usr/$(CROSS_LIB_DIR)/dri \
 	-Dvalgrind=disabled \
-	-Dvdpau-libs-path=/usr/lib/vdpau \
+	-Dvdpau-libs-path=/usr/$(CROSS_LIB_DIR)/vdpau \
 	-Dvulkan-drivers=$(subst $(space),$(comma),$(MESALIB_VULKAN_DRIVERS-y)) \
 	-Dvulkan-icd-dir=/etc/vulkan/icd.d \
 	-Dvulkan-layers=$(subst $(space),$(comma),$(MESALIB_VULKAN_LAYERS-y)) \
 	-Dxlib-lease=$(call ptx/endis, PTXCONF_MESALIB_EGL_X11)d \
-	-Dxvmc-libs-path=/usr/lib \
+	-Dxvmc-libs-path=/usr/$(CROSS_LIB_DIR) \
 	-Dzlib=enabled \
 	-Dzstd=$(call ptx/endis, PTXCONF_MESALIB_SHADER_CACHE)d
 
@@ -221,22 +221,22 @@ $(STATEDIR)/mesalib.targetinstall:
 
 	@$(foreach lib, $(MESALIB_DRI_LIBS-y), \
 		$(call install_copy, mesalib, 0, 0, 0644, -, \
-		/usr/lib/dri/$(lib)_dri.so)$(ptx/nl))
+		/usr/$(CROSS_LIB_DIR)/dri/$(lib)_dri.so)$(ptx/nl))
 
 ifneq ($(strip $(MESALIB_DRI_GALLIUM_LIBS-y)),)
 	@$(call install_copy, mesalib, 0, 0, 0644, \
-		$(MESALIB_PKGDIR)/usr/lib/dri/$(firstword $(MESALIB_DRI_GALLIUM_LIBS-y))_dri.so, \
-		/usr/lib/dri/gallium_dri.so)
+		$(MESALIB_PKGDIR)/usr/$(CROSS_LIB_DIR)/dri/$(firstword $(MESALIB_DRI_GALLIUM_LIBS-y))_dri.so, \
+		/usr/$(CROSS_LIB_DIR)/dri/gallium_dri.so)
 
 	@$(foreach lib, $(MESALIB_DRI_GALLIUM_LIBS-y), \
 		$(call install_link, mesalib, gallium_dri.so, \
-		/usr/lib/dri/$(lib)_dri.so)$(ptx/nl))
+		/usr/$(CROSS_LIB_DIR)/dri/$(lib)_dri.so)$(ptx/nl))
 endif
 
 ifneq ($(strip $(MESALIB_VULKAN_LIBS-y)),)
 	@$(foreach lib, $(MESALIB_VULKAN_LIBS-y), \
 		$(call install_copy, mesalib, 0, 0, 0644, -, \
-		/usr/lib/libvulkan_$(lib).so)$(ptx/nl) \
+		/usr/$(CROSS_LIB_DIR)/libvulkan_$(lib).so)$(ptx/nl) \
 		$(call install_glob, mesalib, 0, 0, -, \
 		/etc/vulkan/icd.d, */$(lib)_icd.*.json)$(ptx/nl))
 endif
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 1/8] rules/xorg-driver-input-evdev.make: Use CROSS_LIB_DIR.

[Michael Olbrich]

On Wed, Sep 08, 2021 at 03:59:55PM +0200, Christian Melki wrote:
> Let xorg-driver-input install libraries in CROSS_LIB_DIR.

Please use the package name not the file name in the subject for patches
like this. This applies to all other patches as well.

> ---
>  rules/xorg-driver-input-evdev.make | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/rules/xorg-driver-input-evdev.make b/rules/xorg-driver-input-evdev.make
> index 8937a5ae5..2049ea100 100644
> --- a/rules/xorg-driver-input-evdev.make
> +++ b/rules/xorg-driver-input-evdev.make
> @@ -50,7 +50,7 @@ $(STATEDIR)/xorg-driver-input-evdev.targetinstall:
>  	@$(call install_fixup, xorg-driver-input-evdev,DESCRIPTION,missing)
>  
>  	@$(call install_copy, xorg-driver-input-evdev, 0, 0, 0755, -, \
> -		/usr/lib/xorg/modules/input/evdev_drv.so)
> +		/usr/$(CROSS_LIB_DIR)/xorg/modules/input/evdev_drv.so)

Convert this to used install_lib instead. That way, the libdir is used
correctly automatically. And I'm pretty sure that the file does not need to
be executable. So:

	@$(call install_lib, xorg-driver-input-evdev, 0, 0, 0644, \
		xorg/modules/input/evdev_drv)

The same applies to all the other xorg-driver-* patches as well.

Michael

>  
>  	@$(call install_finish, xorg-driver-input-evdev)
>  
> -- 
> 2.30.2
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de