From 763d7c3e3fe5f27d7fd561cea654b3f2421e1dfe Mon Sep 17 00:00:00 2001 From: David Rouleau Date: Mon, 7 Jul 2014 11:36:58 -0400 Subject: [PATCH 01/12] Revert "Switched to new fstab setup" This reverts commit feef3e7e126b20f3af28bb9d974105084d2fce4c. --- BoardConfig.mk | 1 - device_peregrine.mk | 8 -------- recovery.fstab | 38 ++++++++++++++++++++++++++++++++++++++ rootdir/Android.mk | 10 ---------- rootdir/etc/fstab.qcom | 15 --------------- rootdir/etc/twrp.fstab | 8 -------- 6 files changed, 38 insertions(+), 42 deletions(-) create mode 100644 recovery.fstab delete mode 100644 rootdir/Android.mk delete mode 100644 rootdir/etc/fstab.qcom delete mode 100644 rootdir/etc/twrp.fstab diff --git a/BoardConfig.mk b/BoardConfig.mk index 028c4d0..f047fb6 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -29,7 +29,6 @@ LOCAL_PATH := device/motorola/perergine BOARD_CUSTOM_BOOTIMG_MK := device/motorola/peregrine/mkbootimg.mk -TARGET_RECOVERY_FSTAB := $(LOCAL_PATH)/rootdir/etc/fstab.qcom # fix this up by examining /proc/mtd on a running device BOARD_USERDATAIMAGE_PARTITION_SIZE := 8589934592 diff --git a/device_peregrine.mk b/device_peregrine.mk index d862e3f..20d3f7a 100644 --- a/device_peregrine.mk +++ b/device_peregrine.mk @@ -9,14 +9,6 @@ DEVICE_PACKAGE_OVERLAYS += device/motorola/peregrine/overlay $(call inherit-product, build/target/product/full.mk) -# Ramdisk -PRODUCT_PACKAGES += \ - fstab.qcom - -# TWRP -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/rootdir/etc/twrp.fstab:recovery/root/etc/twrp.fstab - PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0 PRODUCT_NAME := full_peregrine PRODUCT_DEVICE := peregrine diff --git a/recovery.fstab b/recovery.fstab new file mode 100644 index 0000000..402de79 --- /dev/null +++ b/recovery.fstab @@ -0,0 +1,38 @@ +# Copyright (c) 2011, The Linux Foundation. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted 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. +# +# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 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. + +# mount point fstype device [device2] [length=] + +boot /boot emmc defaults defaults +cache /cache ext4 noatime,nosuid,nodev,barrier=1,data=ordered wait,check +misc /misc emmc defaults defaults +recovery /recovery emmc defaults defaults +userdata /data f2fs noatime,nosuid,nodev,barrier=1,data=ordered,noauto_da_alloc wait,check +system /system ext4 ro,barrier=1 wait +modem /modem ext4 defaults defaults +customize /customize ext4 defaults defaults + diff --git a/rootdir/Android.mk b/rootdir/Android.mk deleted file mode 100644 index 4477b0f..0000000 --- a/rootdir/Android.mk +++ /dev/null @@ -1,10 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -include $(CLEAR_VARS) -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) -include $(BUILD_PREBUILT) diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom deleted file mode 100644 index 93efb3b..0000000 --- a/rootdir/etc/fstab.qcom +++ /dev/null @@ -1,15 +0,0 @@ -# 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 -# -/dev/block/platform/msm_sdcc.1/by-name/system /system ext4 ro,barrier=1 wait -/dev/block/platform/msm_sdcc.1/by-name/userdata /data f2fs rw,discard,nosuid,nodev,noatime,nodiratime,inline_xattr,errors=recover wait,nonremovable,encryptable=footer,length=-16384 -/dev/block/platform/msm_sdcc.1/by-name/cache /cache ext4 rw,nosuid,nodev,noatime,nodiratime,data=writeback,noauto_da_alloc,barrier=1 wait,check -/dev/block/platform/msm_sdcc.1/by-name/fsg /fsg ext4 defaults recoveryonly -/dev/block/platform/msm_sdcc.1/by-name/modem /firmware ext4 defaults recoveryonly -/dev/block/platform/msm_sdcc.1/by-name/persist /persist ext4 defaults recoveryonly -/dev/block/platform/msm_sdcc.1/by-name/boot /boot emmc defaults recoveryonly -/dev/block/platform/msm_sdcc.1/by-name/recovery /recovery emmc defaults recoveryonly -/devices/platform/msm_sdcc.3/mmc_host/mmc1 auto auto defaults voldmanaged=sdcard1:auto -/devices/platform/msm_hsusb_host auto auto defaults voldmanaged=usbdisk:auto -/dev/block/zram0 none swap defaults zramsize=134217728 diff --git a/rootdir/etc/twrp.fstab b/rootdir/etc/twrp.fstab deleted file mode 100644 index 50653bf..0000000 --- a/rootdir/etc/twrp.fstab +++ /dev/null @@ -1,8 +0,0 @@ -# mount point fstype device - -/data f2fs /dev/block/platform/msm_sdcc.1/by-name/userdata flags=fsflags="inline_xattr" -/cache ext4 /dev/block/platform/msm_sdcc.1/by-name/cache -/system ext4 /dev/block/platform/msm_sdcc.1/by-name/system -/boot emmc /dev/block/platform/msm_sdcc.1/by-name/boot -/recovery emmc /dev/block/platform/msm_sdcc.1/by-name/recovery -/external_sd vfat /dev/block/mmcblk1p1 /dev/block/mmcblk1 flags=display="Micro SDcard";storage;wipeingui;removable From 25d8f3af22befae477d9265cea066e4efe581ba9 Mon Sep 17 00:00:00 2001 From: David Rouleau Date: Tue, 15 Jul 2014 16:54:06 -0400 Subject: [PATCH 02/12] CM Device tree bringup --- AndroidProducts.mk | 2 +- BoardConfig.mk | 1 + cm.mk | 17 ++++++---------- device-proprietary-files.txt | 2 ++ device_peregrine.mk | 20 +++++++++++-------- extract-files.sh | 10 ++++++++++ full_peregrine.mk | 36 ++++++++++++++++++++++++++++++++++ recovery.fstab | 38 ------------------------------------ system.prop | 1 + 9 files changed, 69 insertions(+), 58 deletions(-) create mode 100644 device-proprietary-files.txt create mode 100755 extract-files.sh create mode 100644 full_peregrine.mk delete mode 100644 recovery.fstab diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 1a06807..fd21ea7 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -1,2 +1,2 @@ PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/device_peregrine.mk + $(LOCAL_DIR)/full_peregrine.mk diff --git a/BoardConfig.mk b/BoardConfig.mk index f047fb6..f1e5aff 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -29,6 +29,7 @@ LOCAL_PATH := device/motorola/perergine BOARD_CUSTOM_BOOTIMG_MK := device/motorola/peregrine/mkbootimg.mk +BOARD_HAS_NO_MISC_PARTITION := true # fix this up by examining /proc/mtd on a running device BOARD_USERDATAIMAGE_PARTITION_SIZE := 8589934592 diff --git a/cm.mk b/cm.mk index cc2cfe4..2e02c6a 100644 --- a/cm.mk +++ b/cm.mk @@ -1,18 +1,13 @@ -## Specify phone tech before including full_phone -$(call inherit-product, vendor/cm/config/gsm.mk) - -# Release name -PRODUCT_RELEASE_NAME := peregrine - # Inherit some common CM stuff. $(call inherit-product, vendor/cm/config/common_full_phone.mk) +# Boot animation +TARGET_SCREEN_WIDTH := 720 +TARGET_SCREEN_HEIGHT := 1280 + # Inherit device configuration -$(call inherit-product, device/motorola/peregrine/device_peregrine.mk) +$(call inherit-product, device/motorola/peregrine/full_peregrine.mk) ## Device identifier. This must come after all inclusions -PRODUCT_DEVICE := peregrine +PRODUCT_RELEASE_NAME := peregrine PRODUCT_NAME := cm_peregrine -PRODUCT_BRAND := motorola -PRODUCT_MODEL := peregrine -PRODUCT_MANUFACTURER := motorola diff --git a/device-proprietary-files.txt b/device-proprietary-files.txt new file mode 100644 index 0000000..9aecffe --- /dev/null +++ b/device-proprietary-files.txt @@ -0,0 +1,2 @@ +# proprietary file list +# bin/filename diff --git a/device_peregrine.mk b/device_peregrine.mk index 20d3f7a..e7d71e6 100644 --- a/device_peregrine.mk +++ b/device_peregrine.mk @@ -1,14 +1,18 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk) -# The gps config appropriate for this device -$(call inherit-product, device/common/gps/gps_us_supl.mk) - $(call inherit-product-if-exists, vendor/motorola/peregrine/peregrine-vendor.mk) -DEVICE_PACKAGE_OVERLAYS += device/motorola/peregrine/overlay +LOCAL_PATH := device/motorola/peregrine -$(call inherit-product, build/target/product/full.mk) +# peregrine specific overlay +DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay -PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0 -PRODUCT_NAME := full_peregrine -PRODUCT_DEVICE := peregrine +PRODUCT_LOCALES := en_US +PRODUCT_LOCALES += xhdpi +PRODUCT_AAPT_CONFIG := normal hdpi xhdpi +PRODUCT_AAPT_PREF_CONFIG := xhdpi + +$(call inherit-product, frameworks/native/build/phone-xhdpi-1024-dalvik-heap.mk) + +$(call inherit-product, device/motorola/msm8226-common/msm8226.mk) +$(call inherit-product, device/motorola/msm8226-common/keylayout/keylayout.mk) diff --git a/extract-files.sh b/extract-files.sh new file mode 100755 index 0000000..246c631 --- /dev/null +++ b/extract-files.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +export VENDOR=motorola +export DEVICE=peregrine +# Comment these out if there is no common device tree for this device +export COMMON_DEVICE=msm8226-common +export BOARD_VENDOR=motorola-qcom +export TARGET_BOARD_PLATFORM=msm8226 + +../$COMMON_DEVICE/extract-files.sh $@ diff --git a/full_peregrine.mk b/full_peregrine.mk new file mode 100644 index 0000000..648054d --- /dev/null +++ b/full_peregrine.mk @@ -0,0 +1,36 @@ +# +# Copyright (C) 2013 The CyanogenMod Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# +# This file is the build configuration for a full Android +# build for peregrine hardware. This cleanly combines a set of +# device-specific aspects (drivers) with a device-agnostic +# product configuration (apps). Except for a few implementation +# details, it only fundamentally contains two inherit-product +# lines, full and peregrine, hence its name. +# + +# Inherit from those products. Most specific first. +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) +# Inherit from peregrine device +$(call inherit-product, device/motorola/peregrine/device_peregrine.mk) + +## Device identifier. This must come after all inclusions +PRODUCT_DEVICE := peregrine +PRODUCT_NAME := full_peregrine +PRODUCT_BRAND := motorola +PRODUCT_MODEL := peregrine +PRODUCT_MANUFACTURER := motorola diff --git a/recovery.fstab b/recovery.fstab deleted file mode 100644 index 402de79..0000000 --- a/recovery.fstab +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (c) 2011, The Linux Foundation. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted 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. -# -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 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. - -# mount point fstype device [device2] [length=] - -boot /boot emmc defaults defaults -cache /cache ext4 noatime,nosuid,nodev,barrier=1,data=ordered wait,check -misc /misc emmc defaults defaults -recovery /recovery emmc defaults defaults -userdata /data f2fs noatime,nosuid,nodev,barrier=1,data=ordered,noauto_da_alloc wait,check -system /system ext4 ro,barrier=1 wait -modem /modem ext4 defaults defaults -customize /customize ext4 defaults defaults - diff --git a/system.prop b/system.prop index 450bc8b..5f9c2f2 100644 --- a/system.prop +++ b/system.prop @@ -1,3 +1,4 @@ # # system.prop for peregrine # +rild.libargs=-d /dev/smd0 From 8e2b4af30bf1608217030f9b39ba5d4129a6d364 Mon Sep 17 00:00:00 2001 From: David Rouleau Date: Tue, 15 Jul 2014 17:08:34 -0400 Subject: [PATCH 03/12] Try seperate fstabs again --- BoardConfig.mk | 8 ++++++-- device_peregrine.mk | 8 ++++++++ rootdir/Android.mk | 10 ++++++++++ rootdir/etc/fstab.qcom | 17 +++++++++++++++++ rootdir/etc/twrp.fstab | 8 ++++++++ 5 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 rootdir/Android.mk create mode 100644 rootdir/etc/fstab.qcom create mode 100644 rootdir/etc/twrp.fstab diff --git a/BoardConfig.mk b/BoardConfig.mk index f1e5aff..ea8a508 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -29,11 +29,15 @@ LOCAL_PATH := device/motorola/perergine BOARD_CUSTOM_BOOTIMG_MK := device/motorola/peregrine/mkbootimg.mk -BOARD_HAS_NO_MISC_PARTITION := true +# BOARD_HAS_NO_MISC_PARTITION := true + +TARGET_UNIFIED_DEVICE := true +TARGET_INIT_VENDOR_LIB := libinit_msm -# fix this up by examining /proc/mtd on a running device BOARD_USERDATAIMAGE_PARTITION_SIZE := 8589934592 +TARGET_RECOVERY_FSTAB := $(LOCAL_PATH)/rootdir/etc/fstab.qcom + #TWRP DEVICE_RESOLUTION := 720x1280 TW_IGNORE_MAJOR_AXIS_0 := true diff --git a/device_peregrine.mk b/device_peregrine.mk index e7d71e6..bf73629 100644 --- a/device_peregrine.mk +++ b/device_peregrine.mk @@ -7,6 +7,14 @@ LOCAL_PATH := device/motorola/peregrine # peregrine specific overlay DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay +# Ramdisk +PRODUCT_PACKAGES += \ + fstab.qcom + +# TWRP +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/rootdir/etc/twrp.fstab:recovery/root/etc/twrp.fstab + PRODUCT_LOCALES := en_US PRODUCT_LOCALES += xhdpi PRODUCT_AAPT_CONFIG := normal hdpi xhdpi diff --git a/rootdir/Android.mk b/rootdir/Android.mk new file mode 100644 index 0000000..4477b0f --- /dev/null +++ b/rootdir/Android.mk @@ -0,0 +1,10 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +include $(CLEAR_VARS) +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) +include $(BUILD_PREBUILT) diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom new file mode 100644 index 0000000..1101fc5 --- /dev/null +++ b/rootdir/etc/fstab.qcom @@ -0,0 +1,17 @@ +# 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 +# +/dev/block/platform/msm_sdcc.1/by-name/system /system ext4 ro,barrier=1 wait +/dev/block/platform/msm_sdcc.1/by-name/userdata /data f2fs rw,discard,nosuid,nodev,noatime,nodiratime,inline_xattr,errors=recover wait,nonremovable,encryptable=footer,length=-16384 +/dev/block/platform/msm_sdcc.1/by-name/cache /cache ext4 rw,nosuid,nodev,noatime,nodiratime,data=writeback,noauto_da_alloc,barrier=1 wait,check +/dev/block/platform/msm_sdcc.1/by-name/fsg /fsg ext4 defaults recoveryonly +/dev/block/platform/msm_sdcc.1/by-name/modem /firmware ext4 defaults recoveryonly +/dev/block/platform/msm_sdcc.1/by-name/persist /persist ext4 defaults recoveryonly +/dev/block/platform/msm_sdcc.1/by-name/boot /boot emmc defaults recoveryonly +/dev/block/platform/msm_sdcc.1/by-name/recovery /recovery emmc defaults recoveryonly + +/dev/block/mmcblk1p1 /external_sd auto default recoveryonly +/devices/msm_sdcc.2/mmc_host auto vfat defaults voldmanaged=sdcard1:auto,migrate=target,noemulatedsd +/devices/platform/msm_hsusb_host auto auto defaults voldmanaged=usbdisk:auto +/dev/block/zram0 none swap defaults zramsize=134217728 diff --git a/rootdir/etc/twrp.fstab b/rootdir/etc/twrp.fstab new file mode 100644 index 0000000..3badbc4 --- /dev/null +++ b/rootdir/etc/twrp.fstab @@ -0,0 +1,8 @@ +# mount point fstype device + +/data f2fs /dev/block/platform/msm_sdcc.1/by-name/userdata flags=fsflags="inline_xattr" +/cache ext4 /dev/block/platform/msm_sdcc.1/by-name/cache +/system ext4 /dev/block/platform/msm_sdcc.1/by-name/system +/boot emmc /dev/block/platform/msm_sdcc.1/by-name/boot +/recovery emmc /dev/block/platform/msm_sdcc.1/by-name/recovery +/external_sd vfat /dev/block/mmcblk1p1 /dev/block/mmcblk1 flags=display="Micro SDcard";storage;wipeingui;removable From 0254b5162fd67fa6fc228d6f629118135c75f5fa Mon Sep 17 00:00:00 2001 From: David Rouleau Date: Tue, 22 Jul 2014 09:35:58 -0400 Subject: [PATCH 04/12] Squashed commit of complete ugly work --- BoardConfig.mk | 5 +- device_peregrine.mk | 2 +- .../base/core/res/res/xml/storage_list.xml | 55 +++++++++++++++++++ overlay/packages/apps/Phone | 1 + .../services/Telephony/res/values/config.xml | 23 ++++++++ rootdir/Android.mk | 6 +- rootdir/etc/{fstab.qcom => fstab.peregrine} | 0 rootdir/etc/twrp.fstab | 18 +++++- 8 files changed, 101 insertions(+), 9 deletions(-) create mode 100644 overlay/frameworks/base/core/res/res/xml/storage_list.xml create mode 120000 overlay/packages/apps/Phone create mode 100644 overlay/packages/services/Telephony/res/values/config.xml rename rootdir/etc/{fstab.qcom => fstab.peregrine} (100%) diff --git a/BoardConfig.mk b/BoardConfig.mk index ea8a508..47e5e03 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -29,17 +29,18 @@ LOCAL_PATH := device/motorola/perergine BOARD_CUSTOM_BOOTIMG_MK := device/motorola/peregrine/mkbootimg.mk -# BOARD_HAS_NO_MISC_PARTITION := true +BOARD_HAS_NO_MISC_PARTITION := true TARGET_UNIFIED_DEVICE := true TARGET_INIT_VENDOR_LIB := libinit_msm BOARD_USERDATAIMAGE_PARTITION_SIZE := 8589934592 -TARGET_RECOVERY_FSTAB := $(LOCAL_PATH)/rootdir/etc/fstab.qcom +TARGET_RECOVERY_FSTAB := device/motorola/peregrine/rootdir/etc/fstab.qcom #TWRP DEVICE_RESOLUTION := 720x1280 TW_IGNORE_MAJOR_AXIS_0 := true TW_EXTERNAL_STORAGE_PATH := "/external_sd" TW_EXTERNAL_STORAGE_MOUNT_POINT := "external_sd" +#TW_CUSTOM_POWER_BUTTON := 107 diff --git a/device_peregrine.mk b/device_peregrine.mk index bf73629..fbeb819 100644 --- a/device_peregrine.mk +++ b/device_peregrine.mk @@ -9,7 +9,7 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay # Ramdisk PRODUCT_PACKAGES += \ - fstab.qcom + fstab.peregrine # TWRP PRODUCT_COPY_FILES += \ diff --git a/overlay/frameworks/base/core/res/res/xml/storage_list.xml b/overlay/frameworks/base/core/res/res/xml/storage_list.xml new file mode 100644 index 0000000..67ff1e4 --- /dev/null +++ b/overlay/frameworks/base/core/res/res/xml/storage_list.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + diff --git a/overlay/packages/apps/Phone b/overlay/packages/apps/Phone new file mode 120000 index 0000000..0f8d39e --- /dev/null +++ b/overlay/packages/apps/Phone @@ -0,0 +1 @@ +../services/Telephony/ \ No newline at end of file diff --git a/overlay/packages/services/Telephony/res/values/config.xml b/overlay/packages/services/Telephony/res/values/config.xml new file mode 100644 index 0000000..aa26186 --- /dev/null +++ b/overlay/packages/services/Telephony/res/values/config.xml @@ -0,0 +1,23 @@ + + + + + + true + + + true + diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 4477b0f..f5c68a3 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -1,10 +1,10 @@ -LOCAL_PATH:= $(call my-dir) +LOCAL_PATH:= device/motorola/peregrine/rootdir include $(CLEAR_VARS) include $(CLEAR_VARS) -LOCAL_MODULE := fstab.qcom +LOCAL_MODULE := fstab.peregrine LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/fstab.qcom +LOCAL_SRC_FILES := etc/fstab.peregrine LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) include $(BUILD_PREBUILT) diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.peregrine similarity index 100% rename from rootdir/etc/fstab.qcom rename to rootdir/etc/fstab.peregrine diff --git a/rootdir/etc/twrp.fstab b/rootdir/etc/twrp.fstab index 3badbc4..fc429ee 100644 --- a/rootdir/etc/twrp.fstab +++ b/rootdir/etc/twrp.fstab @@ -1,8 +1,20 @@ -# mount point fstype device +# mount point fstype device -/data f2fs /dev/block/platform/msm_sdcc.1/by-name/userdata flags=fsflags="inline_xattr" +/data f2fs /dev/block/platform/msm_sdcc.1/by-name/userdata flags=fsflags="inline_xattr";length=-16384 /cache ext4 /dev/block/platform/msm_sdcc.1/by-name/cache /system ext4 /dev/block/platform/msm_sdcc.1/by-name/system /boot emmc /dev/block/platform/msm_sdcc.1/by-name/boot /recovery emmc /dev/block/platform/msm_sdcc.1/by-name/recovery -/external_sd vfat /dev/block/mmcblk1p1 /dev/block/mmcblk1 flags=display="Micro SDcard";storage;wipeingui;removable +/pds emmc /dev/block/platform/msm_sdcc.1/by-name/pds flags=backup=1;display=PDS +/utags emmc /dev/block/platform/msm_sdcc.1/by-name/utags flags=backup=1;display=utags +/persist emmc /dev/block/platform/msm_sdcc.1/by-name/persist flags=backup=1;display=persist +# Some of those partitions (e.g. modem, fsg) are actually ext4, but shouldn't be mounted in normal circumstances. +/modem emmc /dev/block/platform/msm_sdcc.1/by-name/modem flags=backup=1;display=NON-HLOS +/modemst1 emmc /dev/block/mmcblk0p17 flags=backup=1;display=modemst1 +/modemst2 emmc /dev/block/mmcblk0p18 flags=backup=1;display=modemst2 +/fsg emmc /dev/block/mmcblk0p21 flags=backup=1;display=fsg +/fsc emmc /dev/block/mmcblk0p22 flags=backup=1;display=fsc +/sp emmc /dev/block/platform/msm_sdcc.1/by-name/sp flags=backup=1;display=sp +/cid emmc /dev/block/mmcblk0p25 flags=backup=1;display=cid +/external_sd auto /dev/block/mmcblk1p1 /dev/block/mmcblk1 flags=display="microSD card";storage;wipeingui;removable +/usb-otg auto /dev/block/sda1 /dev/block/sda flags=display="USB OTG";storage;wipeingui;removable From b7acb2337f8417ceeb5108233a22c4920c99abc0 Mon Sep 17 00:00:00 2001 From: David Rouleau Date: Wed, 30 Jul 2014 13:10:25 -0400 Subject: [PATCH 05/12] Add in proper sdcard directories thanks to Nupich for the tip --- device_peregrine.mk | 1 + rootdir/Android.mk | 10 +- rootdir/etc/init.qcom.rc | 640 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 650 insertions(+), 1 deletion(-) create mode 100755 rootdir/etc/init.qcom.rc diff --git a/device_peregrine.mk b/device_peregrine.mk index fbeb819..0b39e56 100644 --- a/device_peregrine.mk +++ b/device_peregrine.mk @@ -9,6 +9,7 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay # Ramdisk PRODUCT_PACKAGES += \ + init.qcom.rc \ fstab.peregrine # TWRP diff --git a/rootdir/Android.mk b/rootdir/Android.mk index f5c68a3..f2a2bbe 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -1,4 +1,4 @@ -LOCAL_PATH:= device/motorola/peregrine/rootdir +LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) include $(CLEAR_VARS) @@ -8,3 +8,11 @@ LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/fstab.peregrine LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +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) +include $(BUILD_PREBUILT) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc new file mode 100755 index 0000000..09673fd --- /dev/null +++ b/rootdir/etc/init.qcom.rc @@ -0,0 +1,640 @@ +# Copyright (c) 2009-2012,2014 The Linux Foundation. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted 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. +# +# 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, FITNESS FOR A PARTICULAR PURPOSE AND +# NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 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. +# + +import init.qcom.usb.rc +# import init.target.rc + +on early-init + write /sys/block/mmcblk0/queue/scheduler noop + +on init + loglevel 8 + + # Set permissions for persist partition + mkdir /persist 0771 system system + # See storage config details at http://source.android.com/tech/storage/ + mkdir /mnt/shell/emulated 0700 shell shell + mkdir /storage/emulated 0555 root root + + #External storage directories + mkdir /mnt/media_rw/sdcard1 0700 media_rw media_rw + mkdir /storage/sdcard1 0700 root root + mkdir /storage/emulated/legacy 0555 root root + mkdir /mnt/media_rw/usbdisk 0700 media_rw media_rw + mkdir /storage/usbdisk 0700 root root + + export EXTERNAL_STORAGE /storage/emulated/legacy + export EMULATED_STORAGE_SOURCE /mnt/shell/emulated + export EMULATED_STORAGE_TARGET /storage/emulated + export SECONDARY_STORAGE /storage/sdcard1 + + # Support legacy paths + symlink /storage/emulated/legacy /sdcard + symlink /storage/emulated/legacy /mnt/sdcard + symlink /storage/emulated/legacy /storage/sdcard0 + symlink /storage/usbdisk /usbdisk + symlink /storage/usbdisk /mnt/usbdisk + +on fs + setprop ro.crypto.fuse_sdcard true + +on early-boot + # set RLIMIT_MEMLOCK to 64MB + setrlimit 8 67108864 67108864 + # Allow subsystem (modem etc) debugging + write /sys/module/subsystem_restart/parameters/enable_debug ${persist.sys.ssr.enable_debug} + exec /system/bin/sh /init.qcom.early_boot.sh ${ro.board.platform} + exec /system/bin/sh /init.qcom.syspart_fixup.sh ${ro.board.platform} ${ro.serialno} + +on boot + chown bluetooth bluetooth /sys/module/bluetooth_power/parameters/power + chown bluetooth bluetooth /sys/class/rfkill/rfkill0/type + chown bluetooth bluetooth /sys/class/rfkill/rfkill0/state + chown bluetooth bluetooth /proc/bluetooth/sleep/proto + chown bluetooth bluetooth /sys/module/hci_uart/parameters/ath_lpm + chown bluetooth bluetooth /sys/module/hci_uart/parameters/ath_btwrite + chown system system /sys/module/sco/parameters/disable_esco + chown bluetooth bluetooth /sys/module/hci_smd/parameters/hcismd_set + chmod 0660 /sys/module/bluetooth_power/parameters/power + chmod 0660 /sys/module/hci_smd/parameters/hcismd_set + chmod 0660 /sys/class/rfkill/rfkill0/state + chmod 0660 /proc/bluetooth/sleep/proto + chown bluetooth bluetooth /dev/ttyHS0 + chmod 0660 /sys/module/hci_uart/parameters/ath_lpm + chmod 0660 /sys/module/hci_uart/parameters/ath_btwrite + chmod 0660 /dev/ttyHS0 + chown bluetooth bluetooth /sys/devices/platform/msm_serial_hs.0/clock + chmod 0660 /sys/devices/platform/msm_serial_hs.0/clock + + chmod 0660 /dev/ttyHS2 + chown bluetooth bluetooth /dev/ttyHS2 + + #Create QMUX deamon socket area + mkdir /dev/socket/qmux_radio 0770 radio radio + chmod 2770 /dev/socket/qmux_radio + mkdir /dev/socket/qmux_audio 0770 media audio + chmod 2770 /dev/socket/qmux_audio + mkdir /dev/socket/qmux_bluetooth 0770 bluetooth bluetooth + chmod 2770 /dev/socket/qmux_bluetooth + mkdir /dev/socket/qmux_gps 0770 gps gps + chmod 2770 /dev/socket/qmux_gps + + # Prevents permission denied error for telephony + chmod 0644 /proc/cmdline + + setprop wifi.interface wlan0 + +# Define TCP buffer sizes for various networks +# ReadMin, ReadInitial, ReadMax, WriteMin, WriteInitial, WriteMax, + setprop net.tcp.buffersize.wifi 524288,2097152,4194304,262144,524288,1048576 + + + setprop ro.telephony.call_ring.multiple false + + #Remove SUID bit for iproute2 ip tool + chmod 0755 /system/bin/ip + + + chmod 0444 /sys/devices/platform/msm_hsusb/gadget/usb_state + + #For bridgemgr daemon to inform the USB driver of the correct transport + chown radio radio /sys/class/android_usb/f_rmnet_smd_sdio/transport + + # For setting tcp delayed ack + chown system system /sys/kernel/ipv4/tcp_delack_seg + chown system system /sys/kernel/ipv4/tcp_use_userconfig + +# Define TCP delayed ack settings for WiFi & LTE + setprop net.tcp.delack.default 1 + setprop net.tcp.delack.wifi 20 + setprop net.tcp.delack.lte 8 + setprop net.tcp.usercfg.default 0 + setprop net.tcp.usercfg.wifi 1 + setprop net.tcp.usercfg.lte 1 + + #To allow interfaces to get v6 address when tethering is enabled + write /proc/sys/net/ipv6/conf/rmnet0/accept_ra 2 + write /proc/sys/net/ipv6/conf/rmnet1/accept_ra 2 + write /proc/sys/net/ipv6/conf/rmnet2/accept_ra 2 + write /proc/sys/net/ipv6/conf/rmnet3/accept_ra 2 + write /proc/sys/net/ipv6/conf/rmnet4/accept_ra 2 + write /proc/sys/net/ipv6/conf/rmnet5/accept_ra 2 + write /proc/sys/net/ipv6/conf/rmnet6/accept_ra 2 + write /proc/sys/net/ipv6/conf/rmnet7/accept_ra 2 + write /proc/sys/net/ipv6/conf/rmnet_sdio0/accept_ra 2 + write /proc/sys/net/ipv6/conf/rmnet_sdio1/accept_ra 2 + write /proc/sys/net/ipv6/conf/rmnet_sdio2/accept_ra 2 + write /proc/sys/net/ipv6/conf/rmnet_sdio3/accept_ra 2 + write /proc/sys/net/ipv6/conf/rmnet_sdio4/accept_ra 2 + write /proc/sys/net/ipv6/conf/rmnet_sdio5/accept_ra 2 + write /proc/sys/net/ipv6/conf/rmnet_sdio6/accept_ra 2 + write /proc/sys/net/ipv6/conf/rmnet_sdio7/accept_ra 2 + write /proc/sys/net/ipv6/conf/rmnet_usb0/accept_ra 2 + write /proc/sys/net/ipv6/conf/rmnet_usb1/accept_ra 2 + write /proc/sys/net/ipv6/conf/rmnet_usb2/accept_ra 2 + write /proc/sys/net/ipv6/conf/rmnet_usb3/accept_ra 2 + + # To prevent out of order acknowledgements from making + # connection tracking to treat them as not belonging to + # the connection they belong to. + # Otherwise, a weird issue happens in which some long + # connections on high-throughput links get dropped when + # an ack packet comes out of order + write /proc/sys/net/netfilter/nf_conntrack_tcp_be_liberal 1 + + # NFC local data and nfcee xml storage + mkdir /data/nfc 0770 nfc nfc + mkdir /data/nfc/param 0770 nfc nfc + + # Flash storage isn't a good entropy source, and only causes locking + # overhead in the kernel. Turn it off. + write /sys/block/mmcblk0/queue/add_random 0 + + setprop ro.hw.device ${ro.boot.device} + setprop ro.hw.hwrev ${ro.boot.hwrev} + setprop ro.hw.radio ${ro.boot.radio} + + # activate zram + swapon_all fstab.qcom + write /proc/sys/vm/page-cluster + +# msm specific files that need to be created on /data +on post-fs-data + # we will remap this as /mnt/sdcard with the sdcard fuse tool + mkdir /data/media 0770 media_rw media_rw + chown media_rw media_rw /data/media + + mkdir /data/misc/bluetooth 0770 bluetooth bluetooth + + # Create the directories used by the Wireless subsystem + mkdir /data/misc/wifi 0770 wifi wifi + mkdir /data/misc/wifi/sockets 0770 wifi wifi + mkdir /data/misc/wifi/wpa_supplicant 0770 wifi wifi + mkdir /data/misc/dhcp 0770 dhcp dhcp + chown dhcp dhcp /data/misc/dhcp + + # Create directory used by audio subsystem + mkdir /data/misc/audio 0770 audio audio + + # Create directory used by the DASH client + mkdir /data/misc/dash 0770 media audio + + # Mounting of persist is moved to 'on emmc-fs' and 'on fs' sections + # We chown/chmod /persist again so because mount is run as root + defaults + chown system system /persist + chmod 0771 /persist + chmod 0664 /sys/devices/platform/msm_sdcc.1/polling + chmod 0664 /sys/devices/platform/msm_sdcc.2/polling + chmod 0664 /sys/devices/platform/msm_sdcc.3/polling + chmod 0664 /sys/devices/platform/msm_sdcc.4/polling + + # Chown polling nodes as needed from UI running on system server + chown system system /sys/devices/platform/msm_sdcc.1/polling + chown system system /sys/devices/platform/msm_sdcc.2/polling + chown system system /sys/devices/platform/msm_sdcc.3/polling + chown system system /sys/devices/platform/msm_sdcc.4/polling + + #Create the symlink to qcn wpa_supplicant folder for ar6000 wpa_supplicant + mkdir /data/system 0775 system system + #symlink /data/misc/wifi/wpa_supplicant /data/system/wpa_supplicant + + #Create directories for Location services + mkdir /data/misc/location 0770 gps gps + mkdir /data/misc/location/mq 0770 gps gps + mkdir /data/misc/location/xtwifi 0770 gps gps + mkdir /data/misc/location/gpsone_d 0770 system gps + mkdir /data/misc/location/quipc 0770 gps system + mkdir /data/misc/location/gsiff 0770 gps gps + + #Create directory from IMS services + mkdir /data/shared 0755 + chown system system /data/shared + + #Create directory for FOTA + mkdir /data/fota 0771 + chown system system /data/fota + + #Create directory for hostapd + mkdir /data/hostapd 0770 system wifi + + # Create /data/time folder for time-services + mkdir /data/time/ 0700 system system + + mkdir /data/audio/ 0770 media audio + # Enable the setgid bit on the directory + chmod 2770 /data/audio + + setprop vold.post_fs_data_done 1 + + #Create a folder for SRS to be able to create a usercfg file + mkdir /data/data/media 0770 media media + +on property:init.svc.surfaceflinger=stopped + stop ppd + stop hdmid + +on property:init.svc.wpa_supplicant=stopped + stop dhcpcd + +on property:bluetooth.isEnabled=true + start btwlancoex + write /sys/class/bluetooth/hci0/idle_timeout 7000 + +service qcom-c_core-sh /system/bin/sh /init.qcom.class_core.sh + class core + user root + oneshot + +service qcom-c_main-sh /system/bin/sh /init.class_main.sh + class main + user root + oneshot + +service ril-qmi /system/bin/sh /init.qcom.ril.sh + class main + user root + oneshot + +on property:vold.decrypt=trigger_restart_framework + start qcom-c_main-sh + start config_bluetooth + +on property:persist.env.fastdorm.enabled=true + setprop persist.radio.data_no_toggle 1 + +service irsc_util /system/bin/logwrapper /system/bin/irsc_util "/etc/sec_config" + class main + user root + oneshot + +service rmt_storage /system/bin/rmt_storage + class core + user root + disabled + +on property:ro.boot.emmc=true + start rmt_storage + +service rfs_access /system/bin/rfs_access + class core + user system + group system net_raw + +on property:ro.boot.emmc=true + start rfs_access + +service config_bluetooth /system/bin/sh /system/etc/init.qcom.bt.sh + class core + user root + oneshot + +service hciattach /system/bin/sh /system/etc/init.qcom.bt.sh + class late_start + user bluetooth + group bluetooth net_bt_admin + disabled + oneshot + +on property:bluetooth.hciattach=true + start hciattach + +on property:bluetooth.hciattach=false + setprop bluetooth.status off + +service bridgemgrd /system/bin/bridgemgrd + class late_start + user radio + group radio qcom_diag + disabled + +service port-bridge /system/bin/port-bridge /dev/smd0 /dev/ttyGS0 + class late_start + user system + group system inet + disabled + +service qmiproxy /system/bin/qmiproxy + class main + user radio + group radio qcom_diag + disabled + +# QMUX must be in multiple groups to support external process connections +service qmuxd /system/bin/qmuxd + class main + user radio + group radio audio bluetooth gps qcom_diag + disabled + +service netmgrd /system/bin/netmgrd + class main + disabled + +on property:ro.use_data_netmgrd=false + # netmgr not supported on specific target + stop netmgrd + +# Adjust socket buffer to enlarge TCP receive window for high bandwidth +# but only if ro.data.large_tcp_window_size property is set. +on property:ro.data.large_tcp_window_size=true + write /proc/sys/net/ipv4/tcp_adv_win_scale 2 + +service btwlancoex /system/bin/sh /system/etc/init.qcom.coex.sh + class late_start + user bluetooth + group bluetooth net_bt_admin inet net_admin net_raw + disabled + oneshot + +service p2p_supplicant /system/bin/wpa_supplicant \ + -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf \ + -I/system/etc/wifi/p2p_supplicant_overlay.conf -N \ + -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \ + -I/system/etc/wifi/wpa_supplicant_overlay.conf \ + -O/data/misc/wifi/sockets -puse_p2p_group_interface=1 \ + -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0 +# we will start as root and wpa_supplicant will switch to user wifi +# after setting up the capabilities required for WEXT +# user wifi +# group wifi inet keystore + class main + socket wpa_wlan0 dgram 660 wifi wifi + disabled + oneshot + +service wpa_supplicant /system/bin/wpa_supplicant \ + -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \ + -I/system/etc/wifi/wpa_supplicant_overlay.conf \ + -O/data/misc/wifi/sockets \ + -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0 + # we will start as root and wpa_supplicant will switch to user wifi + # after setting up the capabilities required for WEXT + # user wifi + # group wifi inet keystore + class main + socket wpa_wlan0 dgram 660 wifi wifi + disabled + oneshot + +service dhcpcd_wlan0 /system/bin/dhcpcd -ABKLG + class late_start + disabled + oneshot + +service dhcpcd_p2p /system/bin/dhcpcd -ABKLG + class late_start + disabled + oneshot + +service iprenew_wlan0 /system/bin/dhcpcd -n + class late_start + disabled + oneshot + +service iprenew_p2p /system/bin/dhcpcd -n + class late_start + disabled + oneshot + +service ptt_socket_app /system/bin/ptt_socket_app -d + class main + user root + group root + oneshot + +service ptt_ffbm /system/bin/ptt_socket_app -f -d + user root + group root + disabled + oneshot + +service dhcpcd_bt-pan /system/bin/dhcpcd -BKLG + class late_start + disabled + oneshot + +service iprenew_bt-pan /system/bin/dhcpcd -n + class late_start + disabled + oneshot + +service dhcpcd_bnep0 /system/bin/dhcpcd -BKLG + disabled + oneshot + +service dhcpcd_bnep1 /system/bin/dhcpcd -BKLG + disabled + oneshot + +service dhcpcd_bnep2 /system/bin/dhcpcd -BKLG + disabled + oneshot + +service dhcpcd_bnep3 /system/bin/dhcpcd -BKLG + disabled + oneshot + +service dhcpcd_bnep4 /system/bin/dhcpcd -BKLG + disabled + oneshot + +service gpsone_daemon /system/bin/gpsone_daemon + class late_start + user gps + group gps inet net_raw + disabled + +service quipc_igsn /system/bin/quipc_igsn + class late_start + user gps + group inet gps qcom_diag + disabled + +service quipc_main /system/bin/quipc_main + class late_start + user gps + group gps net_admin wifi inet qcom_diag + disabled + +service location_mq /system/bin/location-mq + class late_start + user gps + group gps + disabled + +service xtwifi_inet /system/bin/xtwifi-inet-agent + class late_start + user gps + group inet gps + disabled + +service xtwifi_client /system/bin/xtwifi-client + class late_start + user gps + group net_admin wifi inet gps + disabled + +service lowi-server /system/bin/lowi-server + class late_start + user gps + group gps net_admin wifi inet qcom_diag + disabled + +service fm_dl /system/bin/sh /system/etc/init.qcom.fm.sh + class late_start + user root + group system fm_radio + disabled + oneshot + +on property:crypto.driver.load=1 + insmod /system/lib/modules/qce.ko + insmod /system/lib/modules/qcedev.ko + +on property:crypto.driver.load=0 + exec /system/bin/rmmod qcedev.ko + exec /system/bin/rmmod qce.ko + +service qcom-sh /system/bin/sh /init.qcom.sh + class late_start + user root + oneshot + +service qcom-post-boot /system/bin/sh /system/etc/init.qcom.post_boot.sh + class late_start + user root + disabled + oneshot + +service wifi-crda /system/bin/sh /system/etc/init.crda.sh + class late_start + user root + disabled + oneshot + +on property:sys.boot_completed=1 + start qcom-post-boot + write /sys/block/mmcblk0/queue/scheduler row + +service hostapd /system/bin/hostapd -dddd /data/hostapd/hostapd.conf + class late_start + user root + group root + oneshot + disabled + +service ds_fmc_appd /system/bin/ds_fmc_appd -p "rmnet0" -D + class late_start + group radio wifi inet + disabled + oneshot + +on property:persist.data.ds_fmc_app.mode=1 + start ds_fmc_appd + +on property:ro.data.large_tcp_window_size=true + # Adjust socket buffer to enlarge TCP receive window for high bandwidth (e.g. DO-RevB) + write /proc/sys/net/ipv4/tcp_adv_win_scale 2 + +service ril-daemon1 /system/bin/rild -c 1 + class main + socket rild1 stream 660 root radio + socket rild-debug1 stream 660 radio system + user root + disabled + group radio cache inet misc audio sdcard_r sdcard_rw diag qcom_diag log + +service ril-daemon2 /system/bin/rild -c 2 + class main + socket rild2 stream 660 root radio + socket rild-debug2 stream 660 radio system + user root + disabled + group radio cache inet misc audio sdcard_r sdcard_rw diag qcom_diag log + +service sdcard /system/bin/sdcard -u 1023 -g 1023 -l /data/media /mnt/shell/emulated + class late_start + +service fuse_sdcard1 /system/bin/sdcard -u 1023 -g 1023 -w 1023 -d /mnt/media_rw/sdcard1 /storage/sdcard1 + class late_start + disabled + +service fuse_usbdisk /system/bin/sdcard -u 1023 -g 1023 -d /mnt/media_rw/usbdisk /storage/usbdisk + class late_start + disabled + +# Binding fuse mount point to /storage/emulated/legacy +on property:init.svc.sdcard=running + wait /mnt/shell/emulated/0 + mount none /mnt/shell/emulated/0 /storage/emulated/legacy bind + +service charger /charger + class charger + +service ssr_diag /system/bin/ssr_diag + class late_start + user system + group system + +# SSR setting +on property:persist.sys.ssr.restart_level=* + exec /system/bin/sh /init.qcom.ssr.sh ${persist.sys.ssr.restart_level} + +service hvdcp /system/bin/hvdcp + class core + user root + disabled + +on property:persist.usb.hvdcp.detect=true + start hvdcp + +on property:persist.usb.hvdcp.detect=false + stop hvdcp + +# CM Performance Profiles + +# Powersave +on property:sys.perf.profile=0 + start mpdecision + write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor powersave + write /sys/class/devfreq/qcom,cpubw.55 powersave + +# Balanced +on property:sys.perf.profile=1 + start mpdecision + write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor interactive + write /sys/class/devfreq/qcom,cpubw.55 msm_cpufreq + +# High performance +on property:sys.perf.profile=2 + stop mpdecision + write /sys/devices/system/cpu/cpu0/online 1 + write /sys/devices/system/cpu/cpu1/online 1 + write /sys/devices/system/cpu/cpu2/online 1 + write /sys/devices/system/cpu/cpu3/online 1 + write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor performance + write /sys/class/devfreq/qcom,cpubw.65 performance From 56ab27511c25ee30d8fe32160226a1e4f9f04001 Mon Sep 17 00:00:00 2001 From: David Rouleau Date: Wed, 30 Jul 2014 15:28:26 -0400 Subject: [PATCH 06/12] Finish renaming fstab --- rootdir/Android.mk | 8 ++ rootdir/etc/init.qcom.rc | 2 +- rootdir/etc/init.target.rc | 174 +++++++++++++++++++++++++++++++++++++ 3 files changed, 183 insertions(+), 1 deletion(-) create mode 100755 rootdir/etc/init.target.rc diff --git a/rootdir/Android.mk b/rootdir/Android.mk index f2a2bbe..8a4559f 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -16,3 +16,11 @@ LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/init.qcom.rc LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := init.target.rc +LOCAL_MODULE_TAGS := optional eng +LOCAL_MODULE_CLASS := ETC +LOCAL_SRC_FILES := etc/init.target.rc +LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) +include $(BUILD_PREBUILT) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 09673fd..1099b18 100755 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -179,7 +179,7 @@ on boot setprop ro.hw.radio ${ro.boot.radio} # activate zram - swapon_all fstab.qcom + swapon_all fstab.peregrine write /proc/sys/vm/page-cluster # msm specific files that need to be created on /data diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc new file mode 100755 index 0000000..82a0a8e --- /dev/null +++ b/rootdir/etc/init.target.rc @@ -0,0 +1,174 @@ +# Copyright (c) 2012, 2014, The Linux Foundation. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted 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. +# +# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 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. +# +# + +import init.mmi.rc + +on early-init + mkdir /firmware 0771 system system + symlink /data/tombstones /tombstones + +on init + chmod 755 /gpecheck.sh + exec /gpecheck.sh + # CM: We use our own ril-daemon service definition, see mmi-ril-daemon + stop ril-daemon + +on fs + mount_all fstab.peregrine + + # Keeping following partitions outside fstab file. As user may not have + # these partition flashed on the device. Failure to mount any partition in fstab file + # results in failure to launch late-start class. + + wait /dev/block/platform/msm_sdcc.1/by-name/persist + mount ext4 /dev/block/platform/msm_sdcc.1/by-name/persist /persist nosuid nodev barrier=1 + + wait /dev/block/platform/msm_sdcc.1/by-name/modem + exec /system/bin/resize2fs /dev/block/platform/msm_sdcc.1/by-name/modem + mount ext4 /dev/block/platform/msm_sdcc.1/by-name/modem /firmware ro nosuid nodev barrier=0 + write /sys/kernel/boot_adsp/boot 1 + +on post-fs-data + mkdir /data/tombstones 0771 system system + mkdir /tombstones/modem 0771 system system + +on post-fs + restorecon /data/media /data/media/0 /data/media/legacy /data/media/obb + # Mount PDS + wait /dev/block/platform/msm_sdcc.1/by-name/pds + exec /system/bin/mount_pds.sh + + +on boot + # Enable writing to led blink node from userspace + chown system system /sys/class/leds/red/blink + chown system system /sys/class/leds/green/blink + # Enable writing to brightness node under torch-light from userspace + chown system system /sys/class/leds/torch-light/brightness + chmod 0666 /sys/class/leds/torch-light/brightness + + # vibrator intensity + chown system system /sys/devices/virtual/timed_output/vibrator/vtg_level + + # display color calibration + chown system system /sys/devices/platform/kcal_ctrl.0/kcal + chown system system /sys/devices/platform/kcal_ctrl.0/kcal_ctrl + + # setup trace dir + mkdir /cache/trace 0777 root shell + chown root shell /cache/trace + chmod 0777 /cache/trace + +#start camera server as daemon +service qcamerasvr /system/bin/mm-qcamera-daemon + class late_start + user camera + group camera system inet input graphics + +# Allow usb charging to be disabled persistently +on property:persist.usb.chgdisabled=1 + write /sys/class/power_supply/battery/charging_enabled 0 + +on property:persist.usb.chgdisabled=0 + write /sys/class/power_supply/battery/charging_enabled 1 + +service time_daemon /system/bin/time_daemon + class late_start + user root + group root + +service mpdecision /system/bin/mpdecision --avg_comp + user root + group root system + disabled + +#start GNSS/Sensor interface daemon +service gsiff_daemon /system/bin/gsiff_daemon + class late_start + user system + group gps net_raw + +service thermal-engine /system/bin/thermal-engine -c /etc/thermal-engine-8226.conf + class main + user root + group root + +service qrngd /system/bin/qrngd -f + class main + user root + group root + + +service qrngp /system/bin/qrngp + class main + user root + group root + oneshot + disabled + +on property:sys.boot_completed=1 + start qrngp + +service qseecomd /system/bin/qseecomd + class late_start + user root + group root + +service audiod /system/bin/audiod + class late_start + user system + group system + +service adsprpcd /system/bin/adsprpcd + class main + user media + group media + +service wcnss-service /system/bin/wcnss_service + class late_start + user root + group system wifi + oneshot + +service ppd /system/bin/mm-pp-daemon + class late_start + user system + socket pps stream 0660 system system + group system graphics + +on property:init.svc.surfaceflinger=stopped + stop ppd + +service mmi-ril-daemon /system/bin/rild + class main + socket rild stream 660 root radio + socket rild-debug stream 660 radio system + socket cutback stream 660 media radio + user root + group radio cache inet misc audio sdcard_rw qcom_oncrpc qcom_diag log net_raw diag From 44103cc64cede33459ffa7a93c677fcf12803939 Mon Sep 17 00:00:00 2001 From: David Rouleau Date: Wed, 30 Jul 2014 15:33:52 -0400 Subject: [PATCH 07/12] One final fstab change --- BoardConfig.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 47e5e03..34e2c2f 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -36,7 +36,7 @@ TARGET_INIT_VENDOR_LIB := libinit_msm BOARD_USERDATAIMAGE_PARTITION_SIZE := 8589934592 -TARGET_RECOVERY_FSTAB := device/motorola/peregrine/rootdir/etc/fstab.qcom +TARGET_RECOVERY_FSTAB := device/motorola/peregrine/rootdir/etc/fstab.peregrine #TWRP DEVICE_RESOLUTION := 720x1280 From c18a9e87eea8166d0968468c47f41d70baff4beb Mon Sep 17 00:00:00 2001 From: David Rouleau Date: Wed, 30 Jul 2014 21:22:34 -0400 Subject: [PATCH 08/12] Add README --- README.mkdn | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 README.mkdn diff --git a/README.mkdn b/README.mkdn new file mode 100644 index 0000000..99ffcd2 --- /dev/null +++ b/README.mkdn @@ -0,0 +1,26 @@ +HOW-TO for building CyanogenMod +_______________________________ + +- First, follow http://source.android.com/source to figure out how to get your build environment running, etc +- Make a directory for your build source, then sync CyanogenMod: repo init -u git://github.com/CyanogenMod/android.git -b cm-11.0 +- git clone https://github.com/Shabbypenguin/android_device_motorola_peregrine device/motorola/peregrine +- git clone https://github.com/Shabbypenguin/android_device_motorola_msm8226-common device/motorola/msm8226-common +- git clone https://github.com/Shabbypenguin/android_kernel_motorola_msm8226 kernel/motorola/msm8226 +- That will give you my 3 repos you will need additional ones from CM github that can be found in device/motorola/peregrine/cm.dependencies +- Plug in your phone, and run the extract files script against a working cyanogenmod build +- Change directory to the top, and source the build environment setup: . build/envsetup.sh +- Use the command brunch peregrine, and wait as your meal cooks. +- It should output an update.zip in out/target/product/peregrine/... you've made CyanogenMod. Congratulations. + + + +List of Contributers to the device tree +___________________________________________________________________________ + +- DHacker +- Shabbypenguin +- SomCom3x + +A full CHANGELOG for CyanogenMod can be found in its vendor: https://github.com/CyanogenMod/android_vendor_cm/blob/ics/CHANGELOG.mkdn + +Keep in mind guys, CyanogenMod is open source, and a community project. Get involved, and help us code for a better future :D From 9cea5fc52d963d80ce106c1894f13a667a8afcfd Mon Sep 17 00:00:00 2001 From: David Rouleau Date: Thu, 31 Jul 2014 08:02:21 -0400 Subject: [PATCH 09/12] Revert "One final fstab change" This reverts commit 44103cc64cede33459ffa7a93c677fcf12803939. --- BoardConfig.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 34e2c2f..47e5e03 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -36,7 +36,7 @@ TARGET_INIT_VENDOR_LIB := libinit_msm BOARD_USERDATAIMAGE_PARTITION_SIZE := 8589934592 -TARGET_RECOVERY_FSTAB := device/motorola/peregrine/rootdir/etc/fstab.peregrine +TARGET_RECOVERY_FSTAB := device/motorola/peregrine/rootdir/etc/fstab.qcom #TWRP DEVICE_RESOLUTION := 720x1280 From 718c67d7107fed4d6df5abf0dad631d902ab44f6 Mon Sep 17 00:00:00 2001 From: David Rouleau Date: Thu, 31 Jul 2014 08:04:08 -0400 Subject: [PATCH 10/12] Revert "Finish renaming fstab" This reverts commit 56ab27511c25ee30d8fe32160226a1e4f9f04001. --- rootdir/Android.mk | 8 -- rootdir/etc/init.qcom.rc | 2 +- rootdir/etc/init.target.rc | 174 ------------------------------------- 3 files changed, 1 insertion(+), 183 deletions(-) delete mode 100755 rootdir/etc/init.target.rc diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 8a4559f..f2a2bbe 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -16,11 +16,3 @@ LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/init.qcom.rc LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := init.target.rc -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/init.target.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) -include $(BUILD_PREBUILT) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 1099b18..09673fd 100755 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -179,7 +179,7 @@ on boot setprop ro.hw.radio ${ro.boot.radio} # activate zram - swapon_all fstab.peregrine + swapon_all fstab.qcom write /proc/sys/vm/page-cluster # msm specific files that need to be created on /data diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc deleted file mode 100755 index 82a0a8e..0000000 --- a/rootdir/etc/init.target.rc +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright (c) 2012, 2014, The Linux Foundation. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted 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. -# -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 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. -# -# - -import init.mmi.rc - -on early-init - mkdir /firmware 0771 system system - symlink /data/tombstones /tombstones - -on init - chmod 755 /gpecheck.sh - exec /gpecheck.sh - # CM: We use our own ril-daemon service definition, see mmi-ril-daemon - stop ril-daemon - -on fs - mount_all fstab.peregrine - - # Keeping following partitions outside fstab file. As user may not have - # these partition flashed on the device. Failure to mount any partition in fstab file - # results in failure to launch late-start class. - - wait /dev/block/platform/msm_sdcc.1/by-name/persist - mount ext4 /dev/block/platform/msm_sdcc.1/by-name/persist /persist nosuid nodev barrier=1 - - wait /dev/block/platform/msm_sdcc.1/by-name/modem - exec /system/bin/resize2fs /dev/block/platform/msm_sdcc.1/by-name/modem - mount ext4 /dev/block/platform/msm_sdcc.1/by-name/modem /firmware ro nosuid nodev barrier=0 - write /sys/kernel/boot_adsp/boot 1 - -on post-fs-data - mkdir /data/tombstones 0771 system system - mkdir /tombstones/modem 0771 system system - -on post-fs - restorecon /data/media /data/media/0 /data/media/legacy /data/media/obb - # Mount PDS - wait /dev/block/platform/msm_sdcc.1/by-name/pds - exec /system/bin/mount_pds.sh - - -on boot - # Enable writing to led blink node from userspace - chown system system /sys/class/leds/red/blink - chown system system /sys/class/leds/green/blink - # Enable writing to brightness node under torch-light from userspace - chown system system /sys/class/leds/torch-light/brightness - chmod 0666 /sys/class/leds/torch-light/brightness - - # vibrator intensity - chown system system /sys/devices/virtual/timed_output/vibrator/vtg_level - - # display color calibration - chown system system /sys/devices/platform/kcal_ctrl.0/kcal - chown system system /sys/devices/platform/kcal_ctrl.0/kcal_ctrl - - # setup trace dir - mkdir /cache/trace 0777 root shell - chown root shell /cache/trace - chmod 0777 /cache/trace - -#start camera server as daemon -service qcamerasvr /system/bin/mm-qcamera-daemon - class late_start - user camera - group camera system inet input graphics - -# Allow usb charging to be disabled persistently -on property:persist.usb.chgdisabled=1 - write /sys/class/power_supply/battery/charging_enabled 0 - -on property:persist.usb.chgdisabled=0 - write /sys/class/power_supply/battery/charging_enabled 1 - -service time_daemon /system/bin/time_daemon - class late_start - user root - group root - -service mpdecision /system/bin/mpdecision --avg_comp - user root - group root system - disabled - -#start GNSS/Sensor interface daemon -service gsiff_daemon /system/bin/gsiff_daemon - class late_start - user system - group gps net_raw - -service thermal-engine /system/bin/thermal-engine -c /etc/thermal-engine-8226.conf - class main - user root - group root - -service qrngd /system/bin/qrngd -f - class main - user root - group root - - -service qrngp /system/bin/qrngp - class main - user root - group root - oneshot - disabled - -on property:sys.boot_completed=1 - start qrngp - -service qseecomd /system/bin/qseecomd - class late_start - user root - group root - -service audiod /system/bin/audiod - class late_start - user system - group system - -service adsprpcd /system/bin/adsprpcd - class main - user media - group media - -service wcnss-service /system/bin/wcnss_service - class late_start - user root - group system wifi - oneshot - -service ppd /system/bin/mm-pp-daemon - class late_start - user system - socket pps stream 0660 system system - group system graphics - -on property:init.svc.surfaceflinger=stopped - stop ppd - -service mmi-ril-daemon /system/bin/rild - class main - socket rild stream 660 root radio - socket rild-debug stream 660 radio system - socket cutback stream 660 media radio - user root - group radio cache inet misc audio sdcard_rw qcom_oncrpc qcom_diag log net_raw diag From dd043ab6f328cdcc29feecd54f3dce4c6159205a Mon Sep 17 00:00:00 2001 From: David Rouleau Date: Thu, 31 Jul 2014 08:07:03 -0400 Subject: [PATCH 11/12] Fix fstab name --- device_peregrine.mk | 2 +- rootdir/Android.mk | 4 ++-- rootdir/etc/{fstab.peregrine => fstab.qcom} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename rootdir/etc/{fstab.peregrine => fstab.qcom} (100%) diff --git a/device_peregrine.mk b/device_peregrine.mk index 0b39e56..e69b39e 100644 --- a/device_peregrine.mk +++ b/device_peregrine.mk @@ -10,7 +10,7 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay # Ramdisk PRODUCT_PACKAGES += \ init.qcom.rc \ - fstab.peregrine + fstab.qcom # TWRP PRODUCT_COPY_FILES += \ diff --git a/rootdir/Android.mk b/rootdir/Android.mk index f2a2bbe..bfb2319 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -2,10 +2,10 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) include $(CLEAR_VARS) -LOCAL_MODULE := fstab.peregrine +LOCAL_MODULE := fstab.qcom LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/fstab.peregrine +LOCAL_SRC_FILES := etc/fstab.qcom LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) include $(BUILD_PREBUILT) diff --git a/rootdir/etc/fstab.peregrine b/rootdir/etc/fstab.qcom similarity index 100% rename from rootdir/etc/fstab.peregrine rename to rootdir/etc/fstab.qcom From 00949f52cd6d167c285b8f75a1bb8362c1eae2a2 Mon Sep 17 00:00:00 2001 From: David Rouleau Date: Thu, 31 Jul 2014 08:37:31 -0400 Subject: [PATCH 12/12] Update readme with manifest --- README.mkdn | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/README.mkdn b/README.mkdn index 99ffcd2..a4f2ff8 100644 --- a/README.mkdn +++ b/README.mkdn @@ -3,10 +3,21 @@ _______________________________ - First, follow http://source.android.com/source to figure out how to get your build environment running, etc - Make a directory for your build source, then sync CyanogenMod: repo init -u git://github.com/CyanogenMod/android.git -b cm-11.0 -- git clone https://github.com/Shabbypenguin/android_device_motorola_peregrine device/motorola/peregrine -- git clone https://github.com/Shabbypenguin/android_device_motorola_msm8226-common device/motorola/msm8226-common -- git clone https://github.com/Shabbypenguin/android_kernel_motorola_msm8226 kernel/motorola/msm8226 -- That will give you my 3 repos you will need additional ones from CM github that can be found in device/motorola/peregrine/cm.dependencies +- Then you need to add this to .repo/local_manifests/roomservice.xml (if you dont have it then create it and put this in): + + + + + + + + + + + + + +- Do a repo sync and it should grab everything you need - Plug in your phone, and run the extract files script against a working cyanogenmod build - Change directory to the top, and source the build environment setup: . build/envsetup.sh - Use the command brunch peregrine, and wait as your meal cooks.