From d7e3487eac6027b6d6fc768dfa2658534c9b8be7 Mon Sep 17 00:00:00 2001
From: Dhina17 <dhinalogu@gmail.com>
Date: Sat, 7 Mar 2020 11:33:43 +0530
Subject: [PATCH] onclite: Rearrange rootdir

Signed-off-by: Dhina17 <dhinalogu@gmail.com>
---
 BoardConfig.mk                               |  2 +-
 rootdir/Android.mk                           | 24 ++++++++++----------
 rootdir/{etc => bin}/init.qcom.early_boot.sh |  0
 rootdir/{etc => bin}/init.qcom.post_boot.sh  |  0
 rootdir/{ => bin}/init.qcom.sh               |  0
 rootdir/{etc => bin}/move_time_data.sh       |  0
 rootdir/{etc => bin}/move_wifi_data.sh       |  0
 rootdir/{ => etc}/fstab.qcom                 |  0
 rootdir/{ => etc}/init.msm.usb.configfs.rc   |  0
 rootdir/{ => etc}/init.onclite.rc            |  0
 rootdir/{ => etc}/init.qcom.rc               |  0
 rootdir/{ => etc}/init.qcom.usb.rc           |  0
 rootdir/{ => etc}/init.target.rc             |  0
 rootdir/{ => etc}/ueventd.qcom.rc            |  0
 14 files changed, 13 insertions(+), 13 deletions(-)
 rename rootdir/{etc => bin}/init.qcom.early_boot.sh (100%)
 rename rootdir/{etc => bin}/init.qcom.post_boot.sh (100%)
 rename rootdir/{ => bin}/init.qcom.sh (100%)
 rename rootdir/{etc => bin}/move_time_data.sh (100%)
 rename rootdir/{etc => bin}/move_wifi_data.sh (100%)
 rename rootdir/{ => etc}/fstab.qcom (100%)
 rename rootdir/{ => etc}/init.msm.usb.configfs.rc (100%)
 rename rootdir/{ => etc}/init.onclite.rc (100%)
 rename rootdir/{ => etc}/init.qcom.rc (100%)
 rename rootdir/{ => etc}/init.qcom.usb.rc (100%)
 rename rootdir/{ => etc}/init.target.rc (100%)
 rename rootdir/{ => etc}/ueventd.qcom.rc (100%)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index b6cf725..e125b8f 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -189,7 +189,7 @@ ENABLE_VENDOR_RIL_SERVICE := true
 TARGET_PROVIDES_QTI_TELEPHONY_JAR := true
 
 # Recovery
-TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/fstab.qcom
+TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.qcom
 
 # Releasetools
 TARGET_RELEASETOOLS_EXTENSIONS := $(DEVICE_PATH)
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 95137c2..48be1b5 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -6,7 +6,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE       := fstab.qcom
 LOCAL_MODULE_TAGS  := optional
 LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := fstab.qcom
+LOCAL_SRC_FILES    := etc/fstab.qcom
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)
 include $(BUILD_PREBUILT)
 
@@ -14,7 +14,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE	   := init.msm.usb.configfs.rc
 LOCAL_MODULE_TAGS  := optional
 LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := init.msm.usb.configfs.rc
+LOCAL_SRC_FILES    := etc/init.msm.usb.configfs.rc
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/init/hw
 include $(BUILD_PREBUILT)
 
@@ -22,7 +22,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE       := init.onclite.rc
 LOCAL_MODULE_TAGS  := optional
 LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := init.onclite.rc
+LOCAL_SRC_FILES    := etc/init.onclite.rc
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/init
 include $(BUILD_PREBUILT)
 
@@ -30,7 +30,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE       := init.qcom.rc
 LOCAL_MODULE_TAGS  := optional
 LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := init.qcom.rc
+LOCAL_SRC_FILES    := etc/init.qcom.rc
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/init/hw
 include $(BUILD_PREBUILT)
 
@@ -38,7 +38,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE       := init.qcom.sh
 LOCAL_MODULE_TAGS  := optional
 LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := init.qcom.sh
+LOCAL_SRC_FILES    := bin/init.qcom.sh
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_EXECUTABLES)
 include $(BUILD_PREBUILT)
 
@@ -46,7 +46,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE       := init.target.rc
 LOCAL_MODULE_TAGS  := optional
 LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := init.target.rc
+LOCAL_SRC_FILES    := etc/init.target.rc
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/init/hw
 include $(BUILD_PREBUILT)
 
@@ -55,7 +55,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE       := init.qcom.usb.rc
 LOCAL_MODULE_TAGS  := optional
 LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := init.qcom.usb.rc
+LOCAL_SRC_FILES    := etc/init.qcom.usb.rc
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/init/hw
 include $(BUILD_PREBUILT)
 
