Compare commits

...

11 Commits

Author SHA1 Message Date
openeuler-ci-bot
fe17733764
!19 【轻量级 PR】:rebuild for next release
From: @markeryang 
Reviewed-by: @xiezhipeng1 
Signed-off-by: @xiezhipeng1
2022-11-01 09:20:40 +00:00
Markeryang
d760651f05
update for mass rebuild and upgrade verification 2022-10-27 08:19:30 +00:00
openeuler-ci-bot
9bfd81826e !15 update version to 1.79
Merge pull request !15 from 杨壮壮/openEuler-22.03-LTS-Next
2021-12-13 12:10:43 +00:00
yang_zhuang_zhuang
83c8dcfa38 update version to 1.79 2021-11-27 15:13:58 +08:00
openeuler-ci-bot
68adf65d92 !14 Add "%{optflags}" for %build
From: @zou_lin77
Reviewed-by: @huangduirong,@overweight
Signed-off-by: @huangduirong,@overweight
2021-09-07 01:13:36 +00:00
zou_lin77
b89d94d90f Add "%{optflags}" for %build 2021-09-06 10:07:48 +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
openeuler-ci-bot
6a22d8492c !6 update os-prober to 1.77
Merge pull request !6 from linwei9/master
2020-07-25 11:50:55 +08:00
linwei9
6b78885378 update os-prober to 1.77 2020-07-24 17:20:12 +08:00
openeuler-ci-bot
f28dd426df !4 add yaml file
Merge pull request !4 from linwei9/master
2020-07-07 09:51:46 +08:00
4 changed files with 21 additions and 52 deletions

View File

@ -1,46 +0,0 @@
From 4811d40604f58696ddd738cea336d3af53248329 Mon Sep 17 00:00:00 2001
From: Wang shuo <wangshuo47@huawei.com>
Date: Thu, 20 Jun 2019 11:17:28 +0800
Subject: [PATCH] os-prober: wait for device mapper device is created
reason: wait for device mapper device is created
Signed-off-by: Wang shuo <wangshuo47@huawei.com>
---
common.sh | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/common.sh b/common.sh
index 8030efa..0980208 100644
--- a/common.sh
+++ b/common.sh
@@ -225,9 +225,11 @@ find_uuid () {
do_dmsetup () {
local prefix partition dm_device partition_name size_p
+ local int
prefix="$1"
partition="$2"
dm_device=
+ int=1
if type dmsetup >/dev/null 2>&1 && \
type blockdev >/dev/null 2>&1; then
@@ -240,6 +242,14 @@ do_dmsetup () {
else
debug "creating device mapper device $dm_device"
echo "0 $size_p linear $partition 0" | dmsetup create -r $partition_name
+ while(( $int<=3 ))
+ do
+ if [ -e "$dm_device" ]; then
+ break
+ fi
+ let "int++"
+ sleep 1
+ done
fi
fi
echo "$dm_device"
--
2.19.1

Binary file not shown.

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

Binary file not shown.

View File

@ -1,6 +1,6 @@
Name: os-prober
Version: 1.74
Release: 12
Version: 1.79
Release: 2
Summary: Probe disks on the system for other operating systems
License: GPLv2+ and GPL+
URL: http://kitenet.net/~joey/code/os-prober/
@ -14,10 +14,8 @@ Patch4: os-prober-grub2-parsefix.patch
Patch5: os-prober-grepfix.patch
Patch6: os-prober-gentoo-fix.patch
Patch9000: bugfix-wait-for-device-mapper-device-is-created.patch
BuildRequires: gcc git
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
Os-prober can probe disks on the system for other operating systems,
@ -29,9 +27,11 @@ make your other installed OS hard to boot.
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
%make_build CFLAGS="%{optflags}"
%install
install -m 0755 -d $RPM_BUILD_ROOT%{_bindir}
@ -84,6 +84,21 @@ fi
%{_libexecdir}/*
%changelog
* Tue Oct 25 2022 yanglongkang <yanglongkang@h-partners.com> - 1.79-2
- rebuild for next release
* Sat Nov 27 2021 yangzhuangzhuang<yangzhuangzhuang1@huawei.com> - 1.79-1
- update version to 1.79
* Sat Sep 4 2021 zoulin<zoulin13@huawei.com> - 1.77-3
- Add "%%{optflags}" for %build
* 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
- update os-prober to 1.77
* Thu Feb 27 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.74-12
- fix os-prober command failed.