From 63cd3332b5ef56dd418ba105a7f517315f67b6fe Mon Sep 17 00:00:00 2001 From: Davide Garberi Date: Wed, 10 Jan 2018 22:53:21 +0100 Subject: msm8996-common: rootdir: Move init scripts to vendor [1/2] Signed-off-by: Davide Garberi --- rootdir/Android.mk | 33 +++++++++++++++++++-------------- rootdir/etc/init.qcom.bt.sh | 2 +- rootdir/etc/init.qcom.rc | 10 +++++----- rootdir/etc/init.qcom.usb.rc | 4 ++-- rootdir/etc/init.qcom.usb.sh | 2 +- 5 files changed, 28 insertions(+), 23 deletions(-) (limited to 'rootdir') diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 80c5bb0..387615e 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -7,7 +7,7 @@ LOCAL_MODULE := fstab.qcom LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/fstab.qcom -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) +LOCAL_VENDOR_MODULE := true include $(BUILD_PREBUILT) include $(CLEAR_VARS) @@ -15,7 +15,8 @@ LOCAL_MODULE := init.qcom.power.rc LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/init.qcom.power.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) +LOCAL_VENDOR_MODULE := true +LOCAL_MODULE_RELATIVE_PATH := init/hw include $(BUILD_PREBUILT) include $(CLEAR_VARS) @@ -23,7 +24,8 @@ LOCAL_MODULE := init.qcom.rc LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/init.qcom.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) +LOCAL_VENDOR_MODULE := true +LOCAL_MODULE_RELATIVE_PATH := init/hw include $(BUILD_PREBUILT) include $(CLEAR_VARS) @@ -31,37 +33,40 @@ LOCAL_MODULE := init.qcom.usb.rc LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/init.qcom.usb.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) +LOCAL_VENDOR_MODULE := true +LOCAL_MODULE_RELATIVE_PATH := init/hw include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := init.qcom.usb.sh LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_SRC_FILES := etc/init.qcom.usb.sh -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) +LOCAL_VENDOR_MODULE := true include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := init.qcom.bt.sh LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_SRC_FILES := etc/init.qcom.bt.sh -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) +LOCAL_VENDOR_MODULE := true include $(BUILD_PREBUILT) include $(CLEAR_VARS) -LOCAL_MODULE := init.safailnet.rc -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/init.safailnet.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) +LOCAL_MODULE := init.safailnet.rc +LOCAL_MODULE_TAGS := optional eng +LOCAL_MODULE_CLASS := ETC +LOCAL_SRC_FILES := etc/init.safailnet.rc +LOCAL_VENDOR_MODULE := true +LOCAL_MODULE_RELATIVE_PATH := init/hw include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := ueventd.qcom.rc +LOCAL_MODULE_STEM := ueventd.rc LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/ueventd.qcom.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR) include $(BUILD_PREBUILT) diff --git a/rootdir/etc/init.qcom.bt.sh b/rootdir/etc/init.qcom.bt.sh index 100859c..6a967a1 100755 --- a/rootdir/etc/init.qcom.bt.sh +++ b/rootdir/etc/init.qcom.bt.sh @@ -1,4 +1,4 @@ -#!/system/bin/sh +#!/vendor/bin/sh # Copyright (c) 2009-2013, The Linux Foundation. All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 936a913..2c3bbc4 100755 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -24,9 +24,9 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -import init.qcom.power.rc -import init.qcom.usb.rc -import init.safailnet.rc +import /vendor/etc/init/hw/init.qcom.power.rc +import /vendor/etc/init/hw/init.qcom.usb.rc +import /vendor/etc/init/hw/init.safailnet.rc on early-init mount debugfs debugfs /sys/kernel/debug @@ -79,7 +79,7 @@ on fs wait /dev/block/platform/soc/${ro.boot.bootdevice} symlink /dev/block/platform/soc/${ro.boot.bootdevice} /dev/block/bootdevice restorecon_recursive /dev/block/platform/soc/${ro.boot.bootdevice} - mount_all fstab.qcom + mount_all /vendor/etc/fstab.qcom # Restorecon restorecon_recursive /persist @@ -709,7 +709,7 @@ on property:sys.boot_completed=1 write /dev/kmsg "Boot completed " # Enable ZRAM on boot_complete - swapon_all fstab.qcom + swapon_all /vendor/etc/fstab.qcom # end boot time fs tune write /sys/block/sda/queue/read_ahead_kb 128 diff --git a/rootdir/etc/init.qcom.usb.rc b/rootdir/etc/init.qcom.usb.rc index 890ff8d..63a8886 100755 --- a/rootdir/etc/init.qcom.usb.rc +++ b/rootdir/etc/init.qcom.usb.rc @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -import init.zuk.usb.rc +import /vendor/etc/init/hw/init.zuk.usb.rc on init write /sys/class/android_usb/android0/f_rndis/wceis 1 @@ -38,7 +38,7 @@ on fs mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=2000 write /sys/class/android_usb/android0/f_ffs/aliases adb -service qcom-usb-sh /system/bin/sh /init.qcom.usb.sh +service qcom-usb-sh /vendor/bin/init.qcom.usb.sh class core user root oneshot diff --git a/rootdir/etc/init.qcom.usb.sh b/rootdir/etc/init.qcom.usb.sh index e0e6f1d..87ef476 100755 --- a/rootdir/etc/init.qcom.usb.sh +++ b/rootdir/etc/init.qcom.usb.sh @@ -1,4 +1,4 @@ -#!/system/bin/sh +#!/vendor/bin/sh # Copyright (c) 2012, The Linux Foundation. All rights reserved. # # Redistribution and use in source and binary forms, with or without -- cgit v1.2.3