@@ -64,7 +64,7 @@ LOCAL_MODULE       := ueventd.qcom.rc
 LOCAL_MODULE_STEM  := ueventd.rc
 LOCAL_MODULE_TAGS  := optional
 LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := ueventd.qcom.rc
+LOCAL_SRC_FILES    := etc/ueventd.qcom.rc
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR)
 include $(BUILD_PREBUILT)
 
@@ -82,7 +82,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE       := init.qcom.early_boot.sh
 LOCAL_MODULE_TAGS  := optional
 LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := etc/init.qcom.early_boot.sh
+LOCAL_SRC_FILES    := bin/init.qcom.early_boot.sh
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_EXECUTABLES)
 include $(BUILD_PREBUILT)
 
@@ -90,7 +90,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE       := init.qcom.post_boot.sh
 LOCAL_MODULE_TAGS  := optional
 LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := etc/init.qcom.post_boot.sh
+LOCAL_SRC_FILES    := bin/init.qcom.post_boot.sh
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_EXECUTABLES)
 include $(BUILD_PREBUILT)
 
@@ -98,7 +98,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE	   := move_time_data.sh
 LOCAL_MODULE_TAGS  := optional
 LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := etc/move_time_data.sh
+LOCAL_SRC_FILES    := bin/move_time_data.sh
 LOCAL_MODULE_PATH  := $(TARGET_OUT_EXECUTABLES)
 include $(BUILD_PREBUILT)
 
@@ -106,6 +106,6 @@ include $(CLEAR_VARS)
 LOCAL_MODULE       := move_wifi_data.sh
 LOCAL_MODULE_TAGS  := optional
 LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := etc/move_wifi_data.sh
+LOCAL_SRC_FILES    := bin/move_wifi_data.sh
 LOCAL_MODULE_PATH  := $(TARGET_OUT_EXECUTABLES)
 include $(BUILD_PREBUILT)
diff --git a/rootdir/etc/init.qcom.early_boot.sh b/rootdir/bin/init.qcom.early_boot.sh
similarity index 100%
rename from rootdir/etc/init.qcom.early_boot.sh
rename to rootdir/bin/init.qcom.early_boot.sh
diff --git a/rootdir/etc/init.qcom.post_boot.sh b/rootdir/bin/init.qcom.post_boot.sh
similarity index 100%
rename from rootdir/etc/init.qcom.post_boot.sh
rename to rootdir/bin/init.qcom.post_boot.sh
diff --git a/rootdir/init.qcom.sh b/rootdir/bin/init.qcom.sh
similarity index 100%
rename from rootdir/init.qcom.sh
rename to rootdir/bin/init.qcom.sh
diff --git a/rootdir/etc/move_time_data.sh b/rootdir/bin/move_time_data.sh
similarity index 100%
rename from rootdir/etc/move_time_data.sh
rename to rootdir/bin/move_time_data.sh
diff --git a/rootdir/etc/move_wifi_data.sh b/rootdir/bin/move_wifi_data.sh
similarity index 100%
rename from rootdir/etc/move_wifi_data.sh
rename to rootdir/bin/move_wifi_data.sh
diff --git a/rootdir/fstab.qcom b/rootdir/etc/fstab.qcom
similarity index 100%
rename from rootdir/fstab.qcom
rename to rootdir/etc/fstab.qcom
diff --git a/rootdir/init.msm.usb.configfs.rc b/rootdir/etc/init.msm.usb.configfs.rc
similarity index 100%
rename from rootdir/init.msm.usb.configfs.rc
rename to rootdir/etc/init.msm.usb.configfs.rc
diff --git a/rootdir/init.onclite.rc b/rootdir/etc/init.onclite.rc
similarity index 100%
rename from rootdir/init.onclite.rc
rename to rootdir/etc/init.onclite.rc
diff --git a/rootdir/init.qcom.rc b/rootdir/etc/init.qcom.rc
similarity index 100%
rename from rootdir/init.qcom.rc
rename to rootdir/etc/init.qcom.rc
diff --git a/rootdir/init.qcom.usb.rc b/rootdir/etc/init.qcom.usb.rc
similarity index 100%
rename from rootdir/init.qcom.usb.rc
rename to rootdir/etc/init.qcom.usb.rc
diff --git a/rootdir/init.target.rc b/rootdir/etc/init.target.rc
similarity index 100%
rename from rootdir/init.target.rc
rename to rootdir/etc/init.target.rc
diff --git a/rootdir/ueventd.qcom.rc b/rootdir/etc/ueventd.qcom.rc
similarity index 100%
rename from rootdir/ueventd.qcom.rc
rename to rootdir/etc/ueventd.qcom.rc
-- 
GitLab