From 8056811b4f23208373bccd302fe60faed6e47d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= Date: Mon, 28 Mar 2022 14:20:25 +0200 Subject: [PATCH] Rename wifi_drv to legacy_wifi_drv Issue #4455. --- ...t-wifi_include.mk => import-legacy_wifi_include.mk} | 4 ++-- repos/dde_linux/lib/mk/{wifi.inc => legacy_wifi.inc} | 6 +++--- .../lib/mk/{wifi_include.mk => legacy_wifi_include.mk} | 2 +- .../lib/mk/spec/x86_32/{wifi.mk => legacy_wifi.mk} | 2 +- .../lib/mk/spec/x86_64/{wifi.mk => legacy_wifi.mk} | 2 +- .../dde_linux/recipes/pkg/{wifi => legacy_wifi}/README | 0 .../recipes/pkg/{wifi => legacy_wifi}/archives | 4 ++-- repos/dde_linux/recipes/pkg/legacy_wifi/hash | 1 + .../recipes/pkg/{wifi => legacy_wifi}/runtime | 6 +++--- repos/dde_linux/recipes/pkg/wifi/hash | 1 - .../{wifi_firmware => legacy_wifi_firmware}/content.mk | 0 .../raw/{wifi_firmware => legacy_wifi_firmware}/hash | 0 .../src/{wifi_drv => legacy_wifi_drv}/content.mk | 10 +++++----- .../recipes/src/{wifi_drv => legacy_wifi_drv}/hash | 0 .../src/{wifi_drv => legacy_wifi_drv}/used_apis | 0 repos/dde_linux/run/{wifi.run => legacy_wifi.run} | 5 +++-- repos/dde_linux/run/nic_router_uplinks.run | 7 ++++--- repos/dde_linux/src/drivers/wifi/target.mk | 8 ++++---- repos/dde_linux/src/lib/{ => legacy}/wifi/dummies.cc | 0 .../dde_linux/src/lib/{ => legacy}/wifi/dummies_new.c | 0 repos/dde_linux/src/lib/{ => legacy}/wifi/firmware.cc | 0 .../src/lib/{ => legacy}/wifi/include/crc32table.h | 0 .../src/lib/{ => legacy}/wifi/include/firmware_list.h | 0 .../lib/{ => legacy}/wifi/include/linux/gen_stats.h | 0 .../lib/{ => legacy}/wifi/include/linux/hdlc/ioctl.h | 0 .../lib/{ => legacy}/wifi/include/linux/if_bridge.h | 0 .../lib/{ => legacy}/wifi/include/linux/if_packet.h | 0 .../lib/{ => legacy}/wifi/include/linux/neighbour.h | 0 .../src/lib/{ => legacy}/wifi/include/linux/nl80211.h | 0 .../src/lib/{ => legacy}/wifi/include/linux/sockios.h | 0 .../src/lib/{ => legacy}/wifi/include/lx_emul.h | 0 .../src/lib/{ => legacy}/wifi/include/net/protocol.h | 0 .../wifi/include/spec/x86_32/platform/platform.h | 0 .../wifi/include/spec/x86_64/platform/platform.h | 0 repos/dde_linux/src/lib/{ => legacy}/wifi/init.cc | 0 repos/dde_linux/src/lib/{ => legacy}/wifi/lx.h | 0 repos/dde_linux/src/lib/{ => legacy}/wifi/lxc.h | 0 repos/dde_linux/src/lib/{ => legacy}/wifi/lxc_emul.c | 0 repos/dde_linux/src/lib/{ => legacy}/wifi/lxcc_emul.cc | 0 repos/dde_linux/src/lib/{ => legacy}/wifi/nic.cc | 0 repos/dde_linux/src/lib/{ => legacy}/wifi/random.cc | 0 .../dde_linux/src/lib/{ => legacy}/wifi/socket_call.cc | 0 repos/dde_linux/src/lib/{ => legacy}/wifi/symbol.map | 0 repos/gems/src/app/sculpt_manager/runtime/wifi_drv.cc | 8 ++++++-- repos/ports/run/netperf.inc | 6 +++--- 45 files changed, 39 insertions(+), 33 deletions(-) rename repos/dde_linux/lib/import/{import-wifi_include.mk => import-legacy_wifi_include.mk} (87%) rename repos/dde_linux/lib/mk/{wifi.inc => legacy_wifi.inc} (95%) rename repos/dde_linux/lib/mk/{wifi_include.mk => legacy_wifi_include.mk} (94%) rename repos/dde_linux/lib/mk/spec/x86_32/{wifi.mk => legacy_wifi.mk} (82%) rename repos/dde_linux/lib/mk/spec/x86_64/{wifi.mk => legacy_wifi.mk} (82%) rename repos/dde_linux/recipes/pkg/{wifi => legacy_wifi}/README (100%) rename repos/dde_linux/recipes/pkg/{wifi => legacy_wifi}/archives (54%) create mode 100644 repos/dde_linux/recipes/pkg/legacy_wifi/hash rename repos/dde_linux/recipes/pkg/{wifi => legacy_wifi}/runtime (89%) delete mode 100644 repos/dde_linux/recipes/pkg/wifi/hash rename repos/dde_linux/recipes/raw/{wifi_firmware => legacy_wifi_firmware}/content.mk (100%) rename repos/dde_linux/recipes/raw/{wifi_firmware => legacy_wifi_firmware}/hash (100%) rename repos/dde_linux/recipes/src/{wifi_drv => legacy_wifi_drv}/content.mk (87%) rename repos/dde_linux/recipes/src/{wifi_drv => legacy_wifi_drv}/hash (100%) rename repos/dde_linux/recipes/src/{wifi_drv => legacy_wifi_drv}/used_apis (100%) rename repos/dde_linux/run/{wifi.run => legacy_wifi.run} (98%) rename repos/dde_linux/src/lib/{ => legacy}/wifi/dummies.cc (100%) rename repos/dde_linux/src/lib/{ => legacy}/wifi/dummies_new.c (100%) rename repos/dde_linux/src/lib/{ => legacy}/wifi/firmware.cc (100%) rename repos/dde_linux/src/lib/{ => legacy}/wifi/include/crc32table.h (100%) rename repos/dde_linux/src/lib/{ => legacy}/wifi/include/firmware_list.h (100%) rename repos/dde_linux/src/lib/{ => legacy}/wifi/include/linux/gen_stats.h (100%) rename repos/dde_linux/src/lib/{ => legacy}/wifi/include/linux/hdlc/ioctl.h (100%) rename repos/dde_linux/src/lib/{ => legacy}/wifi/include/linux/if_bridge.h (100%) rename repos/dde_linux/src/lib/{ => legacy}/wifi/include/linux/if_packet.h (100%) rename repos/dde_linux/src/lib/{ => legacy}/wifi/include/linux/neighbour.h (100%) rename repos/dde_linux/src/lib/{ => legacy}/wifi/include/linux/nl80211.h (100%) rename repos/dde_linux/src/lib/{ => legacy}/wifi/include/linux/sockios.h (100%) rename repos/dde_linux/src/lib/{ => legacy}/wifi/include/lx_emul.h (100%) rename repos/dde_linux/src/lib/{ => legacy}/wifi/include/net/protocol.h (100%) rename repos/dde_linux/src/lib/{ => legacy}/wifi/include/spec/x86_32/platform/platform.h (100%) rename repos/dde_linux/src/lib/{ => legacy}/wifi/include/spec/x86_64/platform/platform.h (100%) rename repos/dde_linux/src/lib/{ => legacy}/wifi/init.cc (100%) rename repos/dde_linux/src/lib/{ => legacy}/wifi/lx.h (100%) rename repos/dde_linux/src/lib/{ => legacy}/wifi/lxc.h (100%) rename repos/dde_linux/src/lib/{ => legacy}/wifi/lxc_emul.c (100%) rename repos/dde_linux/src/lib/{ => legacy}/wifi/lxcc_emul.cc (100%) rename repos/dde_linux/src/lib/{ => legacy}/wifi/nic.cc (100%) rename repos/dde_linux/src/lib/{ => legacy}/wifi/random.cc (100%) rename repos/dde_linux/src/lib/{ => legacy}/wifi/socket_call.cc (100%) rename repos/dde_linux/src/lib/{ => legacy}/wifi/symbol.map (100%) diff --git a/repos/dde_linux/lib/import/import-wifi_include.mk b/repos/dde_linux/lib/import/import-legacy_wifi_include.mk similarity index 87% rename from repos/dde_linux/lib/import/import-wifi_include.mk rename to repos/dde_linux/lib/import/import-legacy_wifi_include.mk index 4b3228a5ea..842629ffdc 100644 --- a/repos/dde_linux/lib/import/import-wifi_include.mk +++ b/repos/dde_linux/lib/import/import-legacy_wifi_include.mk @@ -1,5 +1,5 @@ WIFI_CONTRIB_DIR := $(call select_from_ports,dde_linux)/src/lib/wifi -SRC_DIR := $(REP_DIR)/src/lib/wifi +SRC_DIR := $(REP_DIR)/src/lib/legacy/wifi # architecture-dependent includes ifeq ($(filter-out $(SPECS),x86),) @@ -24,4 +24,4 @@ INC_DIR += $(ARCH_SRC_INC_DIR) INC_DIR += $(WIFI_CONTRIB_DIR)/include \ $(WIFI_CONTRIB_DIR)/include/uapi \ $(WIFI_CONTRIB_DIR)/drivers/net/wireless/iwlwifi -INC_DIR += $(LIB_CACHE_DIR)/wifi_include/include/include/include +INC_DIR += $(LIB_CACHE_DIR)/legacy_wifi_include/include/include/include diff --git a/repos/dde_linux/lib/mk/wifi.inc b/repos/dde_linux/lib/mk/legacy_wifi.inc similarity index 95% rename from repos/dde_linux/lib/mk/wifi.inc rename to repos/dde_linux/lib/mk/legacy_wifi.inc index 0f6e87f11b..86b3b5de53 100644 --- a/repos/dde_linux/lib/mk/wifi.inc +++ b/repos/dde_linux/lib/mk/legacy_wifi.inc @@ -1,4 +1,4 @@ -LIB_DIR := $(REP_DIR)/src/lib/wifi +LIB_DIR := $(REP_DIR)/src/lib/legacy/wifi LIB_INC_DIR := $(LIB_DIR)/include WIFI_CONTRIB_DIR := $(call select_from_ports,dde_linux)/src/lib/wifi @@ -8,10 +8,10 @@ WIFI_DIR := $(WIFI_CONTRIB_DIR)/net SHARED_LIB = yes # -# wifi_include *must* be the first library, otherwise the include +# legacy_wifi_include *must* be the first library, otherwise the include # order is wrong # -LIBS += wifi_include lx_kit_setjmp nic_driver +LIBS += legacy_wifi_include lx_kit_setjmp nic_driver LD_OPT += --version-script=$(LIB_DIR)/symbol.map diff --git a/repos/dde_linux/lib/mk/wifi_include.mk b/repos/dde_linux/lib/mk/legacy_wifi_include.mk similarity index 94% rename from repos/dde_linux/lib/mk/wifi_include.mk rename to repos/dde_linux/lib/mk/legacy_wifi_include.mk index c5eb4ac2a8..c4320a2fac 100644 --- a/repos/dde_linux/lib/mk/wifi_include.mk +++ b/repos/dde_linux/lib/mk/legacy_wifi_include.mk @@ -1,7 +1,7 @@ ifeq ($(called_from_lib_mk),yes) WIFI_CONTRIB_DIR := $(call select_from_ports,dde_linux)/src/lib/wifi -LX_EMUL_H := $(REP_DIR)/src/lib/wifi/include/lx_emul.h +LX_EMUL_H := $(REP_DIR)/src/lib/legacy/wifi/include/lx_emul.h # # Determine the header files included by the contrib code. For each diff --git a/repos/dde_linux/lib/mk/spec/x86_32/wifi.mk b/repos/dde_linux/lib/mk/spec/x86_32/legacy_wifi.mk similarity index 82% rename from repos/dde_linux/lib/mk/spec/x86_32/wifi.mk rename to repos/dde_linux/lib/mk/spec/x86_32/legacy_wifi.mk index dcc582c9c3..8054d7c1e8 100644 --- a/repos/dde_linux/lib/mk/spec/x86_32/wifi.mk +++ b/repos/dde_linux/lib/mk/spec/x86_32/legacy_wifi.mk @@ -1,4 +1,4 @@ -include $(REP_DIR)/lib/mk/wifi.inc +include $(REP_DIR)/lib/mk/legacy_wifi.inc INC_DIR += $(LIB_INC_DIR)/spec/32bit $(LIB_INC_DIR)/spec/x86_32 $(LIB_INC_DIR)/spec/x86 diff --git a/repos/dde_linux/lib/mk/spec/x86_64/wifi.mk b/repos/dde_linux/lib/mk/spec/x86_64/legacy_wifi.mk similarity index 82% rename from repos/dde_linux/lib/mk/spec/x86_64/wifi.mk rename to repos/dde_linux/lib/mk/spec/x86_64/legacy_wifi.mk index 5daf3e03af..6ba594454f 100644 --- a/repos/dde_linux/lib/mk/spec/x86_64/wifi.mk +++ b/repos/dde_linux/lib/mk/spec/x86_64/legacy_wifi.mk @@ -1,4 +1,4 @@ -include $(REP_DIR)/lib/mk/wifi.inc +include $(REP_DIR)/lib/mk/legacy_wifi.inc INC_DIR += $(LIB_INC_DIR)/spec/64bit $(LIB_INC_DIR)/spec/x86_64 $(LIB_INC_DIR)/spec/x86 diff --git a/repos/dde_linux/recipes/pkg/wifi/README b/repos/dde_linux/recipes/pkg/legacy_wifi/README similarity index 100% rename from repos/dde_linux/recipes/pkg/wifi/README rename to repos/dde_linux/recipes/pkg/legacy_wifi/README diff --git a/repos/dde_linux/recipes/pkg/wifi/archives b/repos/dde_linux/recipes/pkg/legacy_wifi/archives similarity index 54% rename from repos/dde_linux/recipes/pkg/wifi/archives rename to repos/dde_linux/recipes/pkg/legacy_wifi/archives index 0663e628d0..45061989a4 100644 --- a/repos/dde_linux/recipes/pkg/wifi/archives +++ b/repos/dde_linux/recipes/pkg/legacy_wifi/archives @@ -1,6 +1,6 @@ -_/src/wifi_drv +_/src/legacy_wifi_drv _/src/openssl _/src/vfs _/src/vfs_jitterentropy _/src/libc -_/raw/wifi_firmware +_/raw/legacy_wifi_firmware diff --git a/repos/dde_linux/recipes/pkg/legacy_wifi/hash b/repos/dde_linux/recipes/pkg/legacy_wifi/hash new file mode 100644 index 0000000000..4b20d36a86 --- /dev/null +++ b/repos/dde_linux/recipes/pkg/legacy_wifi/hash @@ -0,0 +1 @@ +2022-03-28-c 2f0c23734634d4c90d6c4ed2d08a5873bd3daed1 diff --git a/repos/dde_linux/recipes/pkg/wifi/runtime b/repos/dde_linux/recipes/pkg/legacy_wifi/runtime similarity index 89% rename from repos/dde_linux/recipes/pkg/wifi/runtime rename to repos/dde_linux/recipes/pkg/legacy_wifi/runtime index a138da2266..8d7e4a093a 100644 --- a/repos/dde_linux/recipes/pkg/wifi/runtime +++ b/repos/dde_linux/recipes/pkg/legacy_wifi/runtime @@ -1,4 +1,4 @@ - + @@ -14,13 +14,13 @@ - + - + diff --git a/repos/dde_linux/recipes/pkg/wifi/hash b/repos/dde_linux/recipes/pkg/wifi/hash deleted file mode 100644 index 44ca0f910f..0000000000 --- a/repos/dde_linux/recipes/pkg/wifi/hash +++ /dev/null @@ -1 +0,0 @@ -2022-02-27 2ab1c844360f182758dbd9d7508e15e8ed02268f diff --git a/repos/dde_linux/recipes/raw/wifi_firmware/content.mk b/repos/dde_linux/recipes/raw/legacy_wifi_firmware/content.mk similarity index 100% rename from repos/dde_linux/recipes/raw/wifi_firmware/content.mk rename to repos/dde_linux/recipes/raw/legacy_wifi_firmware/content.mk diff --git a/repos/dde_linux/recipes/raw/wifi_firmware/hash b/repos/dde_linux/recipes/raw/legacy_wifi_firmware/hash similarity index 100% rename from repos/dde_linux/recipes/raw/wifi_firmware/hash rename to repos/dde_linux/recipes/raw/legacy_wifi_firmware/hash diff --git a/repos/dde_linux/recipes/src/wifi_drv/content.mk b/repos/dde_linux/recipes/src/legacy_wifi_drv/content.mk similarity index 87% rename from repos/dde_linux/recipes/src/wifi_drv/content.mk rename to repos/dde_linux/recipes/src/legacy_wifi_drv/content.mk index 06f221345b..1bf2d197fc 100644 --- a/repos/dde_linux/recipes/src/wifi_drv/content.mk +++ b/repos/dde_linux/recipes/src/legacy_wifi_drv/content.mk @@ -1,14 +1,14 @@ -LIB_MK := $(addprefix lib/mk/,libnl.inc libnl_include.mk iwl_firmware.mk wifi.inc \ - wifi_include.mk) \ +LIB_MK := $(addprefix lib/mk/,libnl.inc libnl_include.mk iwl_firmware.mk legacy_wifi.inc \ + legacy_wifi_include.mk) \ $(foreach SPEC,x86_32 x86_64,lib/mk/spec/$(SPEC)/libnl.mk) \ $(foreach SPEC,x86_32 x86_64,lib/mk/spec/$(SPEC)/lx_kit_setjmp.mk) \ - $(foreach SPEC,x86_32 x86_64,lib/mk/spec/$(SPEC)/wifi.mk) \ + $(foreach SPEC,x86_32 x86_64,lib/mk/spec/$(SPEC)/legacy_wifi.mk) \ $(addprefix lib/mk/spec/x86/,wpa_driver_nl80211.mk wpa_supplicant.mk) PORT_DIR := $(call port_dir,$(REP_DIR)/ports/dde_linux) MIRROR_FROM_REP_DIR := $(LIB_MK) \ - lib/import/import-wifi_include.mk \ + lib/import/import-legacy_wifi_include.mk \ lib/import/import-libnl_include.mk \ lib/import/import-libnl.mk \ include/wifi src/include/legacy src/lib/legacy/lx_kit \ @@ -17,7 +17,7 @@ MIRROR_FROM_REP_DIR := $(LIB_MK) \ src/include/spec/$(SPEC)) \ $(shell cd $(REP_DIR); find src/drivers/wifi -type f) \ $(shell cd $(REP_DIR); find src/lib/libnl -type f) \ - $(shell cd $(REP_DIR); find src/lib/wifi -type f) \ + $(shell cd $(REP_DIR); find src/lib/legacy/wifi -type f) \ $(shell cd $(REP_DIR); find src/lib/wpa_driver_nl80211 -type f) \ $(shell cd $(REP_DIR); find src/lib/wpa_supplicant -type f) diff --git a/repos/dde_linux/recipes/src/wifi_drv/hash b/repos/dde_linux/recipes/src/legacy_wifi_drv/hash similarity index 100% rename from repos/dde_linux/recipes/src/wifi_drv/hash rename to repos/dde_linux/recipes/src/legacy_wifi_drv/hash diff --git a/repos/dde_linux/recipes/src/wifi_drv/used_apis b/repos/dde_linux/recipes/src/legacy_wifi_drv/used_apis similarity index 100% rename from repos/dde_linux/recipes/src/wifi_drv/used_apis rename to repos/dde_linux/recipes/src/legacy_wifi_drv/used_apis diff --git a/repos/dde_linux/run/wifi.run b/repos/dde_linux/run/legacy_wifi.run similarity index 98% rename from repos/dde_linux/run/wifi.run rename to repos/dde_linux/run/legacy_wifi.run index 0c98914e14..f7892f8132 100644 --- a/repos/dde_linux/run/wifi.run +++ b/repos/dde_linux/run/legacy_wifi.run @@ -203,6 +203,7 @@ append config { + @@ -255,8 +256,8 @@ set boot_modules { vfs_jitterentropy.lib.so libc.lib.so vfs.lib.so libcrypto.lib.so libssl.lib.so wpa_driver_nl80211.lib.so wpa_supplicant.lib.so - wifi.lib.so - wifi_drv + legacy_wifi.lib.so + legacy_pc_wifi_drv nic_router test-lwip_httpsrv diff --git a/repos/dde_linux/run/nic_router_uplinks.run b/repos/dde_linux/run/nic_router_uplinks.run index 10f73ef1c1..4988caf0a3 100644 --- a/repos/dde_linux/run/nic_router_uplinks.run +++ b/repos/dde_linux/run/nic_router_uplinks.run @@ -84,7 +84,8 @@ append config { - + + @@ -390,8 +391,8 @@ append boot_modules { libcrypto.lib.so } append boot_modules { libssl.lib.so } append boot_modules { wpa_driver_nl80211.lib.so } append boot_modules { wpa_supplicant.lib.so } -append boot_modules { wifi.lib.so } -append boot_modules { wifi_drv } +append boot_modules { legacy_wifi.lib.so } +append boot_modules { legacy_pc_wifi_drv } append boot_modules { core } append boot_modules { nic_router } append boot_modules { ld.lib.so } diff --git a/repos/dde_linux/src/drivers/wifi/target.mk b/repos/dde_linux/src/drivers/wifi/target.mk index ac38aef2a8..5b307b5cc9 100644 --- a/repos/dde_linux/src/drivers/wifi/target.mk +++ b/repos/dde_linux/src/drivers/wifi/target.mk @@ -1,13 +1,13 @@ REQUIRES = x86 -TARGET = wifi_drv +TARGET := legacy_pc_wifi_drv SRC_CC = main.cc wpa.cc -LIBS = base wifi iwl_firmware +LIBS = base legacy_wifi iwl_firmware LIBS += wpa_supplicant libc nic_driver LIBS += libcrypto libssl wpa_driver_nl80211 # needed for firmware.h -INC_DIR += $(REP_DIR)/src/lib/wifi/include +INC_DIR += $(REP_DIR)/src/lib/legacy/wifi/include INC_DIR += $(PRG_DIR) -CC_CXX_WARN_STRICT = +CC_CXX_WARN_STRICT := diff --git a/repos/dde_linux/src/lib/wifi/dummies.cc b/repos/dde_linux/src/lib/legacy/wifi/dummies.cc similarity index 100% rename from repos/dde_linux/src/lib/wifi/dummies.cc rename to repos/dde_linux/src/lib/legacy/wifi/dummies.cc diff --git a/repos/dde_linux/src/lib/wifi/dummies_new.c b/repos/dde_linux/src/lib/legacy/wifi/dummies_new.c similarity index 100% rename from repos/dde_linux/src/lib/wifi/dummies_new.c rename to repos/dde_linux/src/lib/legacy/wifi/dummies_new.c diff --git a/repos/dde_linux/src/lib/wifi/firmware.cc b/repos/dde_linux/src/lib/legacy/wifi/firmware.cc similarity index 100% rename from repos/dde_linux/src/lib/wifi/firmware.cc rename to repos/dde_linux/src/lib/legacy/wifi/firmware.cc diff --git a/repos/dde_linux/src/lib/wifi/include/crc32table.h b/repos/dde_linux/src/lib/legacy/wifi/include/crc32table.h similarity index 100% rename from repos/dde_linux/src/lib/wifi/include/crc32table.h rename to repos/dde_linux/src/lib/legacy/wifi/include/crc32table.h diff --git a/repos/dde_linux/src/lib/wifi/include/firmware_list.h b/repos/dde_linux/src/lib/legacy/wifi/include/firmware_list.h similarity index 100% rename from repos/dde_linux/src/lib/wifi/include/firmware_list.h rename to repos/dde_linux/src/lib/legacy/wifi/include/firmware_list.h diff --git a/repos/dde_linux/src/lib/wifi/include/linux/gen_stats.h b/repos/dde_linux/src/lib/legacy/wifi/include/linux/gen_stats.h similarity index 100% rename from repos/dde_linux/src/lib/wifi/include/linux/gen_stats.h rename to repos/dde_linux/src/lib/legacy/wifi/include/linux/gen_stats.h diff --git a/repos/dde_linux/src/lib/wifi/include/linux/hdlc/ioctl.h b/repos/dde_linux/src/lib/legacy/wifi/include/linux/hdlc/ioctl.h similarity index 100% rename from repos/dde_linux/src/lib/wifi/include/linux/hdlc/ioctl.h rename to repos/dde_linux/src/lib/legacy/wifi/include/linux/hdlc/ioctl.h diff --git a/repos/dde_linux/src/lib/wifi/include/linux/if_bridge.h b/repos/dde_linux/src/lib/legacy/wifi/include/linux/if_bridge.h similarity index 100% rename from repos/dde_linux/src/lib/wifi/include/linux/if_bridge.h rename to repos/dde_linux/src/lib/legacy/wifi/include/linux/if_bridge.h diff --git a/repos/dde_linux/src/lib/wifi/include/linux/if_packet.h b/repos/dde_linux/src/lib/legacy/wifi/include/linux/if_packet.h similarity index 100% rename from repos/dde_linux/src/lib/wifi/include/linux/if_packet.h rename to repos/dde_linux/src/lib/legacy/wifi/include/linux/if_packet.h diff --git a/repos/dde_linux/src/lib/wifi/include/linux/neighbour.h b/repos/dde_linux/src/lib/legacy/wifi/include/linux/neighbour.h similarity index 100% rename from repos/dde_linux/src/lib/wifi/include/linux/neighbour.h rename to repos/dde_linux/src/lib/legacy/wifi/include/linux/neighbour.h diff --git a/repos/dde_linux/src/lib/wifi/include/linux/nl80211.h b/repos/dde_linux/src/lib/legacy/wifi/include/linux/nl80211.h similarity index 100% rename from repos/dde_linux/src/lib/wifi/include/linux/nl80211.h rename to repos/dde_linux/src/lib/legacy/wifi/include/linux/nl80211.h diff --git a/repos/dde_linux/src/lib/wifi/include/linux/sockios.h b/repos/dde_linux/src/lib/legacy/wifi/include/linux/sockios.h similarity index 100% rename from repos/dde_linux/src/lib/wifi/include/linux/sockios.h rename to repos/dde_linux/src/lib/legacy/wifi/include/linux/sockios.h diff --git a/repos/dde_linux/src/lib/wifi/include/lx_emul.h b/repos/dde_linux/src/lib/legacy/wifi/include/lx_emul.h similarity index 100% rename from repos/dde_linux/src/lib/wifi/include/lx_emul.h rename to repos/dde_linux/src/lib/legacy/wifi/include/lx_emul.h diff --git a/repos/dde_linux/src/lib/wifi/include/net/protocol.h b/repos/dde_linux/src/lib/legacy/wifi/include/net/protocol.h similarity index 100% rename from repos/dde_linux/src/lib/wifi/include/net/protocol.h rename to repos/dde_linux/src/lib/legacy/wifi/include/net/protocol.h diff --git a/repos/dde_linux/src/lib/wifi/include/spec/x86_32/platform/platform.h b/repos/dde_linux/src/lib/legacy/wifi/include/spec/x86_32/platform/platform.h similarity index 100% rename from repos/dde_linux/src/lib/wifi/include/spec/x86_32/platform/platform.h rename to repos/dde_linux/src/lib/legacy/wifi/include/spec/x86_32/platform/platform.h diff --git a/repos/dde_linux/src/lib/wifi/include/spec/x86_64/platform/platform.h b/repos/dde_linux/src/lib/legacy/wifi/include/spec/x86_64/platform/platform.h similarity index 100% rename from repos/dde_linux/src/lib/wifi/include/spec/x86_64/platform/platform.h rename to repos/dde_linux/src/lib/legacy/wifi/include/spec/x86_64/platform/platform.h diff --git a/repos/dde_linux/src/lib/wifi/init.cc b/repos/dde_linux/src/lib/legacy/wifi/init.cc similarity index 100% rename from repos/dde_linux/src/lib/wifi/init.cc rename to repos/dde_linux/src/lib/legacy/wifi/init.cc diff --git a/repos/dde_linux/src/lib/wifi/lx.h b/repos/dde_linux/src/lib/legacy/wifi/lx.h similarity index 100% rename from repos/dde_linux/src/lib/wifi/lx.h rename to repos/dde_linux/src/lib/legacy/wifi/lx.h diff --git a/repos/dde_linux/src/lib/wifi/lxc.h b/repos/dde_linux/src/lib/legacy/wifi/lxc.h similarity index 100% rename from repos/dde_linux/src/lib/wifi/lxc.h rename to repos/dde_linux/src/lib/legacy/wifi/lxc.h diff --git a/repos/dde_linux/src/lib/wifi/lxc_emul.c b/repos/dde_linux/src/lib/legacy/wifi/lxc_emul.c similarity index 100% rename from repos/dde_linux/src/lib/wifi/lxc_emul.c rename to repos/dde_linux/src/lib/legacy/wifi/lxc_emul.c diff --git a/repos/dde_linux/src/lib/wifi/lxcc_emul.cc b/repos/dde_linux/src/lib/legacy/wifi/lxcc_emul.cc similarity index 100% rename from repos/dde_linux/src/lib/wifi/lxcc_emul.cc rename to repos/dde_linux/src/lib/legacy/wifi/lxcc_emul.cc diff --git a/repos/dde_linux/src/lib/wifi/nic.cc b/repos/dde_linux/src/lib/legacy/wifi/nic.cc similarity index 100% rename from repos/dde_linux/src/lib/wifi/nic.cc rename to repos/dde_linux/src/lib/legacy/wifi/nic.cc diff --git a/repos/dde_linux/src/lib/wifi/random.cc b/repos/dde_linux/src/lib/legacy/wifi/random.cc similarity index 100% rename from repos/dde_linux/src/lib/wifi/random.cc rename to repos/dde_linux/src/lib/legacy/wifi/random.cc diff --git a/repos/dde_linux/src/lib/wifi/socket_call.cc b/repos/dde_linux/src/lib/legacy/wifi/socket_call.cc similarity index 100% rename from repos/dde_linux/src/lib/wifi/socket_call.cc rename to repos/dde_linux/src/lib/legacy/wifi/socket_call.cc diff --git a/repos/dde_linux/src/lib/wifi/symbol.map b/repos/dde_linux/src/lib/legacy/wifi/symbol.map similarity index 100% rename from repos/dde_linux/src/lib/wifi/symbol.map rename to repos/dde_linux/src/lib/legacy/wifi/symbol.map diff --git a/repos/gems/src/app/sculpt_manager/runtime/wifi_drv.cc b/repos/gems/src/app/sculpt_manager/runtime/wifi_drv.cc index 15c9f9e2aa..a018c430ab 100644 --- a/repos/gems/src/app/sculpt_manager/runtime/wifi_drv.cc +++ b/repos/gems/src/app/sculpt_manager/runtime/wifi_drv.cc @@ -19,6 +19,10 @@ void Sculpt::gen_wifi_drv_start_content(Xml_generator &xml) Cap_quota{200}, Ram_quota{32*1024*1024}, Priority::NETWORK); + xml.node("binary", [&] () { + xml.attribute("name", "legacy_pc_wifi_drv"); + }); + xml.node("config", [&] () { xml.node("vfs", [&] () { @@ -54,7 +58,7 @@ void Sculpt::gen_wifi_drv_start_content(Xml_generator &xml) xml.node("parent", [&] () { xml.attribute("label", "wifi"); }); }); - gen_parent_rom_route(xml, "wifi_drv"); + gen_parent_rom_route(xml, "legacy_pc_wifi_drv"); gen_parent_rom_route(xml, "ld.lib.so"); gen_parent_rom_route(xml, "libcrypto.lib.so"); gen_parent_rom_route(xml, "vfs.lib.so"); @@ -62,7 +66,7 @@ void Sculpt::gen_wifi_drv_start_content(Xml_generator &xml) gen_parent_rom_route(xml, "libm.lib.so"); gen_parent_rom_route(xml, "vfs_jitterentropy.lib.so"); gen_parent_rom_route(xml, "libssl.lib.so"); - gen_parent_rom_route(xml, "wifi.lib.so"); + gen_parent_rom_route(xml, "legacy_wifi.lib.so"); gen_parent_rom_route(xml, "wpa_driver_nl80211.lib.so"); gen_parent_rom_route(xml, "wpa_supplicant.lib.so"); gen_parent_rom_route(xml, "iwlwifi-1000-5.ucode"); diff --git a/repos/ports/run/netperf.inc b/repos/ports/run/netperf.inc index cd51da9c27..bc7bc716b2 100644 --- a/repos/ports/run/netperf.inc +++ b/repos/ports/run/netperf.inc @@ -155,10 +155,10 @@ append_if $use_usb_driver packages " [depot_user]/src/platform_drv " append_if $use_wifi_driver packages " [depot_user]/src/fs_rom " append_if $use_wifi_driver packages " [depot_user]/src/vfs_import " append_if $use_wifi_driver packages " [depot_user]/src/report_rom " -append_if $use_wifi_driver packages " [depot_user]/src/wifi_drv " +append_if $use_wifi_driver packages " [depot_user]/src/legacy_wifi_drv " append_if $use_wifi_driver packages " [depot_user]/src/openssl " append_if $use_wifi_driver packages " [depot_user]/src/vfs_jitterentropy " -append_if $use_wifi_driver packages " [depot_user]/raw/wifi_firmware " +append_if $use_wifi_driver packages " [depot_user]/raw/legacy_wifi_firmware " import_from_depot $packages @@ -244,7 +244,7 @@ append config { - +