Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
4d9209605c
!21 【Mainline】Update to 1.81
From: @yixiangzhike 
Reviewed-by: @xiezhipeng1 
Signed-off-by: @xiezhipeng1
2023-01-30 07:40:11 +00:00
yixiangzhike
cfc5c04e9f update to 1.81
Signed-off-by: yixiangzhike <yixiangzhike007@163.com>
2023-01-28 10:43:42 +08:00
openeuler-ci-bot
7da66c0741
!18 【轻量级 PR】:rebuild for next release
From: @markeryang 
Reviewed-by: @xiezhipeng1 
Signed-off-by: @xiezhipeng1
2022-11-01 09:20:30 +00:00
Markeryang
46da76a1ad
update for mass rebuild and upgrade verification
Signed-off-by: Markeryang <yanglongkang@h-partners.com>
2022-10-25 08:33:48 +00:00
openeuler-ci-bot
466f0f7ab5 !16 update version to 1.79
Merge pull request !16 from 杨壮壮/master
2021-12-29 08:45:36 +00:00
yang_zhuang_zhuang
78db631f65 update version to 1.79 2021-12-29 14:25:03 +08:00
openeuler-ci-bot
704ad7f090 !13 os-prober delete -Sgit from %autosetup, and delete BuildRequires git
From: @chenyanpanHW
Reviewed-by: @xiezhipeng1
Signed-off-by: @xiezhipeng1
2021-08-19 08:25:32 +00:00
chenyanpanHW
b695c5c5fe
delete -Sgit from %autosetup, and delete BuildRequires git 2021-07-30 23:12:39 +08:00
openeuler-ci-bot
ab7bfedca0 !9 Remove code using device mapper
From: @yang_zhuang_zhuang
Reviewed-by: @xiezhipeng1
Signed-off-by: @xiezhipeng1
2021-05-27 19:48:21 +08:00
yang_zhuang_zhuang
17043c2412 Remove code using device mapper 2021-05-26 17:07:13 +08:00
5 changed files with 28 additions and 25 deletions

Binary file not shown.

BIN
os-prober-1.81.tar.gz Normal file

Binary file not shown.

View File

@ -1,13 +0,0 @@
Index: os-prober/linux-boot-probes/mounted/common/90fallback
===================================================================
--- os-prober.orig/linux-boot-probes/mounted/common/90fallback
+++ os-prober/linux-boot-probes/mounted/common/90fallback
@@ -33,7 +33,7 @@ for kernpat in /vmlinuz /vmlinux /boot/v
# Dracut initramfses are named differently again.
initrdname3=$(echo "$kernfile" | sed "s/vmlinu[zx]/initramfs\*/" | sed 's/$/.img/')
# And Gentoo's also
- initrdname4=$(echo "$kernfile" | sed "s/kernel/initramfs\*/")
+ initrdname4=$(echo "$kernfile" | sed "s/kernel\|vmlinu[zx]/initramfs\*/")
foundinitrd=0
for initrd in $(eval ls "$initrdname" "$initrdname1" "$initrdname2" "$initrdname3" "$initrdname4" 2>/dev/null); do
if [ "$initrd" != "$kernfile" ] && [ -f "$initrd" ] && [ ! -L "$initrd" ]; then

View File

@ -1,7 +1,7 @@
Index: os-prober-1.58/linux-boot-probes/mounted/common/40grub2 diff --git a/linux-boot-probes/mounted/common/40grub2 b/linux-boot-probes/mounted/common/40grub2
=================================================================== index 664505f..5895e45 100755
--- os-prober-1.58.orig/linux-boot-probes/mounted/common/40grub2 --- a/linux-boot-probes/mounted/common/40grub2
+++ os-prober-1.58/linux-boot-probes/mounted/common/40grub2 +++ b/linux-boot-probes/mounted/common/40grub2
@@ -77,7 +77,7 @@ parse_grub_menu () { @@ -77,7 +77,7 @@ parse_grub_menu () {
ignore_item=1 ignore_item=1
fi fi
@ -17,6 +17,6 @@ Index: os-prober-1.58/linux-boot-probes/mounted/common/40grub2
;; ;;
- initrd) - initrd)
+ initrd*) + initrd*)
initrd="$(echo "$2" | sed 's/(.*)//')" shift
# Initrd same. initrd=""
if [ "$partition" != "$bootpart" ]; then for initrd_path in "$@"; do

View File

@ -1,5 +1,5 @@
Name: os-prober Name: os-prober
Version: 1.77 Version: 1.81
Release: 1 Release: 1
Summary: Probe disks on the system for other operating systems Summary: Probe disks on the system for other operating systems
License: GPLv2+ and GPL+ License: GPLv2+ and GPL+
@ -12,10 +12,9 @@ Patch2: os-prober-mounted-partitions-fix.patch
Patch3: os-prober-umount-fix.patch Patch3: os-prober-umount-fix.patch
Patch4: os-prober-grub2-parsefix.patch Patch4: os-prober-grub2-parsefix.patch
Patch5: os-prober-grepfix.patch Patch5: os-prober-grepfix.patch
Patch6: os-prober-gentoo-fix.patch
BuildRequires: gcc git BuildRequires: gcc
Requires: udev coreutils util-linux grep /bin/sed /sbin/modprobe device-mapper Requires: udev coreutils util-linux grep /bin/sed /sbin/modprobe grub2-tools-minimal
%description %description
Os-prober can probe disks on the system for other operating systems, Os-prober can probe disks on the system for other operating systems,
@ -23,10 +22,12 @@ and add them to the boot loader, so that installing current OS doesn't
make your other installed OS hard to boot. make your other installed OS hard to boot.
%prep %prep
%autosetup -n %{name}-%{version} -Sgit %autosetup -n %{name}-%{version} -p1
find -type f -exec sed -i -e 's|usr/lib|usr/libexec|g' {} \; 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 \ sed -i -e 's|grub-probe|grub2-probe|g' os-probes/common/50mounted-tests \
linux-boot-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 %build
%make_build %make_build
@ -82,6 +83,21 @@ fi
%{_libexecdir}/* %{_libexecdir}/*
%changelog %changelog
* Sat Jan 28 2023 yixiangzhike <yixiangzhike007@163.com> - 1.81-1
- update version to 1.81
* Tue Oct 25 2022 yanglongkang <yanglongkang@h-partners.com> - 1.79-2
- rebuild for next release
* Wed Dec 29 2021 yangzhuangzhuang <yangzhuangzhuang1@huawei.com> - 1.79-1
- update version to 1.79
* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 1.77-3
- DESC: delete -Sgit from %autosetup, and delete BuildRequires git
* Wed May 26 2021 yangzhuangzhuang<yangzhuangzhuang1@huawei.com> - 1.77-2
- Remove code using device mapper
* Thu Jul 23 2020 linwei<linwei54@huawei.com> - 1.77-1 * Thu Jul 23 2020 linwei<linwei54@huawei.com> - 1.77-1
- update os-prober to 1.77 - update os-prober to 1.77