The Avila project

Merge ~vicamo/avila/+git/kernel-3.10:xenial-snappy/systemd-features into ~phablet-team/avila/+git/kernel-3.10:xenial

  1. Git
  2. lp:~vicamo/avila/+git/kernel-3.10
  3. xenial-snappy/systemd-features
  4. Merge into xenial
Proposed by You-Sheng Yang
Status: Merged
Approved by: You-Sheng Yang
Approved revision: edcc34677864b628b45c9f26f433c55e318c26d9
Merged at revision: edcc34677864b628b45c9f26f433c55e318c26d9
Proposed branch: ~vicamo/avila/+git/kernel-3.10:xenial-snappy/systemd-features
Merge into: ~phablet-team/avila/+git/kernel-3.10:xenial
Diff against target: 98 lines (+14/-12)
2 files modified
arch/arm64/configs/bq_aquaris_m10_FHD_ubuntu_debug_defconfig (+7/-6)
arch/arm64/configs/bq_aquaris_m10_FHD_ubuntu_defconfig (+7/-6)
Reviewer Review Type Date Requested Status
You-Sheng Yang (community) Approve
Review via email: mp+306440@code.launchpad.net

This proposal supersedes a proposal from 2016-09-21.

Description of the change

enable features for systemd

Bug: https://bugs.launchpad.net/avila-private/xenial64/+bug/1625422

To post a comment you must log in.
Revision history for this message
You-Sheng Yang (vicamo) wrote : Posted in a previous version of this proposal

This mp targets the ubuntu branch, which may affect current vivid/upstart based devices so should NOT really merge. Maybe we need another new branch for this.

review: Disapprove
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote : Posted in a previous version of this proposal

Please propose against xenial branch, as discussed. xenial+upstart is not affected adversely by these changes.

Revision history for this message
You-Sheng Yang (vicamo) wrote :

