Selaa lähdekoodia

use prebuilt file_contexts for selinux

bigbiff bigbiff 13 vuotta sitten
vanhempi
commit
ba37e8ad1d

+ 3 - 2
BoardConfig.mk

@@ -23,13 +23,13 @@ TARGET_ARCH := arm
 TARGET_ARCH_VARIANT := armv7-a-neon
 TARGET_CPU_SMP := true
 ARCH_ARM_HAVE_TLS_REGISTER := true
-
+BOARD_USE_CUSTOM_RECOVERY_FONT:= \"roboto_23x41.h\"
 
 BOARD_KERNEL_CMDLINE :=  console=null androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x3F
 BOARD_KERNEL_BASE :=  0x00000000
 #BOARD_FORCE_RAMDISK_ADDRESS := 0x02000000
 BOARD_KERNEL_PAGESIZE := 2048
-BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x0200000 --dt device/samsung/hltetmo/dtb --tags_offset 0x01e000000
+BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x0200000
 
 BOARD_BOOTIMAGE_PARTITION_SIZE :=     0x105c0000
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 0x00D00000
@@ -44,6 +44,7 @@ TARGET_PREBUILT_KERNEL := device/samsung/hltetmo/kernAl
 # Use this flag if the board has a ext4 partition larger than 2gb
 BOARD_HAS_LARGE_FILESYSTEM := true
 TARGET_USERIMAGES_USE_EXT4 := true
+BOARD_CUSTOM_BOOTIMG_MK :=  device/samsung/hltetmo/custombootimg.mk
 
 # TWRP specific build flags
 DEVICE_RESOLUTION := 1080x1920

+ 15 - 0
custombootimg.mk

@@ -0,0 +1,15 @@
+LOCAL_PATH := $(call my-dir)
+
+DTBTOOL := device/samsung/hltetmo/mkbootimg_dtb
+KERNEL := device/samsung/hltetmo/kernAl
+DTB := device/samsung/hltetmo/dtb
+
+INSTALLED_RECOVERYIMAGE_TARGET := $(PRODUCT_OUT)/recovery.img
+$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTIMG) \
+	$(recovery_ramdisk) \
+	$(recovery_kernel)
+	@echo ----- Making recovery image ------
+	$(hide) mkbootimg --kernel $(PRODUCT_OUT)/kernel --ramdisk $(PRODUCT_OUT)/ramdisk-recovery.img --cmdline "$(BOARD_KERNEL_CMDLINE)" --base $(BOARD_KERNEL_BASE) --pagesize $(BOARD_KERNEL_PAGESIZE) $(BOARD_MKBOOTIMG_ARGS) -o $(INSTALLED_RECOVERYIMAGE_TARGET)
+	@echo ----- Made recovery image -------- $@
+	$(hide) $(DTBTOOL) --kernel $(KERNEL) --ramdisk $(PRODUCT_OUT)/ramdisk-recovery.img --cmdline "console=null androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x3F" --base 0x00000000 --offset 0x02000000 --dt $(DTB) --pagesize 2048 --tags-addr 0x01e00000 -o $(PRODUCT_OUT)/recovery.img
+	@echo ----- Added DTB ------------------ $@

+ 2 - 8
device.mk

@@ -23,15 +23,9 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/recovery/libkeyutils.so:recovery/root/sbin/libkeyutils.so \
     $(LOCAL_PATH)/recovery/libsec_ecryptfs.so:recovery/root/sbin/libsec_ecryptfs.so \
-    $(LOCAL_PATH)/recovery/libsec_km.so:recovery/root/sbin/libsec_km.so
+    $(LOCAL_PATH)/recovery/libsec_km.so:recovery/root/sbin/libsec_km.so \
+	$(LOCAL_PATH)/selinux/file_contexts:recovery/root/prebuiltfile_contexts
 
-# SELinux
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/file_contexts:recovery/root/file_contexts \
-    $(LOCAL_PATH)/property_contexts:recovery/root/property_contexts \
-    $(LOCAL_PATH)/seapp_contexts:recovery/root/seapp_contexts \
-    $(LOCAL_PATH)/sepolicy:recovery/root/sepolicy \
-    $(LOCAL_PATH)/sepolicy_version:recovery/root/sepolicy_version
 
 $(call inherit-product, build/target/product/full.mk)
 

BIN
kernAl


BIN
kernAl.selinux


+ 1 - 1
recovery.fstab

@@ -5,6 +5,6 @@
 /cache         ext4      /dev/block/platform/msm_sdcc.1/by-name/cache
 /efs           emmc      /dev/block/platform/msm_sdcc.1/by-name/efs		      flags=backup=1;display=EFS
 /efs           emmc      /dev/block/platform/msm_sdcc.1/by-name/modemst1      flags=backup=1;subpartitionof=/efs
-/efs           emmc      /dev/block/platform/msm_sdcc.1/by-name/modemst2      flags=backup=1;subpartitonof=/efs
+/efs           emmc      /dev/block/platform/msm_sdcc.1/by-name/modemst2      flags=backup=1;subpartitionof=/efs
 /external_sd   vfat      /dev/block/mmcblk1p1 /dev/block/mmcblk1              flags=display="Micro SDcard";storage;wipeingui;removable
 /modem         emmc      /dev/block/platform/msm_sdcc.1/by-name/modem		  flags=backup=1;display="Modem"

+ 0 - 0
selinux/device.te


+ 0 - 0
selinux/file.te


+ 2 - 0
file_contexts → selinux/file_contexts

@@ -146,6 +146,7 @@
 /system/xbin/su		u:object_r:su_exec:s0
 /system/vendor/bin/gpsd u:object_r:gpsd_exec:s0
 /system/bin/ping    u:object_r:ping_exec:s0
+/system/lost+found	u:object_r:system_file:s0
 #############################
 # Data files
 #
@@ -195,6 +196,7 @@
 /cache/.*\.restore	u:object_r:cache_backup_file:s0
 # LocalTransport (backup) uses this directory
 /cache/backup(/.*)?	u:object_r:cache_backup_file:s0
+/cache/lost\+found u:object_r:cache_file:s0
 #############################
 # sysfs files
 #

+ 0 - 0
property_contexts → selinux/property_contexts


+ 0 - 0
seapp_contexts → selinux/seapp_contexts


+ 0 - 0
sepolicy → selinux/sepolicy


+ 0 - 0
sepolicy_version → selinux/sepolicy_version