mako, grouper, maguro, tenderloin: fix mounts for new lxc overlay method

Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
shr-distribution · Jan 5, 2017 · fe8eda3 · fe8eda3
1 parent 17bba87
commit fe8eda3
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 10 deletions.
diff --git a/meta-asus/recipes-android/android-headers/android-headers-grouper_git.bb b/meta-asus/recipes-android/android-headers/android-headers-grouper_git.bb
@@ -1,9 +1,10 @@
 require recipes-android/android-headers/android-headers.inc
 
 PV = "4.2.2+gitr${SRCPV}"
-SRCREV = "59648ed5520a2274ce2549b249416a0dad50583c"
+SRCREV = "957ab6e28aea03d0cf6495f33ade9ddfff480ccc"
 
-SRC_URI = "git://github.com/webOS-ports/phablet-headers.git;branch=master;protocol=git"
-S = "${WORKDIR}/git"
+SRC_URI = "git://git.launchpad.net/android-headers;branch=master;protocol=git"
+ANDROID_API = "19"
+S = "${WORKDIR}/git/${ANDROID_API}"
 
 COMPATIBLE_MACHINE = "^grouper$"
diff --git a/meta-asus/recipes-core/base-files/base-files/grouper/fstab b/meta-asus/recipes-core/base-files/base-files/grouper/fstab
@@ -0,0 +1,8 @@
+rootfs                  /                    auto       defaults              1  1
+proc                    /proc                proc       defaults              0  0
+devpts                  /dev/pts             devpts     mode=0620,gid=5       0  0
+usbdevfs                /proc/bus/usb        usbdevfs   noauto                0  0
+tmpfs                   /run                 tmpfs      mode=0755,nodev,nosuid,strictatime 0  0
+tmpfs                   /var/volatile        tmpfs      defaults              0  0
+/dev/mmcblk0p3          /system              auto       ro,nofail             0  0
+
diff --git a/meta-asus/recipes-core/base-files/base-files_3.0.14.bbappend b/meta-asus/recipes-core/base-files/base-files_3.0.14.bbappend
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+do_install_append_grouper() {
+    # install additional mount directory for root of original android system
+    install -m 0755 -d ${D}/system
+}
diff --git a/meta-hp/recipes-android/android-headers/android-headers-tenderloin_git.bb b/meta-hp/recipes-android/android-headers/android-headers-tenderloin_git.bb
@@ -1,9 +1,10 @@
 require recipes-android/android-headers/android-headers.inc
 
 PV = "4.4.3+gitr${SRCPV}"
-SRCREV = "890bef235d53ab09e140f02dcc27d1993df6e9df"
+SRCREV = "957ab6e28aea03d0cf6495f33ade9ddfff480ccc"
 
-SRC_URI = "git://github.com/webOS-ports/phablet-headers.git;branch=cm-11.0;protocol=git"
-S = "${WORKDIR}/git"
+SRC_URI = "git://git.launchpad.net/android-headers;branch=master;protocol=git"
+ANDROID_API = "19"
+S = "${WORKDIR}/git/${ANDROID_API}"
 
 COMPATIBLE_MACHINE = "^tenderloin$"
diff --git a/meta-hp/recipes-core/base-files/base-files/tenderloin/fstab b/meta-hp/recipes-core/base-files/base-files/tenderloin/fstab
@@ -4,4 +4,5 @@ devpts                  /dev/pts             devpts     mode=0620,gid=5       0
 usbdevfs                /proc/bus/usb        usbdevfs   noauto                0  0
 tmpfs                   /run                 tmpfs      mode=0755,nodev,nosuid,strictatime 0  0
 tmpfs                   /var/volatile        tmpfs      defaults              0  0
+/dev/mapper/store-cm--system  /system        auto       ro,nofail             0  0
 
diff --git a/meta-hp/recipes-core/base-files/base-files_3.0.14.bbappend b/meta-hp/recipes-core/base-files/base-files_3.0.14.bbappend
@@ -1 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+do_install_append_tenderloin() {
+    # install additional mount directory for root of original android system
+    install -m 0755 -d ${D}/system
+}
diff --git a/meta-lg/recipes-core/base-files/base-files/mako/fstab b/meta-lg/recipes-core/base-files/base-files/mako/fstab
@@ -7,4 +7,4 @@ tmpfs                /var/volatile        tmpfs      defaults              0  0
 
 /dev/mmcblk0p1       /firmware            vfat       ro,uid=1000,gid=1000,dmask=227,fmask=337,nofail 0 0
 /dev/mmcblk0p20      /persist             ext4       nosuid,nodev,barrier=1,data=ordered,nodelalloc,nofail 0 0
-/dev/mmcblk0p21      /system              ext4       ro,relatime,data=ordered,nofail 0 0
+/dev/mmcblk0p21      /system              ext4       ro,nofail 0 0
diff --git a/meta-lg/recipes-core/base-files/base-files_3.0.14.bbappend b/meta-lg/recipes-core/base-files/base-files_3.0.14.bbappend
@@ -1,6 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 do_install_append_mako() {
+    # install additional mount directory for root of original android system
+    install -m 0755 -d ${D}/system
     install -d ${D}/firmware
     install -d ${D}/persist
 }
diff --git a/meta-samsung/recipes-android/android-headers/android-headers-maguro_git.bb b/meta-samsung/recipes-android/android-headers/android-headers-maguro_git.bb
@@ -1,9 +1,10 @@
 require recipes-android/android-headers/android-headers.inc
 
 PV = "4.2.2+gitr${SRCPV}"
-SRCREV = "59648ed5520a2274ce2549b249416a0dad50583c"
+SRCREV = "957ab6e28aea03d0cf6495f33ade9ddfff480ccc"
 
-SRC_URI = "git://github.com/webOS-ports/phablet-headers.git;branch=master;protocol=git"
-S = "${WORKDIR}/git"
+SRC_URI = "git://git.launchpad.net/android-headers;branch=master;protocol=git"
+ANDROID_API = "19"
+S = "${WORKDIR}/git/${ANDROID_API}"
 
 COMPATIBLE_MACHINE = "^maguro$"
diff --git a/meta-samsung/recipes-core/base-files/base-files/tuna/fstab b/meta-samsung/recipes-core/base-files/base-files/tuna/fstab
@@ -5,3 +5,4 @@ usbdevfs             /proc/bus/usb        usbdevfs   noauto                0  0
 tmpfs                /var/volatile        tmpfs      defaults              0  0
 /dev/mmcblk0p3       /factory             auto       defaults              0  0
 /dev/mmcblk0p3       /data/radio          auto       defaults              0  0
+/dev/mmcblk0p10      /system              auto       ro,nofail             0  0
diff --git a/meta-samsung/recipes-core/base-files/base-files_3.0.14.bbappend b/meta-samsung/recipes-core/base-files/base-files_3.0.14.bbappend
@@ -6,6 +6,9 @@ do_install_append_crespo() {
 }
 
 do_install_append_tuna() {
+    # install additional mount directory for root of original android system
+    install -m 0755 -d ${D}/system
+
     # install additional mount directory for modem related data
     install -m 0755 -d ${D}/factory