[Refactor meta-cmf-filogic]
[Description]
Refactor meta-cmf-filogic
1. use filogic instead of turris include filename and content
[Release-log]
diff --git a/conf/distro/include/rdk-turris.inc b/conf/distro/include/rdk-filogic.inc
similarity index 100%
rename from conf/distro/include/rdk-turris.inc
rename to conf/distro/include/rdk-filogic.inc
diff --git a/conf/include/turris-bbmasks.inc b/conf/include/filogic-bbmasks.inc
similarity index 100%
rename from conf/include/turris-bbmasks.inc
rename to conf/include/filogic-bbmasks.inc
diff --git a/conf/include/rdk-external-src-platform.inc b/conf/include/rdk-external-src-platform.inc
index 40746fa..fb6321e 100644
--- a/conf/include/rdk-external-src-platform.inc
+++ b/conf/include/rdk-external-src-platform.inc
@@ -5,7 +5,7 @@
#
INHERIT += "externalsrc"
-EXTERNALSRC_pn-hal-dhcpv4c-generic = "${@'${RDK_ROOT_PATH}/rdkb/components/opensource/ccsp/hal/source/dhcpv4c' if (os.path.isdir('${RDK_ROOT_PATH}/rdkb/components/opensource/ccsp/hal/source/dhcpv4c/devices_turris')) else ''}"
-EXTERNALSRC_pn-hal-ethsw-generic = "${@'${RDK_ROOT_PATH}/rdkb/components/opensource/ccsp/hal/source/ethsw' if (os.path.isdir('${RDK_ROOT_PATH}/rdkb/components/opensource/ccsp/hal/source/ethsw/devices_turris')) else ''}"
-EXTERNALSRC_pn-hal-platform-generic = "${@'${RDK_ROOT_PATH}/rdkb/components/opensource/ccsp/hal/source/platform' if (os.path.isdir('${RDK_ROOT_PATH}/rdkb/components/opensource/ccsp/hal/source/platform/devices_turris')) else ''}"
-EXTERNALSRC_pn-hal-wifi-turris = "${@'${RDK_ROOT_PATH}/rdkb/devices/turris/hal/source/wifi' if (os.path.isdir('${RDK_ROOT_PATH}/rdkb/devices/turris/hal')) else ''}"
+EXTERNALSRC_pn-hal-dhcpv4c-generic = "${@'${RDK_ROOT_PATH}/rdkb/components/opensource/ccsp/hal/source/dhcpv4c' if (os.path.isdir('${RDK_ROOT_PATH}/rdkb/components/opensource/ccsp/hal/source/dhcpv4c/rdkb_hal')) else ''}"
+EXTERNALSRC_pn-hal-ethsw-generic = "${@'${RDK_ROOT_PATH}/rdkb/components/opensource/ccsp/hal/source/ethsw' if (os.path.isdir('${RDK_ROOT_PATH}/rdkb/components/opensource/ccsp/hal/source/ethsw/rdkb_hal')) else ''}"
+EXTERNALSRC_pn-hal-platform-generic = "${@'${RDK_ROOT_PATH}/rdkb/components/opensource/ccsp/hal/source/platform' if (os.path.isdir('${RDK_ROOT_PATH}/rdkb/components/opensource/ccsp/hal/source/platform/rdkb_hal')) else ''}"
+#EXTERNALSRC_pn-hal-wifi-turris = "${@'${RDK_ROOT_PATH}/rdkb/devices/turris/hal/source/wifi' if (os.path.isdir('${RDK_ROOT_PATH}/rdkb/devices/turris/hal')) else ''}"
diff --git a/conf/layer.conf b/conf/layer.conf
index 15de589..4b88da4 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -11,5 +11,5 @@
LAYERSERIES_COMPAT_cmf-filogic = "dunfell"
-require conf/distro/include/rdk-turris.inc
+require conf/distro/include/rdk-filogic.inc
#require conf/include/rdk-external-src-platform.inc
diff --git a/conf/machine/filogic830-32bit.conf b/conf/machine/filogic830-32bit.conf
index f120eb3..b1c7f99 100644
--- a/conf/machine/filogic830-32bit.conf
+++ b/conf/machine/filogic830-32bit.conf
@@ -10,7 +10,7 @@
MACHINE_IMAGE_NAME = "rdkb-generic-broadband-image"
-MACHINEOVERRIDES .= ":broadband:turris:filogic-32bit:mt7986-32bit"
+MACHINEOVERRIDES .= ":broadband:filogic-32bit:mt7986-32bit"
PREFERRED_VERSION_xfsprogs = "4.8.0"
PREFERRED_VERSION_php_dunfell = "7.1.%"
@@ -23,7 +23,7 @@
PREFERRED_VERSION_wpa-supplicant = "2.10"
#masking files for dunfell build
-require conf/include/turris-bbmasks.inc
+require conf/include/filogic-bbmasks.inc
#require conf/include/rdk-external-src-platform.inc
DISTRO_FEATURES_append = " meshwifi"
diff --git a/conf/machine/filogic830.conf b/conf/machine/filogic830.conf
index a76aa0c..468f92e 100644
--- a/conf/machine/filogic830.conf
+++ b/conf/machine/filogic830.conf
@@ -10,7 +10,7 @@
MACHINE_IMAGE_NAME = "rdkb-generic-broadband-image"
-MACHINEOVERRIDES .= ":broadband:turris:filogic:mt7986"
+MACHINEOVERRIDES .= ":broadband:filogic:mt7986"
PREFERRED_VERSION_xfsprogs = "4.8.0"
PREFERRED_VERSION_php_dunfell = "7.1.%"
@@ -23,7 +23,7 @@
PREFERRED_VERSION_wpa-supplicant = "2.10"
#masking files for dunfell build
-require conf/include/turris-bbmasks.inc
+require conf/include/filogic-bbmasks.inc
#require conf/include/rdk-external-src-platform.inc
DISTRO_FEATURES_append = " meshwifi"