From c28ecd7875135660cc50fb80b5c27d6f10e7636c Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Wed, 6 Jan 2021 20:13:48 +0100 Subject: [PATCH] sm8250-common: Decommonize fstab * 8T uses different metadata/userdata encryption algo. Change-Id: Ie19487d4b4efe17540dd8c018537d7e222f64abd --- BoardConfigCommon.mk | 1 - common.mk | 5 ---- rootdir/Android.mk | 8 ------ rootdir/etc/fstab.qcom | 55 ------------------------------------------ 4 files changed, 69 deletions(-) delete mode 100644 rootdir/etc/fstab.qcom diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index f39cbb1..29f430a 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -176,7 +176,6 @@ TARGET_TAP_TO_WAKE_NODE := "/proc/touchpanel/double_tap_enable" # Recovery BOARD_INCLUDE_DTB_IN_BOOTIMG := true BOARD_INCLUDE_RECOVERY_DTBO := true -TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab.qcom TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888" TARGET_USERIMAGES_USE_EXT4 := true TARGET_USERIMAGES_USE_F2FS := true diff --git a/common.mk b/common.mk index e01d76c..fd95a4d 100644 --- a/common.mk +++ b/common.mk @@ -200,7 +200,6 @@ PRODUCT_PACKAGES += \ # Common init scripts PRODUCT_PACKAGES += \ - fstab.qcom \ ftm_power_config.sh \ init.class_main.sh \ init.crda.sh \ @@ -409,10 +408,6 @@ PRODUCT_PACKAGES += \ libvndfwk_detect_jni.qti \ libvndfwk_detect_jni.qti.vendor -# Ramdisk -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/rootdir/etc/fstab.qcom:$(TARGET_COPY_OUT_RAMDISK)/fstab.qcom - # Remove unwanted packages PRODUCT_PACKAGES += \ RemovePackages diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 166b291..2b85938 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -128,14 +128,6 @@ LOCAL_SRC_FILES := bin/init.qti.qcv.sh LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_EXECUTABLES) include $(BUILD_PREBUILT) -include $(CLEAR_VARS) -LOCAL_MODULE := fstab.qcom -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/fstab.qcom -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC) -include $(BUILD_PREBUILT) - include $(CLEAR_VARS) LOCAL_MODULE := ftm_power_config.sh LOCAL_MODULE_TAGS := optional diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom deleted file mode 100644 index 7713edd..0000000 --- a/rootdir/etc/fstab.qcom +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted (subject to the limitations in the -# disclaimer below) provided that the following conditions are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# -# * Neither the name of The Linux Foundation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE -# GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT -# HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Android fstab file. -# The filesystem that contains the filesystem checker binary (typically /system) cannot -# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK - -# -system /system ext4 ro,barrier=1,discard wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey -system_ext /system_ext ext4 ro,barrier=1,discard wait,slotselect,avb=vbmeta_system,logical,first_stage_mount -product /product ext4 ro,barrier=1,discard wait,slotselect,avb=vbmeta_system,logical,first_stage_mount -vendor /vendor ext4 ro,barrier=1,discard wait,slotselect,avb,logical,first_stage_mount -odm /odm ext4 ro,barrier=1,discard wait,slotselect,avb,logical,first_stage_mount -/dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard,sync wait,check,formattable,wrappedkey,first_stage_mount -/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,inlinecrypt latemount,wait,check,formattable,fileencryption=ice,wrappedkey,keydirectory=/metadata/vold/metadata_encryption,quota,reservedsize=512M,sysfs_path=/sys/devices/platform/soc/1d84000.ufshc,checkpoint=fs -/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 noatime,nosuid,nodev,barrier=1 wait -/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults -#/devices/platform/soc/8804000.sdhci/mmc_host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto,encryptable=footer -#/devices/platform/soc/1da4000.ufshc_card/host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto,encryptable=footer -/devices/platform/soc/*.ssusb/*.dwc3/xhci-hcd.*.auto* /storage/usbotg vfat nosuid,nodev wait,voldmanaged=usbotg:auto -#/dev/block/bootdevice/by-name/spunvm /mnt/vendor/spunvm vfat rw,shortname=lower,uid=1000,gid=1000,dmask=007,fmask=007,context=u:object_r:spunvm_file:s0 wait -/dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect -/dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nosuid,nodev,barrier=1 wait,slotselect -/dev/block/bootdevice/by-name/bluetooth /vendor/bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait,slotselect -/dev/block/bootdevice/by-name/op2 /mnt/vendor/op2 ext4 noatime,nosuid,nodev,barrier=1,data=ordered wait,check -