Verified on xenial+upstart by alfonso, and on xenial+systemd by me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/arch/arm64/configs/bq_aquaris_m10_FHD_ubuntu_debug_defconfig b/arch/arm64/configs/bq_aquaris_m10_FHD_ubuntu_debug_defconfig
2index 110ff4e..8df706d 100755
3--- a/arch/arm64/configs/bq_aquaris_m10_FHD_ubuntu_debug_defconfig
4+++ b/arch/arm64/configs/bq_aquaris_m10_FHD_ubuntu_debug_defconfig
5@@ -105,10 +105,10 @@ CONFIG_CGROUP_CPUACCT=y
6 # CONFIG_CGROUP_PERF is not set
7 CONFIG_CGROUP_SCHED=y
8 CONFIG_FAIR_GROUP_SCHED=y
9-# CONFIG_CFS_BANDWIDTH is not set
10+CONFIG_CFS_BANDWIDTH=y
11 CONFIG_RT_GROUP_SCHED=n
12 # CONFIG_BLK_CGROUP is not set
13-# CONFIG_CHECKPOINT_RESTORE is not set
14+CONFIG_CHECKPOINT_RESTORE=y
15 CONFIG_NAMESPACES=y
16 CONFIG_UTS_NS=y
17 CONFIG_IPC_NS=y
18@@ -2859,9 +2859,10 @@ CONFIG_QUOTA_TREE=y
19 # CONFIG_QFMT_V1 is not set
20 CONFIG_QFMT_V2=y
21 CONFIG_QUOTACTL=y
22-# CONFIG_AUTOFS4_FS is not set
23+CONFIG_AUTOFS4_FS=y
24 CONFIG_FUSE_FS=y
25 # CONFIG_CUSE is not set
26+CONFIG_GENERIC_ACL=y
27
28 #
29 # Caches
30@@ -2895,8 +2896,8 @@ CONFIG_PROC_SYSCTL=y
31 CONFIG_PROC_PAGE_MONITOR=y
32 CONFIG_SYSFS=y
33 CONFIG_TMPFS=y
34-# CONFIG_TMPFS_POSIX_ACL is not set
35-# CONFIG_TMPFS_XATTR is not set
36+CONFIG_TMPFS_POSIX_ACL=y
37+CONFIG_TMPFS_XATTR=y
38 # CONFIG_HUGETLB_PAGE is not set
39 CONFIG_CONFIGFS_FS=y
40 CONFIG_MISC_FILESYSTEMS=y
41@@ -3122,7 +3123,7 @@ CONFIG_SECURITYFS=y
42 CONFIG_SECURITY_NETWORK=y
43 # CONFIG_SECURITY_NETWORK_XFRM is not set
44 CONFIG_SECURITY_PATH=y
45-CONFIG_LSM_MMAP_MIN_ADDR=32768
46+CONFIG_LSM_MMAP_MIN_ADDR=0
47 CONFIG_SECURITY_SELINUX=y
48 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
49 CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
50diff --git a/arch/arm64/configs/bq_aquaris_m10_FHD_ubuntu_defconfig b/arch/arm64/configs/bq_aquaris_m10_FHD_ubuntu_defconfig
51index e693b8a..806630e 100755
52--- a/arch/arm64/configs/bq_aquaris_m10_FHD_ubuntu_defconfig
53+++ b/arch/arm64/configs/bq_aquaris_m10_FHD_ubuntu_defconfig
54@@ -104,10 +104,10 @@ CONFIG_CGROUP_CPUACCT=y
55 # CONFIG_RESOURCE_COUNTERS is not set
56 CONFIG_CGROUP_SCHED=y
57 CONFIG_FAIR_GROUP_SCHED=y
58-# CONFIG_CFS_BANDWIDTH is not set
59+CONFIG_CFS_BANDWIDTH=y
60 CONFIG_RT_GROUP_SCHED=n
61 # CONFIG_BLK_CGROUP is not set
62-# CONFIG_CHECKPOINT_RESTORE is not set
63+CONFIG_CHECKPOINT_RESTORE=y
64 CONFIG_NAMESPACES=y
65 CONFIG_UTS_NS=y
66 CONFIG_IPC_NS=y
67@@ -2851,9 +2851,10 @@ CONFIG_QUOTA_TREE=y
68 # CONFIG_QFMT_V1 is not set
69 CONFIG_QFMT_V2=y
70 CONFIG_QUOTACTL=y
71-# CONFIG_AUTOFS4_FS is not set
72+CONFIG_AUTOFS4_FS=y
73 CONFIG_FUSE_FS=y
74 # CONFIG_CUSE is not set
75+CONFIG_GENERIC_ACL=y
76
77 #
78 # Caches
79@@ -2887,8 +2888,8 @@ CONFIG_PROC_SYSCTL=y
80 CONFIG_PROC_PAGE_MONITOR=y
81 CONFIG_SYSFS=y
82 CONFIG_TMPFS=y
83-# CONFIG_TMPFS_POSIX_ACL is not set
84-# CONFIG_TMPFS_XATTR is not set
85+CONFIG_TMPFS_POSIX_ACL=y
86+CONFIG_TMPFS_XATTR=y
87 # CONFIG_HUGETLB_PAGE is not set
88 CONFIG_CONFIGFS_FS=y
89 CONFIG_MISC_FILESYSTEMS=y
90@@ -3104,7 +3105,7 @@ CONFIG_SECURITYFS=y
91 CONFIG_SECURITY_NETWORK=y
92 # CONFIG_SECURITY_NETWORK_XFRM is not set
93 CONFIG_SECURITY_PATH=y
94-CONFIG_LSM_MMAP_MIN_ADDR=32768
95+CONFIG_LSM_MMAP_MIN_ADDR=0
96 CONFIG_SECURITY_SELINUX=y
97 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
98 CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0

Subscribers

People subscribed via source and target branches