From 354406b7a1f5b120c85c24042283d3db9b47f6c9 Mon Sep 17 00:00:00 2001
From: Mykola Salomatin <mykola.salomatin@globallogic.com>
Date: Fri, 12 Aug 2022 15:26:51 +0300
Subject: Fix bitbake patch log indication that patches do not apply cleanly.

---
 recipes-core/udev/udev-extraconf/mount.patch | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'recipes-core')

diff --git a/recipes-core/udev/udev-extraconf/mount.patch b/recipes-core/udev/udev-extraconf/mount.patch
index 4ed3bfd..752e09e 100644
--- a/recipes-core/udev/udev-extraconf/mount.patch
+++ b/recipes-core/udev/udev-extraconf/mount.patch
@@ -1,6 +1,6 @@
 diff -Naru orig/mount.blacklist new/mount.blacklist
---- orig/mount.blacklist	2019-10-24 17:08:59.796796272 -0500
-+++ new/mount.blacklist	2019-10-24 17:16:31.768782892 -0500
+--- orig/mount.blacklist	2022-08-11 19:17:58.897952564 +0300
++++ new/mount.blacklist	2022-08-11 19:17:45.877922680 +0300
 @@ -3,3 +3,16 @@
  /dev/mtdblock
  /dev/md
@@ -19,8 +19,8 @@ diff -Naru orig/mount.blacklist new/mount.blacklist
 +[PARTLABEL=config2]
 +[PARTLABEL=user_data]
 diff -Naru orig/mount.sh new/mount.sh
---- orig/mount.sh	2020-09-09 13:57:23.196157483 -0500
-+++ new/mount.sh	2020-09-09 14:59:40.344046845 -0500
+--- orig/mount.sh	2022-08-11 19:17:58.897952564 +0300
++++ new/mount.sh	2022-08-11 19:17:45.913922763 +0300
 @@ -4,8 +4,8 @@
  #
  # Attempt to mount any added block devices and umount any removed devices
@@ -73,7 +73,7 @@ diff -Naru orig/mount.sh new/mount.sh
  	if [ ` expr match "$DEVNAME" "$line" ` -gt 0 ];
  	then
  		logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring"
-@@ -41,7 +68,7 @@
+@@ -47,7 +74,7 @@
      # Skip the partition which are already in /etc/fstab
      grep "^[[:space:]]*$DEVNAME" /etc/fstab && return
      for n in LABEL PARTLABEL UUID PARTUUID; do
@@ -82,7 +82,7 @@ diff -Naru orig/mount.sh new/mount.sh
          test -z "$tmp" && continue
          tmp="$n=$tmp"
          grep "^[[:space:]]*$tmp" /etc/fstab && return
-@@ -49,13 +76,17 @@
+@@ -55,13 +82,17 @@
  
      [ -d "/run/media/$name" ] || mkdir -p "/run/media/$name"
  
@@ -99,9 +99,9 @@ diff -Naru orig/mount.sh new/mount.sh
 -        MOUNT="$MOUNT -o umask=007,gid=`awk -F':' '/^disk/{print $3}' /etc/group`"
 +        MOUNT="$MOUNT -o errors=continue -o umask=007,gid=`awk -F':' '/^disk/{print $3}' /etc/group`"
          ;;
-     # TODO
-     *)
-@@ -78,7 +109,11 @@
+     swap)
+         return ;;
+@@ -86,7 +117,11 @@
  	if [ -x "$PMOUNT" ]; then
  		$PMOUNT $DEVNAME 2> /dev/null
  	elif [ -x $MOUNT ]; then
@@ -113,7 +113,7 @@ diff -Naru orig/mount.sh new/mount.sh
  	fi
  
  	# If the device isn't mounted at this point, it isn't
-@@ -86,6 +121,11 @@
+@@ -94,6 +129,11 @@
  	grep -q "^$DEVNAME " /proc/mounts && return
  
  	! test -d "/run/media/$name" && mkdir -p "/run/media/$name"
@@ -125,12 +125,12 @@ diff -Naru orig/mount.sh new/mount.sh
  	# Silent util-linux's version of mounting auto
  	if [ "x`readlink $MOUNT`" = "x/bin/mount.util-linux" ] ;
  	then
-@@ -96,7 +136,7 @@
+@@ -104,7 +144,7 @@
  	# grant it with  w/r/x permissions.
  	case $ID_FS_TYPE in
  	vfat|fat)
 -		MOUNT="$MOUNT -o umask=007,gid=`awk -F':' '/^disk/{print $3}' /etc/group`"
 +		MOUNT="$MOUNT -o errors=continue -o umask=007,gid=`awk -F':' '/^disk/{print $3}' /etc/group`"
  		;;
- 	# TODO
- 	*)
+	swap)
+		return ;;
-- 
cgit v1.2.3