2caa2ff976
Porting CentOS patch 1001-add-tboot.patch Ignore 3 CentOS patches: a) 1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch It replaces "CentOS" with "Linux" in grub menu, that is introduced by a patch from grub2-2.02-0.86.el7.centos.src.rpm. 0176-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b) 1002-Don-t-write-trailing-colon-when-populating-MAC-strin.patch It is the supplement patch of 0263-Fix-grub_net_hwaddr_to_str.patch, which is from grub2-2.02-0.86.el7.centos.src.rpm. The original issue is introduced by 0248-Add-support-for-non-Ethernet-network-cards.patch, which is also from grub2-2.02-0.86.el7.centos.src.rpm. 3) 1003-tftp-roll-over-block-counter-to-prevent-timeouts-wit.patch It is duplicate of the patch in grub2_2.04-20.debian.tar.xz. debian/patches/tftp-roll-over-block-counter.patch Other patches in centos/meta_patches modify the spec file. The grub2 for each distributions is deep customized, so just ignore them. BTW, not using dl_path, because the package on salsa.debian.org has building issue. Test Plan: Pass: successfully build test Pass: successfully install test Pass: successfully boot test Story: 2009221 Task: 43679 Signed-off-by: Yue Tao <yue.tao@windriver.com> Change-Id: Icfd2f1993fd123824155c94da26c0ddf9a9c0873
49 lines
1.2 KiB
Diff
49 lines
1.2 KiB
Diff
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
|
|
|