.gitignore

@@ -1,2 +1 @@
-SOURCES/os-prober_1.74.tar.xz
-/os-prober_1.74.tar.xz
+SOURCES/os-prober_1.77.tar.xz

.os-prober.metadata

@@ -0,0 +1 @@
+604118a2c85c019f26429d836053675f76a46063 SOURCES/os-prober_1.77.tar.xz

SOURCES/os-prober-grub2-mount-workaround.patch

@@ -0,0 +1,35 @@
+diff --git a/os-probes/mounted/common/90linux-distro b/os-probes/mounted/common/90linux-distro
+index 9bc5154..541079e 100755
+--- a/os-probes/mounted/common/90linux-distro
++++ b/os-probes/mounted/common/90linux-distro
+@@ -19,7 +19,7 @@ subvol="$5"
+ # symlinks we need to also check in $dir/usr/lib* for distributions that
+ # moved /lib* to /usr and only left symlinks behind.
+ # TODO: look for ld-linux.so on arches that have it
+-if (ls "$dir"/lib*/ld*.so* && [ -d "$dir/boot" ] || ls "$dir"/usr/lib*/ld*.so*) >/dev/null 2>/dev/null; then
++#if (ls "$dir"/lib*/ld*.so* && [ -d "$dir/boot" ] || ls "$dir"/usr/lib*/ld*.so*) >/dev/null 2>/dev/null; then
+ 	if [ -e "$dir/etc/os-release" ]; then
+ 		short="$(grep ^NAME= "$dir/etc/os-release" | sed 's/^[^=]*=//; s/^['\''"]\(.*\)['\''"]$/\1/; s/\\\(.\)/\1/g; s/[[:space:]].*//')"
+ 		long="$(grep ^PRETTY_NAME= "$dir/etc/os-release" | sed 's/^[^=]*=//; s/^['\''"]\(.*\)['\''"]$/\1/; s/\\\(.\)/\1/g')"
+@@ -140,8 +140,9 @@ if (ls "$dir"/lib*/ld*.so* && [ -d "$dir/boot" ] || ls "$dir"/usr/lib*/ld*.so*)
+ 		short="Devuan"
+ 		long="$(printf "Devuan GNU/Linux (%s)\n" "$(cat "$dir/etc/devuan_version")")"
+ 	else
+-		short="Linux"
+-		long="unknown Linux distribution"
++		exit 1
++#		short="Linux"
++#		long="unknown Linux distribution"
+ 	fi
+ 	
+         label="$(count_next_label "$short")"
+@@ -151,6 +152,6 @@ if (ls "$dir"/lib*/ld*.so* && [ -d "$dir/boot" ] || ls "$dir"/usr/lib*/ld*.so*)
+ 		result "$partition:$long:$label:linux"
+ 	fi
+ 	exit 0
+-else
+-	exit 1
+-fi
++#else
++#	exit 1
++#fi

SPECS/os-prober.spec

@@ -1,9 +1,8 @@
 Name:           os-prober
-Version:        1.74
-Release:        10%{?dist}
+Version:        1.77
+Release:        9%{?dist}
 Summary:        Probes disks on the system for installed operating systems
 
-Group:          System Environment/Base
 # For more information about licensing, see copyright file.
 License:        GPLv2+ and GPL+
 URL:            http://kitenet.net/~joey/code/os-prober/
@@ -21,13 +20,13 @@ Patch7:         os-prober-umount-fix.patch
 Patch8:         os-prober-grub2-parsefix.patch
 Patch9:         os-prober-grepfix.patch
 Patch10:        os-prober-gentoo-fix.patch
-Patch11:        os-prober-90fallback-include-possible-kernel-parameters-from-g.patch
-Patch12:        os-prober-common.sh-do-not-resolve-symbolic-link-on-mapped-dev.patch
+Patch11:        os-prober-grub2-mount-workaround.patch
 
 Requires:       udev coreutils util-linux
 Requires:       grep /bin/sed /sbin/modprobe
-Requires:       device-mapper
+Requires:       grub2-tools-minimal
 
+BuildRequires: make
 BuildRequires:  gcc git
 
 %description
@@ -36,14 +35,17 @@ in a generic machine-readable format. Support for new OSes and Linux
 distributions can be added easily. 
 
 %prep
-%autosetup -n %{name} -S git
+%autosetup -n %{name}-%{version} -S git
 
 find -type f -exec sed -i -e 's|usr/lib|usr/libexec|g' {} \;
 sed -i -e 's|grub-probe|grub2-probe|g' os-probes/common/50mounted-tests \
      linux-boot-probes/common/50mounted-tests
+sed -i -e 's|grub-mount|grub2-mount|g' os-probes/common/50mounted-tests \
+     linux-boot-probes/common/50mounted-tests common.sh
 
 %build
-%make_build CFLAGS="%{optflags}" LDFLAGS="%{build_ldflags}"
+%set_build_flags
+%make_build LDFLAGS="$LDFLAGS -fPIC"
 
 %install
 install -m 0755 -d %{buildroot}%{_bindir}
@@ -88,23 +90,39 @@ fi
 %{_var}/lib/%{name}
 
 %changelog
-* Mon Sep 2 2024 Leo Sandoval <lsandova@redhat.com> - 1.74-10
-- 90fallback: include possible kernel parameters from grub's default file
-- common.sh: do not resolve symbolic link on mapped device filesystems
-- Resolves: #RHEL-55234
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.77-9
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Tue Jun 22 2021 Javier Martinez Canillas <javierm@redhat.com> - 1.74-9
-- Another build but with a gating.yaml to allow leaving gating
-  Resolves: rhbz#1624158
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.77-8
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
-* Mon Jun 21 2021 Javier Martinez Canillas <javierm@redhat.com> - 1.74-8
-- Bump NVR to allow building
-  Resolves: rhbz#1624158
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.77-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
-* Thu Jul 25 2019 Peter Jones <pjones@redhat.com> - 1.74-7
-- Make gcc use -Wl,-z,now -Wl,-z,relro -pie.  Dunno why the default didn't
-  pick this up.
-  Resolves: rhbz#1624158
+* Sat Oct 10 2020 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 1.77-6
+- Workaround for grub2-mount slow wildcard file matching, fixes #1770599
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.77-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.77-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.77-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue May 14 2019 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 1.77-2
+- Use distro LDFLAGS when building the package, fixes #1543863
+
+* Tue May 14 2019 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 1.77-1
+- Update to 1.77, use grub2-mount rather than device mapper for mounts, fixes #1447156
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.74-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.74-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Sun Feb 18 2018 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 1.74-6
 - Add gcc build dependency

gating.yaml

@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-8
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: manual.sst_desktop.os-prober.functional}

