rename config.txt file to diya-config.txt to avoid conflict wuth rpi

recipes-core/images/base-image.inc

@@ -8,7 +8,7 @@ EXTRA_USERS_PARAMS =    "usermod -d /home/diya -p 2Pe/4xyFxsokE diya; \
                         usermod -a -G audio diya; \
                         usermod -a -G sudo diya; \
                         "
-IMAGE_BOOT_FILES:append = " fs_resize config.txt recovery-${MACHINE}.cpio.gz Image "
+IMAGE_BOOT_FILES:append = " fs_resize diya-config.txt recovery-${MACHINE}.cpio.gz Image "
 
 IMAGE_INSTALL:append = "kernel-modules \
                         e2fsprogs \

recipes-core/images/core-image-recovery.bb

@@ -41,12 +41,6 @@ IMAGE_PREPROCESS_COMMAND += "image_patch;"
 image_patch () {
     # delete unused image
     rm -rf ${IMAGE_ROOTFS}/boot/*
-    # create /etc/fstab
-    cat << EOF > ${IMAGE_ROOTFS}/etc/fstab
-/dev/mmcblk1p1       /boot          auto       defaults  0  0
-/dev/mmcblk1p4       /home          auto       defaults  0  0
-
-EOF
     cat << EOF > ${IMAGE_ROOTFS}/etc/hostname
 diya-recovery
 EOF

recipes-diya/diya-overlay/diya-overlay.bb

@@ -31,7 +31,7 @@ do_install() {
     install -m 0755 ${WORKDIR}/boot-to-recovery ${D}/sbin/boot-to-recovery
     install -m 0755 ${WORKDIR}/fs_resize ${DEPLOY_DIR_IMAGE}/
 
-    cat << EOF > ${DEPLOY_DIR_IMAGE}/config.txt
+    cat << EOF > ${DEPLOY_DIR_IMAGE}/diya-config.txt
 recovery=false
 recovery_image=recovery-${MACHINE}.cpio.gz
 console=both

recipes-diya/diya-overlay/files/boot-to-recovery

@@ -7,15 +7,15 @@ fi
 
 . /etc/profile
 
-if [ ! -e /boot/config.txt ]; then
+if [ ! -e /boot/diya-config.txt ]; then
     # prepare env for recovery boot
-    cat << EOF > /boot/config.txt
+    cat << EOF > /boot/diya-config.txt
 recovery=true
 recovery_image=recovery-${MACHINE}.cpio.gz
 EOF
 else
-    sed -i 's/^.*recovery.*/recovery=true/g' /boot/config.txt || \
+    sed -i 's/^.*recovery.*/recovery=true/g' /boot/diya-config.txt || \
-                echo "recovery=true" >> /boot/config.txt
+                echo "recovery=true" >> /boot/diya-config.txt
 fi
 echo "Rebooting to recovery mode"
 reboot

recipes-diya/diya-overlay/files/confd

@@ -3,8 +3,10 @@
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DESC="Auto deployment configuration from media"
 
+. /etc/profile
+
 if [ -z "$DISK" ]; then
-    DISK="mmcblk1"
+    DISK="mmcblk0"
 fi
 
 case "$1" in

recipes-diya/diya-overlay/files/expandfs.sh

@@ -1,7 +1,8 @@
 #! /bin/sh
+. /etc/profile
 
 if [ -z "$DISK" ]; then
-    DISK="mmcblk1"
+    DISK="mmcblk0"
 fi
 
 if [ "$(/usr/bin/id -u)" -ne 0 ]; then

recipes-diya/initramfs/files/confd

@@ -7,8 +7,8 @@ DESC="Custom configuration"
 case "$1" in
     start)
         echo -n "Start $DESC: "
-        sed -i 's/^.*recovery.*/recovery=false/g' /boot/config.txt || \
+        sed -i 's/^.*recovery.*/recovery=false/g' /boot/diya-config.txt || \
-                echo "recovery=false" >> /boot/config.txt
+                echo "recovery=false" >> /boot/diya-config.txt
     ;;
 
     *)

recipes-diya/initramfs/files/diya-update

@@ -2,15 +2,18 @@
 
 . /etc/profile
 
+if [ -z "$DISK" ]; then
+    DISK="mmcblk0"
+fi
+
 DEFAULT_ROOTFS_NAME="rootfs-$MACHINE.tar.bz2"
 DEFAULT_KERNEL_NAME="Image-$MACHINE.bin"
 DEFAULT_INITRAMFS_NAME="recovery-$MACHINE.cpio.gz"
 UPDATE_SRC_PATH="/home/diya/.update"
-ROOTFS_DEV="/dev/mmcblk1p2"
+ROOTFS_DEV="/dev/${DISK}p2"
 SUPPORTED_COMMAND="rootfs kernel initramfs all"
 TMP_MOUNT="/tmp/rootfs"
 
-
 rootfs()
 {
     filename=$1
@@ -54,9 +57,9 @@ rootfs()
     echo "Patch /etc/fstab"
     cat << EOF >> $TMP_MOUNT/etc/fstab
 
-/dev/mmcblk1p1  /boot   vfat    defaults        0       0
+/dev/${DISK}p1  /boot   vfat    defaults        0       0
-/dev/mmcblk1p3  /var/etc        ext4    defaults        0       0
+/dev/${DISK}p3  /var/etc        ext4    defaults        0       0
-/dev/mmcblk1p4  /home   ext4    defaults        0       0
+/dev/${DISK}p4  /home   ext4    defaults        0       0
 
 EOF
     sync

wic/image.wks.in

@@ -1,12 +0,0 @@
-# short-description: Create Raspberry Pi SD card image
-# long-description: Creates a partitioned SD card image for use with
-
-part u-boot --source rawcopy --sourceparams="file=${SPL_BINARY}" --ondisk mmcblk1 --no-table --align 8
-part /boot --source bootimg-partition --ondisk mmcblk1 --fstype=vfat --label boot --active --align 4096 --size 32
-# read only roofs
-part / --source rootfs --ondisk mmcblk1 --fstype=ext4 --label root --align 4096 --size 150 --exclude-path home/ --exclude-path var/etc/ --exclude-path boot/
-# modifiable configurations stored in /var/etc
-part /var/etc --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/var/etc --ondisk mmcblk1 --fstype=ext4 --label diya --align 1024 --size 32
-# home partition
-part /home --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --ondisk mmcblk1 --fstype=ext4 --label home --align 1024 --size 16
-# part /home --ondisk mmcblk1 --fstype=vfat --label music --active --align 1024 --size 16