ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-21 18:06:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dde_linux: move linux.port to legacy_linux.port

Browse Source 
This is prerequisite for the Linux update. All dependencies relying on
the 'linux' have been adjusted to use 'legacy_linux'.

Issue #5264
This commit is contained in:
Sebastian Sumpf 2024-06-26 20:27:09 +02:00 committed by Christian Helmuth
parent 3211a10573
commit 4a7a4cfac5
36 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/dde_linux/lib/import/import-virt_lx_emul.mk
View File

@ -1,6 +1,6 @@
LIBS += virt_linux_generated 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)),) ifeq ($(wildcard $(LX_SRC_DIR)),)
LX_SRC_DIR := $(call select_from_repositories,src/linux) LX_SRC_DIR := $(call select_from_repositories,src/linux)
endif endif

2
repos/dde_linux/lib/mk/virt_linux_generated.inc
View File

@ -1,6 +1,6 @@
CUSTOM_TARGET_DEPS := kernel_build.phony 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) PWD := $(shell pwd)
LX_MK_ARGS = ARCH=$(LINUX_ARCH) CROSS_COMPILE=$(CROSS_DEV_PREFIX) LX_MK_ARGS = ARCH=$(LINUX_ARCH) CROSS_COMPILE=$(CROSS_DEV_PREFIX)

2
repos/dde_linux/lib/mk/wifi.inc
View File

@ -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)),) ifeq ($(wildcard $(WIFI_DRV_DIR)),)
WIFI_DRV_DIR := $(call select_from_repositories,src/lib/wifi) WIFI_DRV_DIR := $(call select_from_repositories,src/lib/wifi)
endif endif

0
repos/dde_linux/patches/i915_irq.patch → repos/dde_linux/patches/legacy_i915_irq.patch
View File

0
repos/dde_linux/patches/iwlwifi_enable_irq_before_pnvm.patch → repos/dde_linux/patches/legacy_iwlwifi_enable_irq_before_pnvm.patch
View File

0
repos/dde_linux/patches/iwlwifi_limit_rx_bufs.patch → repos/dde_linux/patches/legacy_iwlwifi_limit_rx_bufs.patch
View File

0
repos/dde_linux/patches/lxip_checksum_32.patch → repos/dde_linux/patches/legacy_lxip_checksum_32.patch
View File

0
repos/dde_linux/patches/lxip_ip_config.patch → repos/dde_linux/patches/legacy_lxip_ip_config.patch
View File

0
repos/dde_linux/patches/usb_host_devio_sg.patch → repos/dde_linux/patches/legacy_usb_host_devio_sg.patch
View File

0
repos/dde_linux/patches/usb_net_cdc_ncm.patch → repos/dde_linux/patches/legacy_usb_net_cdc_ncm.patch
View File

0
repos/dde_linux/patches/usb_net_pinephone.patch → repos/dde_linux/patches/legacy_usb_net_pinephone.patch
View File

0
repos/dde_linux/patches/usb_net_smsc95xx.patch → repos/dde_linux/patches/legacy_usb_net_smsc95xx.patch
View File

0
repos/dde_linux/patches/workqueue_deadlock.patch → repos/dde_linux/patches/legacy_workqueue_deadlock.patch
View File

1
repos/dde_linux/ports/legacy_linux.hash Normal file
View File

@ -0,0 +1 @@
e22e95d6d3d52a8da64cfdb7fddd2bc379e35358

30
repos/dde_linux/ports/legacy_linux.port Normal file
View File

@ -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)}

1
repos/dde_linux/ports/linux.hash
View File

@ -1 +0,0 @@
d8c12b28a8ba8bddc3b0d12c2e3cb369fdfd5c75

30
repos/dde_linux/ports/linux.port
View File

@ -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)}

2
repos/dde_linux/recipes/api/virt_linux/content.mk
View File

@ -36,7 +36,7 @@ $(MIRRORED_FROM_REP_DIR):
# Content from the Linux source tree # 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_REL_DIR := src/linux
LX_ABS_DIR := $(addsuffix /$(LX_REL_DIR),$(PORT_DIR)) LX_ABS_DIR := $(addsuffix /$(LX_REL_DIR),$(PORT_DIR))

2
repos/dde_linux/recipes/src/usb_hid/content.mk
View File

@ -4,7 +4,7 @@ content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR): $(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 content: LICENSE
LICENSE: LICENSE:

2
repos/dde_linux/recipes/src/usb_net/content.mk
View File

@ -4,7 +4,7 @@ content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR): $(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 content: LICENSE
LICENSE: LICENSE:

2
repos/dde_linux/recipes/src/vfs_lxip/content.mk
View File

@ -11,7 +11,7 @@ content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR): $(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 content: LICENSE
LICENSE: LICENSE:

2
repos/dde_linux/src/test/driver_time/target.inc
View File

@ -10,7 +10,7 @@ SRC_CC += lx_emul/random.cc
vpath %.c $(PRG_DIR)/../.. vpath %.c $(PRG_DIR)/../..
vpath %.cc $(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)),) ifeq ($(wildcard $(LX_SRC_DIR)),)
LX_SRC_DIR := $(call select_from_repositories,src/linux) LX_SRC_DIR := $(call select_from_repositories,src/linux)
endif endif

2
repos/dde_linux/src/virt_linux/arm_v6/target.mk
View File

