diff --git a/flavours/linux/local.conf.sample b/flavours/linux/local.conf.sample index 09bd77f753db8c1846601c0347e5751e38421564..4af9c3bcfcca569544af2371ee802c73f499726f 100644 --- a/flavours/linux/local.conf.sample +++ b/flavours/linux/local.conf.sample @@ -74,7 +74,7 @@ MACHINE ??= "qemux86-64" # # Default policy config # -DISTRO ?= "allscenarios-linux" +DISTRO ?= "oniro-linux" # # Package Management configuration diff --git a/flavours/zephyr/local.conf.sample b/flavours/zephyr/local.conf.sample index dd2834beddc5627af5ae551eecc004b85db3baa4..9af9a98e7f0d295fe59fee9450ed2ce4a130f5bb 100644 --- a/flavours/zephyr/local.conf.sample +++ b/flavours/zephyr/local.conf.sample @@ -78,7 +78,7 @@ MACHINE ??= "qemu-x86" # # Default policy config # -DISTRO ?= "allscenarios-zephyr" +DISTRO ?= "oniro-zephyr" # # Package Management configuration diff --git a/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-dashboard.conf b/meta-ohos-blueprints/conf/distro/oniro-linux-blueprint-dashboard.conf similarity index 94% rename from meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-dashboard.conf rename to meta-ohos-blueprints/conf/distro/oniro-linux-blueprint-dashboard.conf index 9d822514e811d79d7b36b9159eeb70dba11c5e0e..d1eb8ec6d58a411d677291e887e14d2007742ede 100644 --- a/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-dashboard.conf +++ b/meta-ohos-blueprints/conf/distro/oniro-linux-blueprint-dashboard.conf @@ -4,12 +4,12 @@ # Distro configuration for the dashboard blueprint -require conf/distro/allscenarios-linux.conf +require conf/distro/oniro-linux.conf include conf/distro/include/ha-versions.inc PREFERRED_VERSION_python3-pymetno = "0.7.0" -DISTRO = "allscenarios-linux-blueprint-dashboard" +DISTRO = "oniro-linux-blueprint-dashboard" DISTRO_NAME = "Oniro Project Dashboard Blueprint Linux Distro" # Custom hostnames for easy DNS resolution for this blueprint. diff --git a/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-gateway.conf b/meta-ohos-blueprints/conf/distro/oniro-linux-blueprint-gateway.conf similarity index 92% rename from meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-gateway.conf rename to meta-ohos-blueprints/conf/distro/oniro-linux-blueprint-gateway.conf index baaf32e4807c651d0e808eeaacdf53be86c43327..716e4e002918ac2a842535ce1ae9ff62d1f3ce93 100644 --- a/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-gateway.conf +++ b/meta-ohos-blueprints/conf/distro/oniro-linux-blueprint-gateway.conf @@ -4,9 +4,9 @@ # Distro configuration for the dashboard blueprint -require conf/distro/allscenarios-linux.conf +require conf/distro/oniro-linux.conf -DISTRO = "allscenarios-linux-blueprint-gateway" +DISTRO = "oniro-linux-blueprint-gateway" DISTRO_NAME = "Oniro Project Gateway Blueprint Linux Distro" # Custom hostnames for easy DNS resolution for this blueprint. diff --git a/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-vending-machine.conf b/meta-ohos-blueprints/conf/distro/oniro-linux-blueprint-vending-machine.conf similarity index 83% rename from meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-vending-machine.conf rename to meta-ohos-blueprints/conf/distro/oniro-linux-blueprint-vending-machine.conf index 6ba5d2484f70c2f3542d952faf99d0b42d50eb55..6ebb8c5b4b6c4496a6134bb98a5ce626cd381a5f 100644 --- a/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-vending-machine.conf +++ b/meta-ohos-blueprints/conf/distro/oniro-linux-blueprint-vending-machine.conf @@ -4,9 +4,9 @@ # Distro configuration for the vending-machine blueprint -require conf/distro/allscenarios-linux.conf +require conf/distro/oniro-linux.conf -DISTRO = "allscenarios-linux-blueprint-vending-machine" +DISTRO = "oniro-linux-blueprint-vending-machine" DISTRO_NAME = "Oniro Project Vending-Machine Blueprint Linux Distro" # With our layer setup we would add any bbappend found from our diff --git a/meta-ohos-blueprints/conf/distro/allscenarios-linux-demo-dashboard.conf b/meta-ohos-blueprints/conf/distro/oniro-linux-demo-dashboard.conf similarity index 56% rename from meta-ohos-blueprints/conf/distro/allscenarios-linux-demo-dashboard.conf rename to meta-ohos-blueprints/conf/distro/oniro-linux-demo-dashboard.conf index e178c7fa6e56eff272969087d4ec2eb5e300c9bf..021266b33dfb79376c845e111342f1dc5b6edd86 100644 --- a/meta-ohos-blueprints/conf/distro/allscenarios-linux-demo-dashboard.conf +++ b/meta-ohos-blueprints/conf/distro/oniro-linux-demo-dashboard.conf @@ -3,9 +3,9 @@ # SPDX-License-Identifier: Apache-2.0 # Deprecated distro configuration in favour of -# allscenarios-linux-blueprint-dashboard +# oniro-linux-blueprint-dashboard -require conf/distro/allscenarios-linux-blueprint-dashboard.conf +require conf/distro/oniro-linux-blueprint-dashboard.conf # We keep the old distro name to sanity check this deprecation. -DISTRO = "allscenarios-linux-demo-dashboard" +DISTRO = "oniro-linux-demo-dashboard" diff --git a/meta-ohos-blueprints/conf/distro/allscenarios-zephyr-blueprint-dashboard.conf b/meta-ohos-blueprints/conf/distro/oniro-zephyr-blueprint-dashboard.conf similarity index 87% rename from meta-ohos-blueprints/conf/distro/allscenarios-zephyr-blueprint-dashboard.conf rename to meta-ohos-blueprints/conf/distro/oniro-zephyr-blueprint-dashboard.conf index 39009eb54138049a8c2fabfdf807edb773f4fe54..ab4b367fec50a2c0654ee168ca0c5bb450ab89a8 100644 --- a/meta-ohos-blueprints/conf/distro/allscenarios-zephyr-blueprint-dashboard.conf +++ b/meta-ohos-blueprints/conf/distro/oniro-zephyr-blueprint-dashboard.conf @@ -4,9 +4,9 @@ # Distro configuration for the dashboard blueprint -require conf/distro/allscenarios-zephyr.conf +require conf/distro/oniro-zephyr.conf -DISTRO = "allscenarios-zephyr-blueprint-dashboard" +DISTRO = "oniro-zephyr-blueprint-dashboard" DISTRO_NAME = "Oniro Project Dashboard Blueprint Zephyr Distro" # With our layer setup we would add any bbappend found from our diff --git a/meta-ohos-core/conf/distro/include/allscenarios.inc b/meta-ohos-core/conf/distro/include/oniro.inc similarity index 100% rename from meta-ohos-core/conf/distro/include/allscenarios.inc rename to meta-ohos-core/conf/distro/include/oniro.inc diff --git a/meta-ohos-core/conf/distro/allscenarios-linux.conf b/meta-ohos-core/conf/distro/oniro-linux.conf similarity index 94% rename from meta-ohos-core/conf/distro/allscenarios-linux.conf rename to meta-ohos-core/conf/distro/oniro-linux.conf index ce8f43e8031297f342be64c60542d7fd8de5e9e7..ba597f20371c79172f746b48ea90ce6c2a04e589 100644 --- a/meta-ohos-core/conf/distro/allscenarios-linux.conf +++ b/meta-ohos-core/conf/distro/oniro-linux.conf @@ -2,11 +2,11 @@ # # SPDX-License-Identifier: Apache-2.0 -require conf/distro/include/allscenarios.inc +require conf/distro/include/oniro.inc require conf/distro/include/oniro-wic.inc require conf/distro/poky.conf -DISTRO = "allscenarios-linux" +DISTRO = "oniro-linux" DISTRO_NAME = "Oniro Project Base Linux Distro" DISTRO_VERSION = "1.0.0-beta" diff --git a/meta-ohos-core/conf/distro/allscenarios-zephyr.conf b/meta-ohos-core/conf/distro/oniro-zephyr.conf similarity index 71% rename from meta-ohos-core/conf/distro/allscenarios-zephyr.conf rename to meta-ohos-core/conf/distro/oniro-zephyr.conf index 628d6a564911f51987f0c14be67a27152240a221..8f58e51b01da709a5d5c594e9cf21d1a955b1160 100644 --- a/meta-ohos-core/conf/distro/allscenarios-zephyr.conf +++ b/meta-ohos-core/conf/distro/oniro-zephyr.conf @@ -2,9 +2,9 @@ # # SPDX-License-Identifier: Apache-2.0 -require conf/distro/include/allscenarios.inc +require conf/distro/include/oniro.inc require conf/distro/zephyr.conf -DISTRO = "allscenarios-zephyr" +DISTRO = "oniro-zephyr" DISTRO_NAME = "Oniro Project Base Zephyr Distro" DISTRO_VERSION = "1.0.0-beta"