From 63f23f61f0d4049b73ac2ecd1fb523334c1a009e Mon Sep 17 00:00:00 2001
From: handyohos <zhangxiaotian@huawei.com>
Date: Tue, 26 Apr 2022 18:40:34 +0800
Subject: [PATCH] bugfix: qemu-arm-linux does not import vendor init cfg files.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1）vendor中的启动配置文件名称为init.xxx.cfg
3）修改cfg文件中的json格式，确保格式正确

Signed-off-by: handyohos <zhangxiaotian@huawei.com>
Change-Id: I90b3623a155384ef248dbceed125b823e6896380
---
 arm_virt/linux/rootfs/BUILD.gn                              | 4 ++--
 .../{qemu.arm.linux.init.cfg => init.qemu.arm.linux.cfg}    | 6 +++---
 .../{qemu.arm.linux.usb.cfg => init.qemu.arm.linux.usb.cfg} | 0
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename arm_virt/linux/rootfs/{qemu.arm.linux.init.cfg => init.qemu.arm.linux.cfg} (82%)
 rename arm_virt/linux/rootfs/{qemu.arm.linux.usb.cfg => init.qemu.arm.linux.usb.cfg} (100%)

diff --git a/arm_virt/linux/rootfs/BUILD.gn b/arm_virt/linux/rootfs/BUILD.gn
index 84f904f..1365abc 100644
--- a/arm_virt/linux/rootfs/BUILD.gn
+++ b/arm_virt/linux/rootfs/BUILD.gn
@@ -13,7 +13,7 @@
 import("//build/ohos.gni")
 
 ohos_prebuilt_etc("qemu.arm.linux.init.cfg") {
-  source = "qemu.arm.linux.init.cfg"
+  source = "init.qemu.arm.linux.cfg"
   if (!enable_ramdisk) {
     install_images = [ "system" ]
   } else {
@@ -23,7 +23,7 @@ ohos_prebuilt_etc("qemu.arm.linux.init.cfg") {
 }
 
 ohos_prebuilt_etc("qemu.arm.linux.usb.cfg") {
-  source = "qemu.arm.linux.usb.cfg"
+  source = "init.qemu.arm.linux.usb.cfg"
   if (!enable_ramdisk) {
     install_images = [ "system" ]
   } else {
diff --git a/arm_virt/linux/rootfs/qemu.arm.linux.init.cfg b/arm_virt/linux/rootfs/init.qemu.arm.linux.cfg
similarity index 82%
rename from arm_virt/linux/rootfs/qemu.arm.linux.init.cfg
rename to arm_virt/linux/rootfs/init.qemu.arm.linux.cfg
index 78b348b..e3777e2 100644
--- a/arm_virt/linux/rootfs/qemu.arm.linux.init.cfg
+++ b/arm_virt/linux/rootfs/init.qemu.arm.linux.cfg
@@ -1,6 +1,6 @@
 {
     "import" : [
-            "qemu.arm.linux.usb.cfg"
+            "init.qemu.arm.linux.usb.cfg"
     ],
     "jobs" : [{
             "name" : "pre-init",
@@ -10,7 +10,7 @@
         }, {
             "name" : "init",
             "cmds" : [
-                "mount debugfs /sys/kernel/debug /sys/kernel/debug mode=755",
+                "mount debugfs /sys/kernel/debug /sys/kernel/debug mode=755"
             ]
         }, {
             "name" : "fs",
@@ -21,7 +21,7 @@
             "cmds" : [
                 "chmod 777 /dev/ttyAMA2",
                 "chmod 0440 /proc/interrupts",
-                "chmod 0440 /proc/stat",
+                "chmod 0440 /proc/stat"
             ]
         }
     ]
diff --git a/arm_virt/linux/rootfs/qemu.arm.linux.usb.cfg b/arm_virt/linux/rootfs/init.qemu.arm.linux.usb.cfg
similarity index 100%
rename from arm_virt/linux/rootfs/qemu.arm.linux.usb.cfg
rename to arm_virt/linux/rootfs/init.qemu.arm.linux.usb.cfg
-- 
Gitee