os-prober-90fallback-include-possible-kernel-parameters-from-g.patch

@@ -1,53 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Leo Sandoval <lsandova@redhat.com>
-Date: Thu, 27 Jun 2024 10:53:32 -0600
-Subject: [PATCH] 90fallback: include possible kernel parameters from grub's
- default file
-
-Probed filesystems may include the GRUB's default
-file ($mpoint/etc/default/grub) so it desirable to source it and get
-and place either GRUB_CMDLINE_LINUX and/or GRUB_CMDLINE_LINUX_DEFAULT
-on the kernel parameters field, ultimately tools like grub2-mkconfig
-makes use of it and create menuentries with kernel parameters.
-
-Signed-off-by: Leo Sandoval <lsandova@redhat.com>
----
- linux-boot-probes/mounted/common/90fallback | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/linux-boot-probes/mounted/common/90fallback b/linux-boot-probes/mounted/common/90fallback
-index 7e40d15..cad7645 100755
---- a/linux-boot-probes/mounted/common/90fallback
-+++ b/linux-boot-probes/mounted/common/90fallback
-@@ -10,6 +10,22 @@ mpoint="$3"
- type="$4"
- 
- mappedpartition=$(mapdevfs "$partition" 2>/dev/null) || mappedpartition="$partition"
-+kernparams="root=$mappedpartition"
-+
-+# In case there is $mpoint/etc/default/grub, source it and take into account
-+# relevant command line variables. This function must be run inside a subshell
-+# otherwise grub default variable may be overriden
-+get_cmdline_linux_params()
-+{
-+    local mpoint_sysconfdir="$mpoint/etc"
-+    if test -f ${mpoint_sysconfdir}/default/grub ; then
-+	unset GRUB_CMDLINE_LINUX GRUB_CMDLINE_LINUX_DEFAULT
-+	. ${mpoint_sysconfdir}/default/grub
-+	echo "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-+    fi
-+}
-+
-+kernparams="$(echo $kernparams $(get_cmdline_linux_params) | sed 's/[[:space:]]\+$//')"
- 
- exitcode=1
- for kernpat in /vmlinuz /vmlinux /boot/vmlinuz /boot/vmlinux "/boot/vmlinuz*" \
-@@ -38,7 +54,7 @@ for kernpat in /vmlinuz /vmlinux /boot/vmlinuz /boot/vmlinux "/boot/vmlinuz*" \
- 			for initrd in $(eval ls "$initrdname" "$initrdname1" "$initrdname2" "$initrdname3" "$initrdname4" 2>/dev/null); do
- 				if [ "$initrd" != "$kernfile" ] && [ -f "$initrd" ] && [ ! -L "$initrd" ]; then
- 					initrd=$(echo "$initrd" | sed "s!^$mpoint!!")
--					result "$partition:$kernbootpart::$kernbasefile:$initrd:root=$mappedpartition"
-+					result "$partition:$kernbootpart::$kernbasefile:$initrd:$kernparams"
- 					exitcode=0
- 					foundinitrd=1
- 				fi

os-prober-common.sh-do-not-resolve-symbolic-link-on-mapped-dev.patch

@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Leo Sandoval <lsandova@redhat.com>
-Date: Thu, 27 Jun 2024 11:31:38 -0600
-Subject: [PATCH] common.sh: do not resolve symbolic link on mapped device
- filesystems
-
-/dev/dm-* devices may change from boot to boot so better to use the
-symlink instead of the resolved file name
-
-Signed-off-by: Leo Sandoval <lsandova@redhat.com>
----
- common.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/common.sh b/common.sh
-index a24286a..f0ebfb3 100644
---- a/common.sh
-+++ b/common.sh
-@@ -92,7 +92,7 @@ export fd_result  # so subshells inherit current value by default
- # shim to make it easier to use os-prober outside d-i
- if ! type mapdevfs >/dev/null 2>&1; then
-   mapdevfs () {
--    readlink -f "$1"
-+    echo "$1"
-   }
- fi
- 

rpminspect.yaml

@@ -1,13 +0,0 @@
----
-inspections:
-  # Not a Java package
-  javabytecode: off
-
-  # These just flag when things change "too much"
-  changedfiles: off
-  filesize: off
-  patches: off
-  upstream: off
-
-  # https://bugzilla.redhat.com/show_bug.cgi?id=2010936
-  annocheck: off

sources

@@ -1 +0,0 @@
-SHA512 (os-prober_1.74.tar.xz) = 5407fb3c782ae0532120995d60cfc307028de9bea52ce5534baaf940a99269b735c1174ef0f7a5316be485a1e8bfd097108c2819eadf00e2e38595bfc2c22245