0001-Expose-virtual-PID-from-child-namespace-in-proc-PID-.patch

From 341582cd1048791119c9b7e2c036081c2ca8a548 Mon Sep 17 00:00:00 2001
From: Tony Espy <espy@canonical.com>
Date: Wed, 27 Feb 2013 17:34:33 -0500
Subject: [PATCH 1/2] Expose virtual PID from child namespace in
 /proc/PID/status.

The virtual PID is used by Ubuntu Touch application manager code ( which
runs in the Android namespace ), to communicate with code that runs inside the
Ubuntu container.

This patch is not from upstream.  It was proposed on the lxc-users
mailing list:

http://www.mail-archive.com/lxc-users@lists.sourceforge.net/msg01840.html

Change-Id: If63652002c227827fb524e03a1d0210fc2b7d4b1
Original-Author: Greg Kurz <gkurz@fr.ibm.com>
Signed-off-by: Greg Kurz <gkurz@fr.ibm.com>
Signed-off-by: Tony Espy <espy@canonical.com>
Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
---
 fs/proc/array.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/fs/proc/array.c b/fs/proc/array.c
index f9bd395..83ea1bc 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -337,6 +337,12 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
 	seq_putc(m, '\n');
 }
 
+static void task_vpid(struct seq_file *m, struct task_struct *task)
+{
+	struct pid_namespace *ns = task_active_pid_ns(task);
+	seq_printf(m, "Vpid:\t%d\n", ns ? task_pid_nr_ns(task, ns) : 0);
+}
+
 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
 			struct pid *pid, struct task_struct *task)
 {
@@ -354,6 +360,7 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
 	task_cpus_allowed(m, task);
 	cpuset_task_status_allowed(m, task);
 	task_context_switch_counts(m, task);
+	task_vpid(m, task);
 	return 0;
 }
 
-- 
1.8.3.1

0002-update-goldfish-armv7-configuration-for-ubuntu-touch.patch

From 6bad3adfd181955c4a44cd405cf387ef298407f7 Mon Sep 17 00:00:00 2001
From: Chirayu Desai <cdesai@cyanogenmod.org>
Date: Tue, 11 Jun 2013 16:26:53 +0530
Subject: [PATCH 2/2] update goldfish armv7 configuration for ubuntu touch

Signed-off-by: Chirayu Desai <cdesai@cyanogenmod.org>
---
 arch/arm/configs/cyanogenmod_goldfish_armv7_defconfig | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/arch/arm/configs/cyanogenmod_goldfish_armv7_defconfig b/arch/arm/configs/cyanogenmod_goldfish_armv7_defconfig
index 7f80d72..4d01aea 100644
--- a/arch/arm/configs/cyanogenmod_goldfish_armv7_defconfig
+++ b/arch/arm/configs/cyanogenmod_goldfish_armv7_defconfig
@@ -63,11 +63,11 @@ CONFIG_RESOURCE_COUNTERS=y
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
 CONFIG_NAMESPACES=y
-# CONFIG_UTS_NS is not set
-# CONFIG_IPC_NS is not set
-# CONFIG_USER_NS is not set
-# CONFIG_PID_NS is not set
-# CONFIG_NET_NS is not set
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -332,7 +332,7 @@ CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
-CONFIG_ANDROID_PARANOID_NETWORK=y
+# CONFIG_ANDROID_PARANOID_NETWORK is not set
 # CONFIG_NETWORK_SECMARK is not set
 CONFIG_NETFILTER=y
 # CONFIG_BRIDGE_NETFILTER is not set
@@ -928,6 +928,7 @@ CONFIG_FILE_LOCKING=y
 # CONFIG_XFS_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_BTRFS_FS is not set
+CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
@@ -1262,3 +1263,8 @@ CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
+
+CONFIG_DEVTMPFS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
-- 
1.8.3.1