From 9ae4fc23716de1ac7fcdf1cf4daefa56378dcf5f Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Mon, 6 Mar 2023 07:28:40 +0100 Subject: [PATCH] dde_linux: explicitly list patch files Using wildcards for selecting patch files clashes with files from linux.port. --- repos/dde_linux/ports/dde_linux.hash | 2 +- repos/dde_linux/ports/dde_linux.port | 30 ++++++++++++++++++++++------ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/repos/dde_linux/ports/dde_linux.hash b/repos/dde_linux/ports/dde_linux.hash index c5b7b44a2b..0c4ce7250a 100644 --- a/repos/dde_linux/ports/dde_linux.hash +++ b/repos/dde_linux/ports/dde_linux.hash @@ -1 +1 @@ -f56657b5edae9fb069db1b5846bca4aebe7ce542 +503582cb329201899f651e5f4af15ab84325ac6d diff --git a/repos/dde_linux/ports/dde_linux.port b/repos/dde_linux/ports/dde_linux.port index 31219db3b9..67edb1314e 100644 --- a/repos/dde_linux/ports/dde_linux.port +++ b/repos/dde_linux/ports/dde_linux.port @@ -89,12 +89,30 @@ HASH_INPUT += $(REP_DIR)/fec.list # # Patches # -PATCHES += $(addprefix patches/,$(notdir $(wildcard $(REP_DIR)/patches/lxip*.patch))) -PATCHES += $(addprefix patches/,$(notdir $(wildcard $(REP_DIR)/patches/usb_host*.patch))) -PATCHES += $(addprefix patches/,$(notdir $(wildcard $(REP_DIR)/patches/usb*.patch))) -PATCHES += $(addprefix patches/,$(notdir $(wildcard $(REP_DIR)/patches/usb_modem*.patch))) -PATCHES += $(addprefix patches/,$(notdir $(wildcard $(REP_DIR)/patches/fec_*.patch))) -PATCHES += $(addprefix patches/,$(notdir $(wildcard $(REP_DIR)/patches/usb_hid*.patch))) +PATCHES += patches/fec_ndev_owner.patch +PATCHES += patches/fec_skbuff_cast.patch +PATCHES += patches/fec_tx_bounce_dma.patch +PATCHES += patches/fec_tx_sync_dma_write.patch +PATCHES += patches/lxip_icmp.patch +PATCHES += patches/lxip_ip_config.patch +PATCHES += patches/lxip_log2.patch +PATCHES += patches/lxip_netlink.patch +PATCHES += patches/lxip_request_sock.patch +PATCHES += patches/lxip_sk_wq.patch +PATCHES += patches/lxip_skbuff_cast.patch +PATCHES += patches/usb_hid_evdev.patch +PATCHES += patches/usb_hid_hid.patch +PATCHES += patches/usb_hid_input.patch +PATCHES += patches/usb_hid_usbhid.patch +PATCHES += patches/usb_hid_wacom_sys.patch +PATCHES += patches/usb_host_dwc_otg.patch +PATCHES += patches/usb_host_isoc_bei.patch +PATCHES += patches/usb_host_mem.patch +PATCHES += patches/usb_host_omap.patch +PATCHES += patches/usb_host_update_event_ring.patch +PATCHES += patches/usb_modem_skbuff_cast.patch +PATCHES += patches/usb_net_skbuff_cast.patch + #IP stack LXIP_OPT = -p1 -d$(SRC_DIR_LXIP)