From bb4e1fc6698f0046c7c2923a5858565259075979 Mon Sep 17 00:00:00 2001 From: Sukru Senli <sukru.senli@iopsys.eu> Date: Sat, 2 May 2020 12:58:51 +0200 Subject: [PATCH] targets: remove reference to deprecated libcgroup and juci packages --- intel_mips/config/config | 7 ------- intel_mips/image/xrx500-iopsys.mk | 2 +- iopsys-brcm63xx-arm/config/config | 3 --- iopsys-brcm63xx-arm/config/panther/config | 3 --- iopsys-brcm63xx-arm/config/tiger/config | 3 --- iopsys-brcm63xx-arm/profiles/iopsys.mk | 6 +++--- iopsys-brcm63xx-mips/config/config | 3 --- iopsys-brcm63xx-mips/profiles/iopsys.mk | 4 ++-- iopsys-ramips/config/config | 16 ++++++---------- 9 files changed, 12 insertions(+), 35 deletions(-) diff --git a/intel_mips/config/config b/intel_mips/config/config index 65a6c40e6..89b39ae15 100644 --- a/intel_mips/config/config +++ b/intel_mips/config/config @@ -76,9 +76,6 @@ CONFIG_FEATURE_LTQ_WAVE_AR10_SUPPORT=y # CONFIG_FEATURE_LTQ_WAVE_DEBUG_TFTP_BINS is not set # CONFIG_FEATURE_LTQ_WAVE_FGPA_DUMMY_PHY is not set CONFIG_FEATURE_LTQ_WAVE_500B=y -# WiFi Life is not yet available for Intel -# CONFIG_PACKAGE_juci-wifilife is not set -# CONFIG_PACKAGE_wifilife is not set CONFIG_PACKAGE_fapi_wlan_common=y CONFIG_PACKAGE_fapi_wlan_vendor_wave=y #################### @@ -90,7 +87,6 @@ CONFIG_PACKAGE_kmod-ipt-nathelper-rtsp=y CONFIG_PACKAGE_kmod-nf-nathelper=y CONFIG_PACKAGE_kmod-nf-nathelper-extra=y CONFIG_PACKAGE_mcproxy=y -CONFIG_PACKAGE_juci-mcproxy=y #################### #################### Mobile Dongle related @@ -112,9 +108,6 @@ CONFIG_PACKAGE_kmod-voice-tapi-sdd-mbx=y # the options below this point is wrong but packages wont compile -# CONFIG_PACKAGE_libcgroup is not set -# CONFIG_PACKAGE_libcgroup-daemon is not set - # CONFIG_TARGET_ROOTFS_INITRAMFS is not set # CONFIG_TARGET_ROOTFS_SQUASHFS is not set diff --git a/intel_mips/image/xrx500-iopsys.mk b/intel_mips/image/xrx500-iopsys.mk index 2307b3e72..3fbb15b09 100644 --- a/intel_mips/image/xrx500-iopsys.mk +++ b/intel_mips/image/xrx500-iopsys.mk @@ -13,7 +13,7 @@ ASTERISK_PACKAGES += asterisk-codec-a-mu asterisk-codec-alaw asterisk-codec-ulaw ASTERISK_PACKAGES += asterisk-codec-g722 asterisk-codec-g726 asterisk-codec-g729 ASTERISK_PACKAGES += asterisk-codec-gsm asterisk-util-astcanary -VOICE_PACKAGES := voice-client $(ASTERISK_PACKAGES) juci-voice-client +VOICE_PACKAGES := voice-client $(ASTERISK_PACKAGES) COMMON_PACKAGES := \ kmod-usb-dwc3-grx500 kmod-usb3 kmod-usb-storage kmod-scsi-core kmod-fs-vfat \ diff --git a/iopsys-brcm63xx-arm/config/config b/iopsys-brcm63xx-arm/config/config index 719c62994..21bab0b85 100644 --- a/iopsys-brcm63xx-arm/config/config +++ b/iopsys-brcm63xx-arm/config/config @@ -1,6 +1,3 @@ -# CONFIG_PACKAGE_libcgroup-daemon is not set -# CONFIG_PACKAGE_libcgroup is not set - # CONFIG_PACKAGE_brcminfo is not set CONFIG_PACKAGE_brcm_fw_tool=y diff --git a/iopsys-brcm63xx-arm/config/panther/config b/iopsys-brcm63xx-arm/config/panther/config index eee4220b8..8bbb1b0a0 100644 --- a/iopsys-brcm63xx-arm/config/panther/config +++ b/iopsys-brcm63xx-arm/config/panther/config @@ -3,11 +3,8 @@ CONFIG_TARGET_NO_DECT=y CONFIG_TARGET_NO_DSL=y # CONFIG_PACKAGE_libdsl is not set # CONFIG_PACKAGE_dslmngr is not set -# CONFIG_PACKAGE_juci-network-dsl is not set # CONFIG_PACKAGE_libwifi is not set # CONFIG_PACKAGE_wifilife is not set # CONFIG_PACKAGE_wifimngr is not set # CONFIG_PACKAGE_ifbt is not set -# CONFIG_PACKAGE_juci-wifilife is not set -# CONFIG_PACKAGE_juci-wireless is not set # CONFIG_PACKAGE_mwan3 is not set diff --git a/iopsys-brcm63xx-arm/config/tiger/config b/iopsys-brcm63xx-arm/config/tiger/config index eee4220b8..8bbb1b0a0 100644 --- a/iopsys-brcm63xx-arm/config/tiger/config +++ b/iopsys-brcm63xx-arm/config/tiger/config @@ -3,11 +3,8 @@ CONFIG_TARGET_NO_DECT=y CONFIG_TARGET_NO_DSL=y # CONFIG_PACKAGE_libdsl is not set # CONFIG_PACKAGE_dslmngr is not set -# CONFIG_PACKAGE_juci-network-dsl is not set # CONFIG_PACKAGE_libwifi is not set # CONFIG_PACKAGE_wifilife is not set # CONFIG_PACKAGE_wifimngr is not set # CONFIG_PACKAGE_ifbt is not set -# CONFIG_PACKAGE_juci-wifilife is not set -# CONFIG_PACKAGE_juci-wireless is not set # CONFIG_PACKAGE_mwan3 is not set diff --git a/iopsys-brcm63xx-arm/profiles/iopsys.mk b/iopsys-brcm63xx-arm/profiles/iopsys.mk index 6f7d8a6d4..853009c20 100644 --- a/iopsys-brcm63xx-arm/profiles/iopsys.mk +++ b/iopsys-brcm63xx-arm/profiles/iopsys.mk @@ -10,8 +10,8 @@ asterisk-res-musiconhold asterisk-res-stun asterisk-res-voice asterisk-sounds \ asterisk-format-gsm asterisk-res-rtp-asterisk asterisk-chan-sip \ asterisk-util-astcanary asterisk-res-timing-timerfd -VOICE_SUPPORT:=voice-client endptmngr $(ASTERISK_PACKAGES) juci-voice-client -DECT_SUPPORT:=dectmngr2 juci-natalie-dect +VOICE_SUPPORT:=voice-client endptmngr $(ASTERISK_PACKAGES) +DECT_SUPPORT:=dectmngr2 #################### brcm_ref138 define Profile/brcm_ref138_p502 @@ -51,7 +51,7 @@ $(eval $(call Profile,dg400prime)) #################### EG400 define Profile/eg400 NAME:=eg400 - PACKAGES:=$(VOICE_SUPPORT) $(DECT_SUPPORT) catv juci-catv juci-sfp + PACKAGES:=$(VOICE_SUPPORT) $(DECT_SUPPORT) catv endef define Profile/eg400/Description diff --git a/iopsys-brcm63xx-mips/config/config b/iopsys-brcm63xx-mips/config/config index 719c62994..21bab0b85 100644 --- a/iopsys-brcm63xx-mips/config/config +++ b/iopsys-brcm63xx-mips/config/config @@ -1,6 +1,3 @@ -# CONFIG_PACKAGE_libcgroup-daemon is not set -# CONFIG_PACKAGE_libcgroup is not set - # CONFIG_PACKAGE_brcminfo is not set CONFIG_PACKAGE_brcm_fw_tool=y diff --git a/iopsys-brcm63xx-mips/profiles/iopsys.mk b/iopsys-brcm63xx-mips/profiles/iopsys.mk index 0a88f19db..bd516314d 100644 --- a/iopsys-brcm63xx-mips/profiles/iopsys.mk +++ b/iopsys-brcm63xx-mips/profiles/iopsys.mk @@ -10,8 +10,8 @@ asterisk-res-musiconhold asterisk-res-stun asterisk-res-voice asterisk-sounds \ asterisk-format-gsm asterisk-res-rtp-asterisk asterisk-chan-sip \ asterisk-util-astcanary asterisk-res-timing-timerfd -VOICE_SUPPORT:=voice-client endptmngr $(ASTERISK_PACKAGES) juci-voice-client -DECT_SUPPORT:=natalie-dect dectmngr2 juci-natalie-dect +VOICE_SUPPORT:=voice-client endptmngr $(ASTERISK_PACKAGES) +DECT_SUPPORT:=natalie-dect dectmngr2 ############################################################################### define Profile/dg301 diff --git a/iopsys-ramips/config/config b/iopsys-ramips/config/config index 508da9973..f57c0bb8a 100644 --- a/iopsys-ramips/config/config +++ b/iopsys-ramips/config/config @@ -1,13 +1,9 @@ -# CONFIG_PACKAGE_libcgroup-daemon is not set -# CONFIG_PACKAGE_libcgroup is not set -# CONFIG_PACKAGE_power-management is not set -# CONFIG_PACKAGE_qos-scripts is not set -CONFIG_PACKAGE_mcproxy=y -CONFIG_PACKAGE_juci-mcproxy=y +CONFIG_PACKAGE_kmod-mtk7603e=y +CONFIG_PACKAGE_kmod-mtk7615e=y CONFIG_PACKAGE_kmod-nf-nathelper=y CONFIG_PACKAGE_kmod-nf-nathelper-extra=y -# CONFIG_PACKAGE_endptmngr is not set -# CONFIG_PACKAGE_juci-network-dsl is not set CONFIG_PACKAGE_kmod-dummy=y -CONFIG_PACKAGE_kmod-mtk7603e=y -CONFIG_PACKAGE_kmod-mtk7615e=y + +CONFIG_PACKAGE_mcproxy=y + +# CONFIG_PACKAGE_dslmngr is not set -- GitLab