From 4a7a4cfac5185ec34a809d259cfc0df0f9f3596a Mon Sep 17 00:00:00 2001 From: Sebastian Sumpf Date: Wed, 26 Jun 2024 20:27:09 +0200 Subject: [PATCH] dde_linux: move linux.port to legacy_linux.port This is prerequisite for the Linux update. All dependencies relying on the 'linux' have been adjusted to use 'legacy_linux'. Issue #5264 --- .../lib/import/import-virt_lx_emul.mk | 2 +- .../dde_linux/lib/mk/virt_linux_generated.inc | 2 +- repos/dde_linux/lib/mk/wifi.inc | 2 +- .../{i915_irq.patch => legacy_i915_irq.patch} | 0 ...gacy_iwlwifi_enable_irq_before_pnvm.patch} | 0 ...tch => legacy_iwlwifi_limit_rx_bufs.patch} | 0 ...32.patch => legacy_lxip_checksum_32.patch} | 0 ...nfig.patch => legacy_lxip_ip_config.patch} | 0 ...g.patch => legacy_usb_host_devio_sg.patch} | 0 ...ncm.patch => legacy_usb_net_cdc_ncm.patch} | 0 ...e.patch => legacy_usb_net_pinephone.patch} | 0 ...xx.patch => legacy_usb_net_smsc95xx.patch} | 0 ....patch => legacy_workqueue_deadlock.patch} | 0 repos/dde_linux/ports/legacy_linux.hash | 1 + repos/dde_linux/ports/legacy_linux.port | 30 +++++++++++++++++++ repos/dde_linux/ports/linux.hash | 1 - repos/dde_linux/ports/linux.port | 30 ------------------- .../recipes/api/virt_linux/content.mk | 2 +- .../dde_linux/recipes/src/usb_hid/content.mk | 2 +- .../dde_linux/recipes/src/usb_net/content.mk | 2 +- .../dde_linux/recipes/src/vfs_lxip/content.mk | 2 +- .../dde_linux/src/test/driver_time/target.inc | 2 +- .../dde_linux/src/virt_linux/arm_v6/target.mk | 2 +- .../dde_linux/src/virt_linux/arm_v7/target.mk | 2 +- .../dde_linux/src/virt_linux/arm_v8/target.mk | 2 +- .../dde_linux/src/virt_linux/x86_32/target.mk | 2 +- .../dde_linux/src/virt_linux/x86_64/target.mk | 2 +- repos/pc/lib/import/import-pc_lx_emul.mk | 2 +- repos/pc/lib/mk/pc_linux_generated.inc | 2 +- repos/pc/recipes/api/pc_linux/content.mk | 2 +- repos/pc/recipes/src/pc_intel_fb/content.mk | 2 +- repos/pc/recipes/src/pc_nic/content.mk | 2 +- repos/pc/recipes/src/pc_usb_host/content.mk | 2 +- .../driver/framebuffer/intel/pc/target.inc | 2 +- repos/pc/src/pc_linux/x86_32/target.mk | 2 +- repos/pc/src/pc_linux/x86_64/target.mk | 2 +- 36 files changed, 53 insertions(+), 53 deletions(-) rename repos/dde_linux/patches/{i915_irq.patch => legacy_i915_irq.patch} (100%) rename repos/dde_linux/patches/{iwlwifi_enable_irq_before_pnvm.patch => legacy_iwlwifi_enable_irq_before_pnvm.patch} (100%) rename repos/dde_linux/patches/{iwlwifi_limit_rx_bufs.patch => legacy_iwlwifi_limit_rx_bufs.patch} (100%) rename repos/dde_linux/patches/{lxip_checksum_32.patch => legacy_lxip_checksum_32.patch} (100%) rename repos/dde_linux/patches/{lxip_ip_config.patch => legacy_lxip_ip_config.patch} (100%) rename repos/dde_linux/patches/{usb_host_devio_sg.patch => legacy_usb_host_devio_sg.patch} (100%) rename repos/dde_linux/patches/{usb_net_cdc_ncm.patch => legacy_usb_net_cdc_ncm.patch} (100%) rename repos/dde_linux/patches/{usb_net_pinephone.patch => legacy_usb_net_pinephone.patch} (100%) rename repos/dde_linux/patches/{usb_net_smsc95xx.patch => legacy_usb_net_smsc95xx.patch} (100%) rename repos/dde_linux/patches/{workqueue_deadlock.patch => legacy_workqueue_deadlock.patch} (100%) create mode 100644 repos/dde_linux/ports/legacy_linux.hash create mode 100644 repos/dde_linux/ports/legacy_linux.port delete mode 100644 repos/dde_linux/ports/linux.hash delete mode 100644 repos/dde_linux/ports/linux.port diff --git a/repos/dde_linux/lib/import/import-virt_lx_emul.mk b/repos/dde_linux/lib/import/import-virt_lx_emul.mk index a06f12e756..bc5a953294 100644 --- a/repos/dde_linux/lib/import/import-virt_lx_emul.mk +++ b/repos/dde_linux/lib/import/import-virt_lx_emul.mk @@ -1,6 +1,6 @@ LIBS += virt_linux_generated -LX_SRC_DIR := $(call select_from_ports,linux)/src/linux +LX_SRC_DIR := $(call select_from_ports,legacy_linux)/src/linux ifeq ($(wildcard $(LX_SRC_DIR)),) LX_SRC_DIR := $(call select_from_repositories,src/linux) endif diff --git a/repos/dde_linux/lib/mk/virt_linux_generated.inc b/repos/dde_linux/lib/mk/virt_linux_generated.inc index e5beb64f55..b9ff8b9326 100644 --- a/repos/dde_linux/lib/mk/virt_linux_generated.inc +++ b/repos/dde_linux/lib/mk/virt_linux_generated.inc @@ -1,6 +1,6 @@ CUSTOM_TARGET_DEPS := kernel_build.phony -LX_DIR := $(call select_from_ports,linux)/src/linux +LX_DIR := $(call select_from_ports,legacy_linux)/src/linux PWD := $(shell pwd) LX_MK_ARGS = ARCH=$(LINUX_ARCH) CROSS_COMPILE=$(CROSS_DEV_PREFIX) diff --git a/repos/dde_linux/lib/mk/wifi.inc b/repos/dde_linux/lib/mk/wifi.inc index f7e99badae..5b1b970f4f 100644 --- a/repos/dde_linux/lib/mk/wifi.inc +++ b/repos/dde_linux/lib/mk/wifi.inc @@ -1,4 +1,4 @@ -WIFI_DRV_DIR := $(call select_from_ports,linux)/src/lib/wifi +WIFI_DRV_DIR := $(call select_from_ports,legacy_linux)/src/lib/wifi ifeq ($(wildcard $(WIFI_DRV_DIR)),) WIFI_DRV_DIR := $(call select_from_repositories,src/lib/wifi) endif diff --git a/repos/dde_linux/patches/i915_irq.patch b/repos/dde_linux/patches/legacy_i915_irq.patch similarity index 100% rename from repos/dde_linux/patches/i915_irq.patch rename to repos/dde_linux/patches/legacy_i915_irq.patch diff --git a/repos/dde_linux/patches/iwlwifi_enable_irq_before_pnvm.patch b/repos/dde_linux/patches/legacy_iwlwifi_enable_irq_before_pnvm.patch similarity index 100% rename from repos/dde_linux/patches/iwlwifi_enable_irq_before_pnvm.patch rename to repos/dde_linux/patches/legacy_iwlwifi_enable_irq_before_pnvm.patch diff --git a/repos/dde_linux/patches/iwlwifi_limit_rx_bufs.patch b/repos/dde_linux/patches/legacy_iwlwifi_limit_rx_bufs.patch similarity index 100% rename from repos/dde_linux/patches/iwlwifi_limit_rx_bufs.patch rename to repos/dde_linux/patches/legacy_iwlwifi_limit_rx_bufs.patch diff --git a/repos/dde_linux/patches/lxip_checksum_32.patch b/repos/dde_linux/patches/legacy_lxip_checksum_32.patch similarity index 100% rename from repos/dde_linux/patches/lxip_checksum_32.patch rename to repos/dde_linux/patches/legacy_lxip_checksum_32.patch diff --git a/repos/dde_linux/patches/lxip_ip_config.patch b/repos/dde_linux/patches/legacy_lxip_ip_config.patch similarity index 100% rename from repos/dde_linux/patches/lxip_ip_config.patch rename to repos/dde_linux/patches/legacy_lxip_ip_config.patch diff --git a/repos/dde_linux/patches/usb_host_devio_sg.patch b/repos/dde_linux/patches/legacy_usb_host_devio_sg.patch similarity index 100% rename from repos/dde_linux/patches/usb_host_devio_sg.patch rename to repos/dde_linux/patches/legacy_usb_host_devio_sg.patch diff --git a/repos/dde_linux/patches/usb_net_cdc_ncm.patch b/repos/dde_linux/patches/legacy_usb_net_cdc_ncm.patch similarity index 100% rename from repos/dde_linux/patches/usb_net_cdc_ncm.patch rename to repos/dde_linux/patches/legacy_usb_net_cdc_ncm.patch diff --git a/repos/dde_linux/patches/usb_net_pinephone.patch b/repos/dde_linux/patches/legacy_usb_net_pinephone.patch similarity index 100% rename from repos/dde_linux/patches/usb_net_pinephone.patch rename to repos/dde_linux/patches/legacy_usb_net_pinephone.patch diff --git a/repos/dde_linux/patches/usb_net_smsc95xx.patch b/repos/dde_linux/patches/legacy_usb_net_smsc95xx.patch similarity index 100% rename from repos/dde_linux/patches/usb_net_smsc95xx.patch rename to repos/dde_linux/patches/legacy_usb_net_smsc95xx.patch diff --git a/repos/dde_linux/patches/workqueue_deadlock.patch b/repos/dde_linux/patches/legacy_workqueue_deadlock.patch similarity index 100% rename from repos/dde_linux/patches/workqueue_deadlock.patch rename to repos/dde_linux/patches/legacy_workqueue_deadlock.patch diff --git a/repos/dde_linux/ports/legacy_linux.hash b/repos/dde_linux/ports/legacy_linux.hash new file mode 100644 index 0000000000..aaf16d7527 --- /dev/null +++ b/repos/dde_linux/ports/legacy_linux.hash @@ -0,0 +1 @@ +e22e95d6d3d52a8da64cfdb7fddd2bc379e35358 diff --git a/repos/dde_linux/ports/legacy_linux.port b/repos/dde_linux/ports/legacy_linux.port new file mode 100644 index 0000000000..2bc9ef2c16 --- /dev/null +++ b/repos/dde_linux/ports/legacy_linux.port @@ -0,0 +1,30 @@ +LICENSE := GPLv2 +VERSION := 6.1.20 +DOWNLOADS := linux.archive + +URL(linux) := https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-$(VERSION).tar.xz +SHA(linux) := 76322de8c01a3c63b42c4d1e9b9e7d1897ddb91276e10d73d1f9df3562f031f0 +DIR(linux) := src/linux + +# +# Patches +# +PATCH_FILES := legacy_i915_irq.patch \ + legacy_iwlwifi_enable_irq_before_pnvm.patch \ + legacy_iwlwifi_limit_rx_bufs.patch \ + legacy_usb_host_devio_sg.patch \ + legacy_lxip_checksum_32.patch \ + legacy_lxip_ip_config.patch \ + legacy_usb_net_pinephone.patch \ + legacy_usb_net_cdc_ncm.patch \ + legacy_usb_net_smsc95xx.patch \ + legacy_workqueue_deadlock.patch +PATCHES += $(addprefix patches/,$(PATCH_FILES)) + +PATCH_OPT(patches/legacy_i915_irq.patch) := -p1 -d${DIR(linux)} +PATCH_OPT(patches/legacy_lxip_checksum_32.patch) := -p1 -d${DIR(linux)} +PATCH_OPT(patches/legacy_lxip_ip_config.patch) := -p1 -d${DIR(linux)} +PATCH_OPT(patches/legacy_usb_net_pinephone.patch) := -p1 -d${DIR(linux)} +PATCH_OPT(patches/legacy_usb_net_cdc_ncm.patch) := -p1 -d${DIR(linux)} +PATCH_OPT(patches/legacy_usb_net_smsc95xx.patch) := -p1 -d${DIR(linux)} +PATCH_OPT(patches/legacy_workqueue_deadlock.patch) := -p1 -d${DIR(linux)} diff --git a/repos/dde_linux/ports/linux.hash b/repos/dde_linux/ports/linux.hash deleted file mode 100644 index 34e6e9eed9..0000000000 --- a/repos/dde_linux/ports/linux.hash +++ /dev/null @@ -1 +0,0 @@ -d8c12b28a8ba8bddc3b0d12c2e3cb369fdfd5c75 diff --git a/repos/dde_linux/ports/linux.port b/repos/dde_linux/ports/linux.port deleted file mode 100644 index a1016cce1f..0000000000 --- a/repos/dde_linux/ports/linux.port +++ /dev/null @@ -1,30 +0,0 @@ -LICENSE := GPLv2 -VERSION := 6.1.20 -DOWNLOADS := linux.archive - -URL(linux) := https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-$(VERSION).tar.xz -SHA(linux) := 76322de8c01a3c63b42c4d1e9b9e7d1897ddb91276e10d73d1f9df3562f031f0 -DIR(linux) := src/linux - -# -# Patches -# -PATCH_FILES := i915_irq.patch \ - iwlwifi_enable_irq_before_pnvm.patch \ - iwlwifi_limit_rx_bufs.patch \ - usb_host_devio_sg.patch \ - lxip_checksum_32.patch \ - lxip_ip_config.patch \ - usb_net_pinephone.patch \ - usb_net_cdc_ncm.patch \ - usb_net_smsc95xx.patch \ - workqueue_deadlock.patch -PATCHES += $(addprefix patches/,$(PATCH_FILES)) - -PATCH_OPT(patches/i915_irq.patch) := -p1 -d${DIR(linux)} -PATCH_OPT(patches/lxip_checksum_32.patch) := -p1 -d${DIR(linux)} -PATCH_OPT(patches/lxip_ip_config.patch) := -p1 -d${DIR(linux)} -PATCH_OPT(patches/usb_net_pinephone.patch) := -p1 -d${DIR(linux)} -PATCH_OPT(patches/usb_net_cdc_ncm.patch) := -p1 -d${DIR(linux)} -PATCH_OPT(patches/usb_net_smsc95xx.patch) := -p1 -d${DIR(linux)} -PATCH_OPT(patches/workqueue_deadlock.patch) := -p1 -d${DIR(linux)} diff --git a/repos/dde_linux/recipes/api/virt_linux/content.mk b/repos/dde_linux/recipes/api/virt_linux/content.mk index 29e27da5e2..98d1ca0c97 100644 --- a/repos/dde_linux/recipes/api/virt_linux/content.mk +++ b/repos/dde_linux/recipes/api/virt_linux/content.mk @@ -36,7 +36,7 @@ $(MIRRORED_FROM_REP_DIR): # Content from the Linux source tree # -PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/linux) +PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/legacy_linux) LX_REL_DIR := src/linux LX_ABS_DIR := $(addsuffix /$(LX_REL_DIR),$(PORT_DIR)) diff --git a/repos/dde_linux/recipes/src/usb_hid/content.mk b/repos/dde_linux/recipes/src/usb_hid/content.mk index ad75312935..d1d260ee26 100644 --- a/repos/dde_linux/recipes/src/usb_hid/content.mk +++ b/repos/dde_linux/recipes/src/usb_hid/content.mk @@ -4,7 +4,7 @@ content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_REP_DIR): $(mirror_from_rep_dir) -PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/linux) +PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/legacy_linux) content: LICENSE LICENSE: diff --git a/repos/dde_linux/recipes/src/usb_net/content.mk b/repos/dde_linux/recipes/src/usb_net/content.mk index 21135806b1..048cc128bd 100644 --- a/repos/dde_linux/recipes/src/usb_net/content.mk +++ b/repos/dde_linux/recipes/src/usb_net/content.mk @@ -4,7 +4,7 @@ content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_REP_DIR): $(mirror_from_rep_dir) -PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/linux) +PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/legacy_linux) content: LICENSE LICENSE: diff --git a/repos/dde_linux/recipes/src/vfs_lxip/content.mk b/repos/dde_linux/recipes/src/vfs_lxip/content.mk index e90ef5e264..466039e6f0 100644 --- a/repos/dde_linux/recipes/src/vfs_lxip/content.mk +++ b/repos/dde_linux/recipes/src/vfs_lxip/content.mk @@ -11,7 +11,7 @@ content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_REP_DIR): $(mirror_from_rep_dir) -PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/linux) +PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/legacy_linux) content: LICENSE LICENSE: diff --git a/repos/dde_linux/src/test/driver_time/target.inc b/repos/dde_linux/src/test/driver_time/target.inc index 64646f01a9..d5879a1aa6 100644 --- a/repos/dde_linux/src/test/driver_time/target.inc +++ b/repos/dde_linux/src/test/driver_time/target.inc @@ -10,7 +10,7 @@ SRC_CC += lx_emul/random.cc vpath %.c $(PRG_DIR)/../.. vpath %.cc $(PRG_DIR)/../.. -LX_SRC_DIR := $(call select_from_ports,linux)/src/linux +LX_SRC_DIR := $(call select_from_ports,legacy_linux)/src/linux ifeq ($(wildcard $(LX_SRC_DIR)),) LX_SRC_DIR := $(call select_from_repositories,src/linux) endif diff --git a/repos/dde_linux/src/virt_linux/arm_v6/target.mk b/repos/dde_linux/src/virt_linux/arm_v6/target.mk index 2afd1af11d..0935aada33 100644 --- a/repos/dde_linux/src/virt_linux/arm_v6/target.mk +++ b/repos/dde_linux/src/virt_linux/arm_v6/target.mk @@ -3,7 +3,7 @@ REQUIRES := arm_v6 CUSTOM_TARGET_DEPS := kernel_build.phony -LX_DIR := $(call select_from_ports,linux)/src/linux +LX_DIR := $(call select_from_ports,legacy_linux)/src/linux PWD := $(shell pwd) # options for Linux kernel build to not depend on current time, user and host diff --git a/repos/dde_linux/src/virt_linux/arm_v7/target.mk b/repos/dde_linux/src/virt_linux/arm_v7/target.mk index 10734fab4f..7b035ef88e 100644 --- a/repos/dde_linux/src/virt_linux/arm_v7/target.mk +++ b/repos/dde_linux/src/virt_linux/arm_v7/target.mk @@ -3,7 +3,7 @@ REQUIRES := arm_v7 CUSTOM_TARGET_DEPS := kernel_build.phony -LX_DIR := $(call select_from_ports,linux)/src/linux +LX_DIR := $(call select_from_ports,legacy_linux)/src/linux PWD := $(shell pwd) # options for Linux kernel build to not depend on current time, user and host diff --git a/repos/dde_linux/src/virt_linux/arm_v8/target.mk b/repos/dde_linux/src/virt_linux/arm_v8/target.mk index 82c25931bd..cbd8a5662a 100644 --- a/repos/dde_linux/src/virt_linux/arm_v8/target.mk +++ b/repos/dde_linux/src/virt_linux/arm_v8/target.mk @@ -3,7 +3,7 @@ REQUIRES := arm_v8 CUSTOM_TARGET_DEPS := kernel_build.phony -LX_DIR := $(call select_from_ports,linux)/src/linux +LX_DIR := $(call select_from_ports,legacy_linux)/src/linux PWD := $(shell pwd) # options for Linux kernel build to not depend on current time, user and host diff --git a/repos/dde_linux/src/virt_linux/x86_32/target.mk b/repos/dde_linux/src/virt_linux/x86_32/target.mk index 7c0436870e..b3a91bff18 100644 --- a/repos/dde_linux/src/virt_linux/x86_32/target.mk +++ b/repos/dde_linux/src/virt_linux/x86_32/target.mk @@ -3,7 +3,7 @@ REQUIRES := x86_32 CUSTOM_TARGET_DEPS := kernel_build.phony -LX_DIR := $(call select_from_ports,linux)/src/linux +LX_DIR := $(call select_from_ports,legacy_linux)/src/linux PWD := $(shell pwd) # options for Linux kernel build to not depend on current time, user and host diff --git a/repos/dde_linux/src/virt_linux/x86_64/target.mk b/repos/dde_linux/src/virt_linux/x86_64/target.mk index c07acd5681..2e57c62246 100644 --- a/repos/dde_linux/src/virt_linux/x86_64/target.mk +++ b/repos/dde_linux/src/virt_linux/x86_64/target.mk @@ -3,7 +3,7 @@ REQUIRES := x86_64 CUSTOM_TARGET_DEPS := kernel_build.phony -LX_DIR := $(call select_from_ports,linux)/src/linux +LX_DIR := $(call select_from_ports,legacy_linux)/src/linux PWD := $(shell pwd) # options for Linux kernel build to not depend on current time, user and host diff --git a/repos/pc/lib/import/import-pc_lx_emul.mk b/repos/pc/lib/import/import-pc_lx_emul.mk index 23a99fefc6..3b031e0bc7 100644 --- a/repos/pc/lib/import/import-pc_lx_emul.mk +++ b/repos/pc/lib/import/import-pc_lx_emul.mk @@ -1,6 +1,6 @@ LIBS += pc_linux_generated -LX_SRC_DIR := $(call select_from_ports,linux)/src/linux +LX_SRC_DIR := $(call select_from_ports,legacy_linux)/src/linux ifeq ($(wildcard $(LX_SRC_DIR)),) LX_SRC_DIR := $(call select_from_repositories,src/linux) endif diff --git a/repos/pc/lib/mk/pc_linux_generated.inc b/repos/pc/lib/mk/pc_linux_generated.inc index 46e6517db0..f440999ba0 100644 --- a/repos/pc/lib/mk/pc_linux_generated.inc +++ b/repos/pc/lib/mk/pc_linux_generated.inc @@ -1,6 +1,6 @@ CUSTOM_TARGET_DEPS := kernel_build.phony -LX_DIR := $(call select_from_ports,linux)/src/linux +LX_DIR := $(call select_from_ports,legacy_linux)/src/linux PWD := $(shell pwd) LX_MK_ARGS = ARCH=$(LINUX_ARCH) CROSS_COMPILE=$(CROSS_DEV_PREFIX) diff --git a/repos/pc/recipes/api/pc_linux/content.mk b/repos/pc/recipes/api/pc_linux/content.mk index 549bffd68d..2003209b7e 100644 --- a/repos/pc/recipes/api/pc_linux/content.mk +++ b/repos/pc/recipes/api/pc_linux/content.mk @@ -36,7 +36,7 @@ $(MIRRORED_FROM_REP_DIR): # Content from the Linux source tree # -PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/linux) +PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/legacy_linux) LX_REL_DIR := src/linux LX_ABS_DIR := $(addsuffix /$(LX_REL_DIR),$(PORT_DIR)) diff --git a/repos/pc/recipes/src/pc_intel_fb/content.mk b/repos/pc/recipes/src/pc_intel_fb/content.mk index a5ccba775b..7ece96a019 100644 --- a/repos/pc/recipes/src/pc_intel_fb/content.mk +++ b/repos/pc/recipes/src/pc_intel_fb/content.mk @@ -4,7 +4,7 @@ MIRROR_FROM_REP_DIR := src/driver/framebuffer/intel/pc \ content: $(MIRROR_FROM_REP_DIR) -PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/linux) +PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/legacy_linux) $(MIRROR_FROM_REP_DIR): $(mirror_from_rep_dir) diff --git a/repos/pc/recipes/src/pc_nic/content.mk b/repos/pc/recipes/src/pc_nic/content.mk index 5b097b8cdc..8fb79f5488 100644 --- a/repos/pc/recipes/src/pc_nic/content.mk +++ b/repos/pc/recipes/src/pc_nic/content.mk @@ -13,7 +13,7 @@ $(MIRROR_FROM_REP_DIR): # mkdir -p $(dir $@) # cp -r $(GENODE_DIR)/repos/os/$@ $@ -PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/linux) +PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/legacy_linux) content: LICENSE LICENSE: diff --git a/repos/pc/recipes/src/pc_usb_host/content.mk b/repos/pc/recipes/src/pc_usb_host/content.mk index 9ba7272d45..77e0c6b126 100644 --- a/repos/pc/recipes/src/pc_usb_host/content.mk +++ b/repos/pc/recipes/src/pc_usb_host/content.mk @@ -12,7 +12,7 @@ $(MIRROR_FROM_OS_DIR): mkdir -p $(dir $@) cp -r $(GENODE_DIR)/repos/os/$@ $@ -PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/linux) +PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/legacy_linux) content: LICENSE LICENSE: diff --git a/repos/pc/src/driver/framebuffer/intel/pc/target.inc b/repos/pc/src/driver/framebuffer/intel/pc/target.inc index 93004a960f..37ad1f9647 100644 --- a/repos/pc/src/driver/framebuffer/intel/pc/target.inc +++ b/repos/pc/src/driver/framebuffer/intel/pc/target.inc @@ -28,7 +28,7 @@ vpath %.cc $(REL_PRG_DIR) vpath %.c $(REP_DIR)/src/lib/pc vpath %.cc $(REP_DIR)/src/lib/pc -LX_SRC_DIR := $(call select_from_ports,linux)/src/linux +LX_SRC_DIR := $(call select_from_ports,legacy_linux)/src/linux ifeq ($(wildcard $(LX_SRC_DIR)),) LX_SRC_DIR := $(call select_from_repositories,src/linux) endif diff --git a/repos/pc/src/pc_linux/x86_32/target.mk b/repos/pc/src/pc_linux/x86_32/target.mk index f26c773999..5ec8116917 100644 --- a/repos/pc/src/pc_linux/x86_32/target.mk +++ b/repos/pc/src/pc_linux/x86_32/target.mk @@ -3,7 +3,7 @@ REQUIRES := x86_32 CUSTOM_TARGET_DEPS := kernel_build.phony -LX_DIR := $(call select_from_ports,linux)/src/linux +LX_DIR := $(call select_from_ports,legacy_linux)/src/linux PWD := $(shell pwd) # options for Linux kernel build to not depend on current time, user and host diff --git a/repos/pc/src/pc_linux/x86_64/target.mk b/repos/pc/src/pc_linux/x86_64/target.mk index 7e863fd559..5cae66e33f 100644 --- a/repos/pc/src/pc_linux/x86_64/target.mk +++ b/repos/pc/src/pc_linux/x86_64/target.mk @@ -3,7 +3,7 @@ REQUIRES := x86_64 CUSTOM_TARGET_DEPS := kernel_build.phony -LX_DIR := $(call select_from_ports,linux)/src/linux +LX_DIR := $(call select_from_ports,legacy_linux)/src/linux PWD := $(shell pwd) # options for Linux kernel build to not depend on current time, user and host