Gentoo Archives: gentoo-commits

From: Ben Kohler <bkohler@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
Date: Fri, 08 Oct 2021 11:12:42
Message-Id: 1633691542.9614f93406eec0f806b9216b728c184778b622ed.bkohler@gentoo
1 commit: 9614f93406eec0f806b9216b728c184778b622ed
2 Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
3 AuthorDate: Fri Oct 8 01:53:04 2021 +0000
4 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 8 11:12:22 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9614f934
7
8 sys-boot/os-prober: bump os-prober-1.79
9
10 Package-Manager: Portage-3.0.26, Repoman-3.0.3
11 Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
12 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
13
14 sys-boot/os-prober/Manifest | 1 +
15 sys-boot/os-prober/os-prober-1.79.ebuild | 103 +++++++++++++++++++++++++++++++
16 2 files changed, 104 insertions(+)
17
18 diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
19 index 3d27c08a60f..004e286db16 100644
20 --- a/sys-boot/os-prober/Manifest
21 +++ b/sys-boot/os-prober/Manifest
22 @@ -1 +1,2 @@
23 DIST os-prober_1.78.tar.xz 26848 BLAKE2B eee68ab9be36807d86e8bda831cfd490a01d20d9cc3f84ca50d5e1143e5a2dd66e47d3bdf2b4780cf73cc692f0ffc9497c6cbf13ce7aa0057e996b13d706c8f7 SHA512 7a0425130d17ce8554e7d0797b53e3a984f63a2fdcf8e668c83d357418d8c68259ada25bc350b199adece2e683d9014f234e3a83ce5ab7485be2e69c45874640
24 +DIST os-prober_1.79.tar.xz 27028 BLAKE2B b3efacce9d7fce3708f5ec727a219e872e8d1de6dea15540cfbc0a0e8372c1033098230d3ddb9066fb5474d44e5584ee28631e0e5ab981e8fb1dc29ee3cbd89d SHA512 89b827b9b90a1d3bc11e0090ec04d808502cc1883ab10997b6d9edbe6005dcf8a0acdd7d200102c9dccde56297bda6087d68fb6dec419f0920090c2655c9c7d8
25
26 diff --git a/sys-boot/os-prober/os-prober-1.79.ebuild b/sys-boot/os-prober/os-prober-1.79.ebuild
27 new file mode 100644
28 index 00000000000..c854d403e4f
29 --- /dev/null
30 +++ b/sys-boot/os-prober/os-prober-1.79.ebuild
31 @@ -0,0 +1,103 @@
32 +# Copyright 1999-2021 Gentoo Authors
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI=8
36 +inherit readme.gentoo-r1 toolchain-funcs
37 +
38 +DESCRIPTION="Utility to detect other OSs on a set of drives"
39 +HOMEPAGE="https://salsa.debian.org/installer-team/os-prober"
40 +
41 +if [[ ${PV} == 9999 ]]; then
42 + inherit git-r3
43 + EGIT_REPO_URI="https://salsa.debian.org/installer-team/${PN}.git"
44 +else
45 + SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
46 + KEYWORDS="~amd64 ~x86"
47 + S="${WORKDIR}"/${PN}
48 +fi
49 +
50 +LICENSE="GPL-3"
51 +SLOT="0"
52 +
53 +# grub-mount needed per bug #607518
54 +RDEPEND="sys-boot/grub:2[mount]"
55 +
56 +# bug 594250
57 +QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
58 +
59 +PATCHES=(
60 + "${FILESDIR}"/${PN}-1.79-mdraid-detection.patch
61 + "${FILESDIR}"/${PN}-1.79-btrfs-subvolume-detection.patch
62 + "${FILESDIR}"/${PN}-1.79-use-fstab-name.patch
63 + "${FILESDIR}"/${PN}-1.79-mounted-boot-partition-fix.patch
64 + "${FILESDIR}"/${PN}-1.79-fix-busy-umount-message.patch
65 + "${FILESDIR}"/${PN}-1.79-efi-chroot-blkid-fallback.patch
66 +)
67 +
68 +DOC_CONTENTS="
69 + If you intend for os-prober to detect versions of Windows installed on
70 + NTFS-formatted partitions, your system must be capable of reading the
71 + NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g.
72 +
73 + NOTE: Since sys-boot/grub-2.06-rc1, grub-mkconfig disables os-prober by default.
74 + To enable it, add GRUB_DISABLE_OS_PROBER=false to /etc/default/grub.
75 +"
76 +
77 +src_prepare() {
78 + default
79 + # use default GNU rules
80 + rm Makefile || die 'rm Makefile failed'
81 +}
82 +
83 +src_compile() {
84 + tc-export CC
85 + emake newns
86 +}
87 +
88 +src_install() {
89 + dobin os-prober linux-boot-prober
90 +
91 + # Note: as no shared libraries are installed, /usr/lib is correct
92 + exeinto /usr/lib/os-prober
93 + doexe newns
94 +
95 + insinto /usr/share/os-prober
96 + doins common.sh
97 +
98 + keepdir /var/lib/os-prober
99 +
100 + local debarch=${ARCH%-*} dir
101 +
102 + case ${debarch} in
103 + amd64) debarch=x86 ;;
104 + ppc|ppc64) debarch=powerpc ;;
105 + esac
106 +
107 + for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
108 + exeinto /usr/lib/${dir}
109 + doexe ${dir}/common/*
110 + if [[ -d ${dir}/${debarch} ]]; then
111 + for exe in ${dir}/${debarch}/*; do
112 + [[ ! -d "${exe}" ]] && doexe "${exe}"
113 + done
114 + fi
115 + if [[ -d ${dir}/${debarch}/efi ]]; then
116 + exeinto /usr/lib/${dir}/efi
117 + doexe ${dir}/${debarch}/efi/*
118 + fi
119 + done
120 +
121 + if use amd64 || use x86; then
122 + exeinto /usr/lib/os-probes/mounted
123 + doexe os-probes/mounted/powerpc/20macosx
124 + fi
125 +
126 + einstalldocs
127 + dodoc debian/changelog
128 +
129 + readme.gentoo_create_doc
130 +}
131 +
132 +pkg_postinst() {
133 + readme.gentoo_print_elog
134 +}