From c708007d0b5198f46f43a6d10a1b1365603ba740 Mon Sep 17 00:00:00 2001 From: Jani Juvan Date: Tue, 25 Apr 2023 15:57:45 +0200 Subject: [PATCH] iop: Remove iopsys- prefix from targets --- ethmngr/Makefile | 6 +++--- iop/scripts/feeds_update.sh | 3 +-- iop/scripts/genconfig.sh | 28 ++++++++++++++-------------- iop/scripts/genconfig_min.sh | 28 ++++++++++++++-------------- libdsl/Makefile | 4 ++-- libethernet/Makefile | 6 +++--- libqos/Makefile | 6 +++--- libwifi/Makefile | 6 +++--- 8 files changed, 43 insertions(+), 44 deletions(-) diff --git a/ethmngr/Makefile b/ethmngr/Makefile index 0d4e0686c..c084c7113 100644 --- a/ethmngr/Makefile +++ b/ethmngr/Makefile @@ -23,7 +23,7 @@ define Package/ethmngr SECTION:=utils CATEGORY:=Utilities TITLE:=Ethernet status and configration utility - DEPENDS:=+(TARGET_brcmbca||TARGET_airoha||TARGET_ipq95xx||TARGET_iopsys_mediatek):libethernet +libuci +libubox +ubus +libpthread +libnl-genl + DEPENDS:=+(TARGET_brcmbca||TARGET_airoha||TARGET_ipq95xx||TARGET_mediatek):libethernet +libuci +libubox +ubus +libpthread +libnl-genl endef define Package/ethmngr/description @@ -37,7 +37,7 @@ TARGET_CFLAGS += \ -I$(STAGING_DIR)/usr/include/libnl3 \ -D_GNU_SOURCE -ifeq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_iopsys_mediatek),) +ifeq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_mediatek),) define Build/Compile endef endif @@ -49,7 +49,7 @@ ifneq ($(CONFIG_TARGET_brcmbca),) else $(CP) ./files/linux/* $(1)/ endif -ifneq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_iopsys_mediatek),) +ifneq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_mediatek),) $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/ethmngr $(1)/usr/sbin/ endif diff --git a/iop/scripts/feeds_update.sh b/iop/scripts/feeds_update.sh index 96b1a8b9b..72f68bb7c 100755 --- a/iop/scripts/feeds_update.sh +++ b/iop/scripts/feeds_update.sh @@ -38,8 +38,7 @@ function feeds_update { # targets need to be installed explicitly for target in $(ls ./feeds/targets); do - rm -f target/linux/$target - ./scripts/feeds install -p targets $target + ./scripts/feeds install -f -p targets $target done # install all packages diff --git a/iop/scripts/genconfig.sh b/iop/scripts/genconfig.sh index 7a320118e..2b8e77948 100755 --- a/iop/scripts/genconfig.sh +++ b/iop/scripts/genconfig.sh @@ -15,9 +15,9 @@ function genconfig { target_config_path="" brcmbca_feed="target/linux/feeds/brcmbca" airoha_feed="target/linux/feeds/airoha" - x86_feed="target/linux/feeds/iopsys-x86" - armvirt_feed="target/linux/feeds/iopsys-armvirt" - mediatek_feed="target/linux/feeds/iopsys-mediatek" + x86_feed="target/linux/feeds/x86" + armvirt_feed="target/linux/feeds/armvirt" + mediatek_feed="target/linux/feeds/mediatek" qualcomm_ipq95xx_feed="target/linux/feeds/ipq95xx" Red='\033[0;31m' # Red @@ -113,16 +113,16 @@ function genconfig { [ -e $airoha_feed/genconfig ] && airoha=$(cd $airoha_feed; ./genconfig) [ -e $x86_feed/genconfig ] && - iopsys_x86=$(cd $x86_feed; ./genconfig) + x86=$(cd $x86_feed; ./genconfig) [ -e $armvirt_feed/genconfig ] && - iopsys_armvirt=$(cd $armvirt_feed; ./genconfig) + armvirt=$(cd $armvirt_feed; ./genconfig) [ -e $mediatek_feed/genconfig ] && - iopsys_mediatek=$(cd $mediatek_feed; ./genconfig) + mediatek=$(cd $mediatek_feed; ./genconfig) [ -e $qualcomm_ipq95xx_feed/genconfig ] && ipq95xx=$(cd $qualcomm_ipq95xx_feed; ./genconfig) if [ "$profile" == "LIST" ]; then - for list in brcmbca airoha iopsys_x86 iopsys_armvirt iopsys_mediatek ipq95xx; do + for list in brcmbca airoha x86 armvirt mediatek ipq95xx; do echo "$list based boards:" for b in ${!list}; do echo -e "\t$b" @@ -147,25 +147,25 @@ function genconfig { fi done - for p in $iopsys_x86; do + for p in $x86; do if [ $p == $profile ]; then - target="iopsys_x86" + target="x86" target_config_path="$x86_feed/config" return fi done - for p in $iopsys_armvirt; do + for p in $armvirt; do if [ $p == $profile ]; then - target="iopsys_armvirt" + target="armvirt" target_config_path="$armvirt_feed/config" return fi done - for p in $iopsys_mediatek; do + for p in $mediatek; do if [ $p == $profile ]; then - target="iopsys_mediatek" + target="mediatek" target_config_path="$mediatek_feed/config" return fi @@ -360,7 +360,7 @@ function genconfig { # Special handling for targets which use TARGET_DEVICES case "$target" in - airoha | iopsys_mediatek | brcmbca | ipq95xx) + airoha | mediatek | brcmbca | ipq95xx) # This assumes the device name to be unique within one target, # which is a fair assumption to make. local subtarget="$(get_subtarget_for_device "${target/_/-}" "$BOARDTYPE")" diff --git a/iop/scripts/genconfig_min.sh b/iop/scripts/genconfig_min.sh index 6856974df..48c594ac2 100644 --- a/iop/scripts/genconfig_min.sh +++ b/iop/scripts/genconfig_min.sh @@ -14,9 +14,9 @@ function genconfig_min { target_config_path="" brcmbca_feed="target/linux/feeds/brcmbca" airoha_feed="target/linux/feeds/airoha" - x86_feed="target/linux/feeds/iopsys-x86" - armvirt_feed="target/linux/feeds/iopsys-armvirt" - mediatek_feed="target/linux/feeds/iopsys-mediatek" + x86_feed="target/linux/feeds/x86" + armvirt_feed="target/linux/feeds/armvirt" + mediatek_feed="target/linux/feeds/mediatek" qualcomm_ipq95xx_feed="target/linux/feeds/ipq95xx" Red='\033[0;31m' # Red @@ -112,16 +112,16 @@ function genconfig_min { [ -e $airoha_feed/genconfig ] && airoha=$(cd $airoha_feed; ./genconfig) [ -e $x86_feed/genconfig ] && - iopsys_x86=$(cd $x86_feed; ./genconfig) + x86=$(cd $x86_feed; ./genconfig) [ -e $armvirt_feed/genconfig ] && - iopsys_armvirt=$(cd $armvirt_feed; ./genconfig) + armvirt=$(cd $armvirt_feed; ./genconfig) [ -e $mediatek_feed/genconfig ] && - iopsys_mediatek=$(cd $mediatek_feed; ./genconfig) + mediatek=$(cd $mediatek_feed; ./genconfig) [ -e $qualcomm_ipq95xx_feed/genconfig ] && ipq95xx=$(cd $qualcomm_ipq95xx_feed; ./genconfig) if [ "$profile" == "LIST" ]; then - for list in brcmbca airoha iopsys_x86 iopsys_armvirt iopsys_mediatek ipq95xx; do + for list in brcmbca airoha x86 armvirt mediatek ipq95xx; do echo "$list based boards:" for b in ${!list}; do echo -e "\t$b" @@ -146,25 +146,25 @@ function genconfig_min { fi done - for p in $iopsys_x86; do + for p in $x86; do if [ $p == $profile ]; then - target="iopsys_x86" + target="x86" target_config_path="$x86_feed/config" return fi done - for p in $iopsys_armvirt; do + for p in $armvirt; do if [ $p == $profile ]; then - target="iopsys_armvirt" + target="armvirt" target_config_path="$armvirt_feed/config" return fi done - for p in $iopsys_mediatek; do + for p in $mediatek; do if [ $p == $profile ]; then - target="iopsys_mediatek" + target="mediatek" target_config_path="$mediatek_feed/config" return fi @@ -334,7 +334,7 @@ function genconfig_min { # Special handling for targets which use TARGET_DEVICES case "$target" in - airoha | iopsys_mediatek | brcmbca | ipq95xx) + airoha | mediatek | brcmbca | ipq95xx) # This assumes the device name to be unique within one target, # which is a fair assumption to make. local subtarget="$(get_subtarget_for_device "${target/_/-}" "$BOARDTYPE")" diff --git a/libdsl/Makefile b/libdsl/Makefile index bcf18a660..3fe81af14 100644 --- a/libdsl/Makefile +++ b/libdsl/Makefile @@ -28,10 +28,10 @@ ifeq ($(CONFIG_TARGET_brcmbca),y) TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \ -I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \ -I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include -else ifeq ($(CONFIG_TARGET_iopsys_x86),y) +else ifeq ($(CONFIG_TARGET_x86),y) TARGET_PLATFORM=TEST TARGET_CFLAGS +=-DIOPSYS_TEST -else ifeq ($(CONFIG_TARGET_iopsys_armvirt),y) +else ifeq ($(CONFIG_TARGET_armvirt),y) TARGET_PLATFORM=TEST TARGET_CFLAGS +=-DIOPSYS_TEST endif diff --git a/libethernet/Makefile b/libethernet/Makefile index 5fdc5ae03..8449f86e5 100644 --- a/libethernet/Makefile +++ b/libethernet/Makefile @@ -30,10 +30,10 @@ ifeq ($(CONFIG_TARGET_brcmbca),y) -I$(STAGING_DIR)/usr/include/bcm963xx/shared/opensource/include/bcm963xx \ -I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \ -I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include -else ifeq ($(CONFIG_TARGET_iopsys_x86),y) +else ifeq ($(CONFIG_TARGET_x86),y) TARGET_PLATFORM=TEST TARGET_CFLAGS +=-DIOPSYS_TEST -else ifeq ($(CONFIG_TARGET_iopsys_armvirt),y) +else ifeq ($(CONFIG_TARGET_armvirt),y) TARGET_PLATFORM=TEST TARGET_CFLAGS +=-DIOPSYS_TEST else ifeq ($(CONFIG_TARGET_airoha),y) @@ -42,7 +42,7 @@ else ifeq ($(CONFIG_TARGET_airoha),y) else ifeq ($(CONFIG_TARGET_ipq95xx),y) TARGET_PLATFORM=IPQ95XX TARGET_CFLAGS +=-DIPQ95XX -else ifeq ($(CONFIG_TARGET_iopsys_mediatek),y) +else ifeq ($(CONFIG_TARGET_mediatek),y) TARGET_PLATFORM=LINUX TARGET_CFLAGS +=-DIOPSYS_LINUX else diff --git a/libqos/Makefile b/libqos/Makefile index fe278d3a6..e52cfd3ce 100644 --- a/libqos/Makefile +++ b/libqos/Makefile @@ -29,10 +29,10 @@ ifeq ($(CONFIG_TARGET_brcmbca),y) TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \ -I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \ -I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include -else ifeq ($(CONFIG_TARGET_iopsys_x86),y) +else ifeq ($(CONFIG_TARGET_x86),y) TARGET_PLATFORM=TEST TARGET_CFLAGS +=-DIOPSYS_TEST -else ifeq ($(CONFIG_TARGET_iopsys_armvirt),y) +else ifeq ($(CONFIG_TARGET_armvirt),y) TARGET_PLATFORM=TEST TARGET_CFLAGS +=-DIOPSYS_TEST else ifeq ($(CONFIG_TARGET_airoha),y) @@ -41,7 +41,7 @@ else ifeq ($(CONFIG_TARGET_airoha),y) else ifeq ($(CONFIG_TARGET_ipq95xx),y) TARGET_PLATFORM=IPQ95XX TARGET_CFLAGS +=-DIPQ95XX -else ifeq ($(CONFIG_TARGET_iopsys_mediatek),y) +else ifeq ($(CONFIG_TARGET_mediatek),y) TARGET_PLATFORM=LINUX TARGET_CFLAGS +=-DIOPSYS_LINUX else diff --git a/libwifi/Makefile b/libwifi/Makefile index aec7a7255..518f5329d 100644 --- a/libwifi/Makefile +++ b/libwifi/Makefile @@ -30,11 +30,11 @@ ifeq ($(CONFIG_TARGET_brcmbca),y) TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \ -I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \ -I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include -else ifeq ($(CONFIG_TARGET_iopsys_x86),y) +else ifeq ($(CONFIG_TARGET_x86),y) TARGET_PLATFORM=TEST TARGET_WIFI_TYPE=TEST TARGET_CFLAGS +=-DIOPSYS_TEST -else ifeq ($(CONFIG_TARGET_iopsys_armvirt),y) +else ifeq ($(CONFIG_TARGET_armvirt),y) TARGET_PLATFORM=TEST TARGET_WIFI_TYPE=TEST TARGET_CFLAGS +=-DIOPSYS_TEST @@ -46,7 +46,7 @@ else ifeq ($(CONFIG_TARGET_ipq95xx),y) TARGET_PLATFORM=IPQ95XX TARGET_WIFI_TYPE=MAC80211 TARGET_CFLAGS +=-DIPQ95XX -else ifeq ($(CONFIG_TARGET_iopsys_mediatek),y) +else ifeq ($(CONFIG_TARGET_mediatek),y) TARGET_PLATFORM=LINUX TARGET_WIFI_TYPE=MAC80211 TARGET_CFLAGS +=-DIOPSYS_LINUX