Merge "grub2: add deb folder"

grub/grub2/debian/meta_data.yaml

@@ -0,0 +1,5 @@
+---
+debver: 2.04-20
+revision:
+  dist: $STX_DIST
+  PKG_GITREVCOUNT: true

grub/grub2/debian/patches/0001-grub2-add-tboot.patch

@@ -0,0 +1,32 @@
+From be38cbc51f89493c46e299950937b85893ca05e8 Mon Sep 17 00:00:00 2001
+From: Bin Qian <bin.qian@windriver.com>
+Date: Tue, 21 Nov 2017 15:36:42 -0500
+Subject: [PATCH] grub2: add tboot
+
+Original patch is 1001-add-tboot.patch
+
+Signed-off-by: Bin Qian <bin.qian@windriver.com>
+Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
+---
+ util/grub.d/10_linux.in | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index 0cd4cf5..81435a8 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -28,6 +28,11 @@ vt_handoff="@VT_HANDOFF@"
+ 
+ . "$pkgdatadir/grub-mkconfig_lib"
+ 
++tboot=`cat /proc/cmdline | xargs -n1 | grep '^tboot=true$'` || true
++if [ -n "$tboot"  ]; then
++  exit 0
++fi
++
+ export TEXTDOMAIN=@PACKAGE@
+ export TEXTDOMAINDIR="@localedir@"
+ 
+-- 
+2.25.1
+

grub/grub2/debian/patches/0002-grub2-checking-if-loop-devices-are-available.patch

@@ -0,0 +1,48 @@
+From bbd8d33b8646785ee31b435e9decf4271d6ecb68 Mon Sep 17 00:00:00 2001
+From: Yue Tao <Yue.Tao@windriver.com>
+Date: Sun, 5 Dec 2021 10:01:05 +0800
+Subject: [PATCH] grub2: checking if loop devices are available
+
+Building in a chroot environment, may not have loop device.
+
+Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
+---
+ tests/ext234_test.in | 5 +++++
+ tests/fat_test.in    | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/tests/ext234_test.in b/tests/ext234_test.in
+index 4f1eb52..380850e 100644
+--- a/tests/ext234_test.in
++++ b/tests/ext234_test.in
+@@ -25,6 +25,11 @@ if ! which mkfs.ext4 >/dev/null 2>&1; then
+    exit 77
+ fi
+ 
++if ! losetup -f >/dev/null 2>&1; then
++   echo "No loop device, cannot test."
++   exit 77
++fi
++
+ "@builddir@/grub-fs-tester" ext2_old
+ "@builddir@/grub-fs-tester" ext2
+ "@builddir@/grub-fs-tester" ext3
+diff --git a/tests/fat_test.in b/tests/fat_test.in
+index b6b4748..ab5348a 100644
+--- a/tests/fat_test.in
++++ b/tests/fat_test.in
+@@ -15,6 +15,11 @@ if ! which mkfs.vfat >/dev/null 2>&1; then
+    exit 77
+ fi
+ 
++if ! losetup -f >/dev/null 2>&1; then
++   echo "No loop device, cannot test."
++   exit 77
++fi
++
+ "@builddir@/grub-fs-tester" vfat16a
+ "@builddir@/grub-fs-tester" vfat12a
+ "@builddir@/grub-fs-tester" vfat12
+-- 
+2.25.1
+

grub/grub2/debian/patches/series

@@ -0,0 +1,2 @@
+0001-grub2-add-tboot.patch
+0002-grub2-checking-if-loop-devices-are-available.patch