@ -3,7 +3,7 @@ REQUIRES := arm_v6
CUSTOM_TARGET_DEPS := kernel_build.phony 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) PWD := $(shell pwd)
# options for Linux kernel build to not depend on current time, user and host # options for Linux kernel build to not depend on current time, user and host

2
repos/dde_linux/src/virt_linux/arm_v7/target.mk
View File

@ -3,7 +3,7 @@ REQUIRES := arm_v7
CUSTOM_TARGET_DEPS := kernel_build.phony 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) PWD := $(shell pwd)
# options for Linux kernel build to not depend on current time, user and host # options for Linux kernel build to not depend on current time, user and host

2
repos/dde_linux/src/virt_linux/arm_v8/target.mk
View File

@ -3,7 +3,7 @@ REQUIRES := arm_v8
CUSTOM_TARGET_DEPS := kernel_build.phony 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) PWD := $(shell pwd)
# options for Linux kernel build to not depend on current time, user and host # options for Linux kernel build to not depend on current time, user and host

2
repos/dde_linux/src/virt_linux/x86_32/target.mk
View File

@ -3,7 +3,7 @@ REQUIRES := x86_32
CUSTOM_TARGET_DEPS := kernel_build.phony 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) PWD := $(shell pwd)
# options for Linux kernel build to not depend on current time, user and host # options for Linux kernel build to not depend on current time, user and host

2
repos/dde_linux/src/virt_linux/x86_64/target.mk
View File

@ -3,7 +3,7 @@ REQUIRES := x86_64
CUSTOM_TARGET_DEPS := kernel_build.phony 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) PWD := $(shell pwd)
# options for Linux kernel build to not depend on current time, user and host # options for Linux kernel build to not depend on current time, user and host

2
repos/pc/lib/import/import-pc_lx_emul.mk
View File

@ -1,6 +1,6 @@
LIBS += pc_linux_generated 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)),) ifeq ($(wildcard $(LX_SRC_DIR)),)
LX_SRC_DIR := $(call select_from_repositories,src/linux) LX_SRC_DIR := $(call select_from_repositories,src/linux)
endif endif

2
repos/pc/lib/mk/pc_linux_generated.inc
View File

@ -1,6 +1,6 @@
CUSTOM_TARGET_DEPS := kernel_build.phony 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) PWD := $(shell pwd)
LX_MK_ARGS = ARCH=$(LINUX_ARCH) CROSS_COMPILE=$(CROSS_DEV_PREFIX) LX_MK_ARGS = ARCH=$(LINUX_ARCH) CROSS_COMPILE=$(CROSS_DEV_PREFIX)

2
repos/pc/recipes/api/pc_linux/content.mk
View File

@ -36,7 +36,7 @@ $(MIRRORED_FROM_REP_DIR):
# Content from the Linux source tree # 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_REL_DIR := src/linux
LX_ABS_DIR := $(addsuffix /$(LX_REL_DIR),$(PORT_DIR)) LX_ABS_DIR := $(addsuffix /$(LX_REL_DIR),$(PORT_DIR))

2
repos/pc/recipes/src/pc_intel_fb/content.mk
View File

@ -4,7 +4,7 @@ MIRROR_FROM_REP_DIR := src/driver/framebuffer/intel/pc \
content: $(MIRROR_FROM_REP_DIR) 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):
$(mirror_from_rep_dir) $(mirror_from_rep_dir)

2
repos/pc/recipes/src/pc_nic/content.mk
View File

@ -13,7 +13,7 @@ $(MIRROR_FROM_REP_DIR):
# mkdir -p $(dir $@) # mkdir -p $(dir $@)
# cp -r $(GENODE_DIR)/repos/os/$@ $@ # 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 content: LICENSE
LICENSE: LICENSE:

2
repos/pc/recipes/src/pc_usb_host/content.mk
View File

@ -12,7 +12,7 @@ $(MIRROR_FROM_OS_DIR):
mkdir -p $(dir $@) mkdir -p $(dir $@)
cp -r $(GENODE_DIR)/repos/os/$@ $@ 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 content: LICENSE
LICENSE: LICENSE:

2
repos/pc/src/driver/framebuffer/intel/pc/target.inc
View File

@ -28,7 +28,7 @@ vpath %.cc $(REL_PRG_DIR)
vpath %.c $(REP_DIR)/src/lib/pc vpath %.c $(REP_DIR)/src/lib/pc
vpath %.cc $(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)),) ifeq ($(wildcard $(LX_SRC_DIR)),)
LX_SRC_DIR := $(call select_from_repositories,src/linux) LX_SRC_DIR := $(call select_from_repositories,src/linux)
endif endif

2
repos/pc/src/pc_linux/x86_32/target.mk
View File

@ -3,7 +3,7 @@ REQUIRES := x86_32
CUSTOM_TARGET_DEPS := kernel_build.phony 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) PWD := $(shell pwd)
# options for Linux kernel build to not depend on current time, user and host # options for Linux kernel build to not depend on current time, user and host

2
repos/pc/src/pc_linux/x86_64/target.mk
View File

@ -3,7 +3,7 @@ REQUIRES := x86_64
CUSTOM_TARGET_DEPS := kernel_build.phony 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) PWD := $(shell pwd)
# options for Linux kernel build to not depend on current time, user and host # options for Linux kernel build to not depend on current time, user and host