recipes-bsp/fng-install/files/mx6/fnginstall-postinstallation → recipes-bsp/fng-install/files/fnginstall-postinstallation

@@ -7,4 +7,4 @@
 
 
 # Create linuiximage from kernel, devicetree
-guf-prepare-kernel.sh
+gf-prepare-kernel.sh

recipes-bsp/fng-install/files/mx6/guf-prepare-kernel.sh → recipes-bsp/fng-install/files/gf-prepare-kernel.sh

@@ -7,11 +7,13 @@
 
 KERNEL_FILE=$1
 DEVICETREE_FILE=$2
-shift 2
+if [ $# -gt 2 ];then
+    shift 2
+fi
 DEVICETREE_OVERLAYS=$*
 
 # Make sure we have access to the bootpartition
-BOOTPARTITION=/dev/mmcblk0p2
+BOOTPARTITIONS="/dev/disk/by-label/LINUX /dev/mmcblk0p2 /dev/mmcblk1p2"
 MOUNTPOINT=/boot
 
 #========================================================
@@ -39,19 +41,26 @@ get_platform()
 
 # Currently the mmc is called mmcblk1 in dunfell                                                         
 # TODO allow other boot partitions for A-B boot scheme
-if [ ! -b "$BOOTPARTITION" ]                        
+for BOOTPARTITION in $BOOTPARTITIONS
+do
+    if [ -b "$BOOTPARTITION" ]                        
+    then
+        break
+    fi                                                                                                       
+done
+if [ ! -b "$BOOTPARTITION" ]                                                                             
 then                                                
-    BOOTPARTITION=/dev/mmcblk1p2                                                                             
-    if [ ! -b "$BOOTPARTITION" ]                                                                             
-    then                                                
-        echo "Failed to detect bootpartition"                                                            
-    fi                                                  
-fi                                                                                                       
-
-if ! mount | grep -q "^$BOOTPARTITION\>"
-then
+    echo "Failed to detect bootpartition"                                                            
+    exit 1
+fi                                                  
+
+if df_out="$(df -P "$BOOTPARTITION" 2>/dev/null )";
+then 
+    MOUNTPOINT="$( echo "$df_out"  | tail -n 1 | awk '{print $6}' )"
+    MOUNTED=false
+else
     # Make sure the mount point is there
-    mkdir -p $MOUNTPOINT
+    mkdir -p "$MOUNTPOINT"
     # Make sure nothing is mounted there
     if mount | grep -q "\<$MOUNTPOINT\>"
     then
@@ -59,11 +68,8 @@ then
         exit 1
 
     fi
-    mount $BOOTPARTITION $MOUNTPOINT
+    mount "$BOOTPARTITION" "$MOUNTPOINT"
     MOUNTED=true
-else
-    MOUNTPOINT="$( mount | grep "^$BOOTPARTITION\>" | awk '{print $3}' )"
-    MOUNTED=false
 fi
 
 if [ -z "$KERNEL_FILE" ]
@@ -76,7 +82,8 @@ then
 
         # Mark the currently installed kernel as selected:
         # (we are on fat, so we use a textfile instead of links):
-        KERNEL_FILE="$( find "$MOUNTPOINT" -maxdepth 1 -name "uImage*" -exec basename {} \; | head -n 1 )"
+        KERNEL_FILE="$( find "$MOUNTPOINT" -maxdepth 1 -name "uImage*" \
+                        -exec basename {} \; | head -n 1 )"
         if [ -z "$KERNEL_FILE" ]
         then
             echo "Failed to determine the kernel file to use."
@@ -92,7 +99,6 @@ then
     exit 1
 fi
 
-
 if [ -z "$DEVICETREE_FILE" ]
 then
     # Read default devicetree file from boot partition
@@ -119,11 +125,12 @@ then
     exit 1
 fi
 
+mount -o remount,async "$MOUNTPOINT"
+
 # Mark the currently selected devicetree as the one
 # (we are on fat, so we use a textfile instead of links):
 echo "${DEVICETREE_FILE}" > "${MOUNTPOINT}/devicetree"
-DEVICETREE_APPEND_FILE=$DEVICETREE_FILE
-# Store default kernel file for later usage
+DEVICETREE_APPEND_FILE=$DEVICETREE_FILE # Store default kernel file for later usage
 echo "$KERNEL_FILE" > "$MOUNTPOINT"/kernel
 
 if [ -x "/usr/bin/gfxml2dto" ]
@@ -152,6 +159,8 @@ sync
 if $MOUNTED
 then
     umount "$MOUNTPOINT"
+else
+    mount -o remount,sync "$MOUNTPOINT"
 fi
 
 exit 0

recipes-bsp/fng-install/fng-install-postinstallation.bb

@@ -4,12 +4,12 @@ require conf/guf-recipe.inc
 S = "${WORKDIR}"
 
 SRC_URI = " \
-	file://guf-prepare-kernel.sh \
+	file://gf-prepare-kernel.sh \
 	file://fnginstall-postinstallation \
 	"
 
 do_install () {
 	install -d ${D}${bindir}
 	install -m 0755 fnginstall-postinstallation ${D}${bindir}
-	install -m 0755 guf-prepare-kernel.sh ${D}${bindir}
+	install -m 0755 gf-prepare-kernel.sh ${D}${bindir}
 }

recipes-bsp/packagegroups/packagegroup-guf-minimal.bb

@@ -11,5 +11,6 @@ RDEPENDS_${PN} = "\
     nano \
     networkmanager \
     openssh-sftp-server \
+    sharedconf \
 "
 

recipes-bsp/packagegroups/packagegroup-guf-qt5.bb

@@ -12,6 +12,7 @@ PACKAGES = "\
 RDEPENDS_${PN} = "\
     qt3d \
     qtbase \
+    qtbase-fingerpaint \
     qtcharts \
     qtconnectivity \
     qtdatavis3d \

recipes-core/base-files/base-files/fstab

+
+/dev/root            /                    auto       defaults              1  1
+proc                 /proc                proc       defaults              0  0
+devpts               /dev/pts             devpts     mode=0620,ptmxmode=0666,gid=5      0  0
+tmpfs                /run                 tmpfs      mode=0755,nodev,nosuid,strictatime 0  0
+tmpfs                /var/volatile        tmpfs      defaults              0  0
+
+LABEL=LINUX          /boot                auto       defaults,sync,noexec,umask=077,nofail  0  2
+LABEL=CONFIG         /etc/shared          auto       defaults,sync,noexec,umask=077,nofail  0  2
+

recipes-guf/sharedconf/sharedconf.bb

+SUMMARY = "Garz & Fricke shared configuration script for xml config files"
+require conf/guf-recipe.inc
+
+SRC_URI = " \
+           file://sharedconf.rules;subdir=${S} \
+           "
+
+do_install() {
+    # Install udev rule to make mmcblkXbootY partition writeable
+    install -d ${D}${sysconfdir}/udev/rules.d/
+    install -m 0755 ${S}/sharedconf.rules ${D}/${sysconfdir}/udev/rules.d/
+}

recipes-guf/sharedconf/sharedconf/sharedconf.rules

+SUBSYSTEM=="block", KERNEL=="mmcblk[0-9]boot[0-9]", ENV{ID_FS_LABEL}=="CONFIG", ATTR{force_ro}="0"

recipes-qt/qt5/qtbase_%.bbappend

 PACKAGECONFIG_append = "gbm gles2 kms"  
 PACKAGECONFIG_append = " examples"
 
+
+do_install_append() {
+
+    # We don't install the examples by default but finger paint is widely used for testing
+    install -d ${D}/${bindir}
+    install -m 0755 ${B}/examples/widgets/touch/fingerpaint/fingerpaint ${D}/${bindir}/fingerpaint
+
+}
+
+PACKAGES =+ "${PN}-fingerpaint"
+FILES_${PN}-fingerpaint += "   ${bindir}/fingerpaint "
+