Skip to contentSkip to conversation

config: android: move device mapper options to recommended

PATCH Applied Rob Herring 2 participants 6 messages Sep 8, 2016

lore
Share & tools
lore

Rob Herring

author
#0 lore raw

PATCH 1/3 config: android: move device mapper options to recommended

CONFIG_MD is in recommended, but other dependent options like DM_CRYPT and DM_VERITY options are in base. The result is the options in base don't get enabled when applying both base and recommended fragments. Move all the options to recommended.

Signed-off-by Rob Herring <[email protected]>
---
 kernel/configs/android-base.config        | 4 ----
 kernel/configs/android-recommended.config | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)
kernel/configs/android-base.config +0 -4
index 9f748ed..19eb7ac 100644
@@ -11,7 +11,6 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 CONFIG_ARMV8_DEPRECATED=y
 CONFIG_ASHMEM=y
 CONFIG_AUDIT=y
-CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_CPUACCT=y

@@ -19,9 +18,6 @@ CONFIG_CGROUP_DEBUG=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CP15_BARRIER_EMULATION=y
-CONFIG_DM_CRYPT=y
-CONFIG_DM_VERITY=y
-CONFIG_DM_VERITY_FEC=y
 CONFIG_EMBEDDED=y
 CONFIG_FB=y
 CONFIG_HIGH_RES_TIMERS=y
kernel/configs/android-recommended.config +4 -0
index e3b953e..297756b 100644
@@ -6,12 +6,16 @@
 # CONFIG_PM_WAKELOCKS_GC is not set
 # CONFIG_VT is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_COMPACTION=y
 CONFIG_DEBUG_RODATA=y
+CONFIG_DM_CRYPT=y
 CONFIG_DM_UEVENT=y
+CONFIG_DM_VERITY=y
+CONFIG_DM_VERITY_FEC=y
 CONFIG_DRAGONRISE_FF=y
 CONFIG_ENABLE_DEFAULT_TRACERS=y
 CONFIG_EXT4_FS=y
Signature · 1 line
2.9.3
author
#1 lore raw

PATCH 2/3 config: android: set SELinux as default security mode

Android won't boot without SELinux enabled, so make it the default.

Signed-off-by Rob Herring <[email protected]>
---
 kernel/configs/android-base.config | 1 +
 1 file changed, 1 insertion(+)
kernel/configs/android-base.config +1 -0
index 19eb7ac..859fa27 100644
@@ -18,6 +18,7 @@ CONFIG_CGROUP_DEBUG=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CP15_BARRIER_EMULATION=y
+CONFIG_DEFAULT_SECURITY_SELINUX=y
 CONFIG_EMBEDDED=y
 CONFIG_FB=y
 CONFIG_HIGH_RES_TIMERS=y
Signature · 1 line
2.9.3
author
#3 lore raw

PATCH 3/3 config: android: enable CONFIG_SECCOMP

In reply to Rob Herring

As of Android N, SECCOMP is required. Without it, we will get mediaextractor error:

E /system/bin/mediaextractor: libminijail: prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER): Invalid argument

Signed-off-by Rob Herring <[email protected]>
---
 kernel/configs/android-base.config | 1 +
 1 file changed, 1 insertion(+)
kernel/configs/android-base.config +1 -0
index 859fa27..980e72d 100644
@@ -132,6 +132,7 @@ CONFIG_PREEMPT=y
 CONFIG_QUOTA=y
 CONFIG_RTC_CLASS=y
 CONFIG_RT_GROUP_SCHED=y
+CONFIG_SECCOMP=y
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_SELINUX=y
Signature · 1 line
2.9.3
Acked-by on v1 3/3
#4 lore raw

Re: [PATCH 3/3] config: android: enable CONFIG_SECCOMP

Quoted 6 lines · Rob Herring

As of Android N, SECCOMP is required. Without it, we will get mediaextractor error:

E /system/bin/mediaextractor: libminijail: prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER): Invalid argument

Signed-off-by Rob Herring <[email protected]>
Acked-by John Stultz <[email protected]>

thanks
-john