[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: c5c6e6fbae841f66b303ee830d6212de3ca1b71e
Author: Ben Kohler gentoo org>
AuthorDate: Fri Jun 14 14:17:57 2024 +
Commit: Ben Kohler gentoo org>
CommitDate: Fri Jun 14 14:17:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5c6e6fb
sys-boot/os-prober: sync
Signed-off-by: Ben Kohler gentoo.org>
sys-boot/os-prober/os-prober-.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sys-boot/os-prober/os-prober-.ebuild
b/sys-boot/os-prober/os-prober-.ebuild
index 60466c142031..7803b480fb27 100644
--- a/sys-boot/os-prober/os-prober-.ebuild
+++ b/sys-boot/os-prober/os-prober-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -31,6 +31,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.79-mounted-boot-partition-fix.patch
"${FILESDIR}"/${PN}-1.79-fix-busy-umount-message.patch
"${FILESDIR}"/${PN}-1.79-efi-chroot-blkid-fallback.patch
+ "${FILESDIR}"/${PN}-1.81-boot-detected-twice-v3.patch
)
DOC_CONTENTS="
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/, sys-boot/os-prober/files/
commit: 239c87689a1bbac85b623f81a1ecb89859c4ce96
Author: Ben Kohler gentoo org>
AuthorDate: Fri Jun 14 14:16:34 2024 +
Commit: Ben Kohler gentoo org>
CommitDate: Fri Jun 14 14:16:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=239c8768
sys-boot/os-prober: drop 1.80, 1.81, 1.81-r1, 1.81-r2
Signed-off-by: Ben Kohler gentoo.org>
sys-boot/os-prober/Manifest| 1 -
.../os-prober-1.81-boot-detected-twice-v2.patch| 57
.../files/os-prober-1.81-boot-detected-twice.patch | 46 -
sys-boot/os-prober/os-prober-1.80.ebuild | 102
sys-boot/os-prober/os-prober-1.81-r1.ebuild| 103 -
sys-boot/os-prober/os-prober-1.81-r2.ebuild| 103 -
sys-boot/os-prober/os-prober-1.81.ebuild | 102
7 files changed, 514 deletions(-)
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index 82c24eab534c..cba10225f1fb 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,3 +1,2 @@
-DIST os-prober_1.80.tar.xz 27400 BLAKE2B
56883c7d3f4c5dde2904cffc77fdf6a2c1caf230f9e84197e8d976e446815838448bb42afd18d4c9526efac9907db3d2e77c6f54889011d2d03d284a44ff4cbd
SHA512
51b4fefb784d5ecf34f5148157ef233e2979c4a679a54600144be473bb6ccaf263c9121701a1ecc7523c7e3bfc439a4e3a92a5eb92431ead99cbe666b0f0e6f5
DIST os-prober_1.81.tar.xz 27448 BLAKE2B
0159870612d265c5e610e093a8839129aa9dc111a6f3abee65a6044b4c997ba65a69f70deca246bde53c1cf5314812312178e82c0893093d9f23ced3b0176f9d
SHA512
ffb0e618f9e58a7a8e4a265d253bad4e168c220697216684acb38dbfa20680e552eb7c5f3d2186cd750c61a8929bf152527aa85c39318ed8b025a4adde50
DIST os-prober_1.82.tar.xz 27596 BLAKE2B
2d703cf91931fbdc89f1d2ca6b2ef87368a11fb685821f4864f826b143a92c22d5544d99f0843900012f7d9ae230d9eb858de3ee99f6df5ed488c5fd604b51df
SHA512
7ab1825e3d771a9fba8cff3a72dd54371e0e467090ba9780e0074a54a3a8451da5f771d7a8c9b51a5bbb03ad315d1887764335d7aaae77c2a6c4de426c667990
diff --git
a/sys-boot/os-prober/files/os-prober-1.81-boot-detected-twice-v2.patch
b/sys-boot/os-prober/files/os-prober-1.81-boot-detected-twice-v2.patch
deleted file mode 100644
index 41e661bae86f..
--- a/sys-boot/os-prober/files/os-prober-1.81-boot-detected-twice-v2.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/common.sh b/common.sh
-index cc7a335..820caea 100644
a/common.sh
-+++ b/common.sh
-@@ -326,3 +326,26 @@ umount() {
- fi
- }
-
-+list_mounts() {
-+ if [ -f /proc/self/mountinfo ]; then
-+ local x dev mount devs found mountinfo_placeholders
-+ found=:
-+
-+ # mountinfo may have 10 or 11 fields depending on mount
namespaces
-+ if [ $(head -n1 /proc/self/mountinfo | wc -w) == 10 ]; then
-+ mountinfo_placeholders="x x"
-+ else
-+ mountinfo_placeholders="x x x"
-+ fi
-+
-+ while read -r x x dev x mount ${mountinfo_placeholders} fs x; do
-+ if [ -L "/sys/dev/block/$dev" ]; then
-+ devs="/dev/`readlink \"/sys/dev/block/$dev\" |
rev | cut -d/ -f1 | rev`"
-+ printf '%s %s %s\n' "$(mapdevfs "$devs")"
"$mount" "$fs"
-+ found="return 0"
-+ fi
-+ done < /proc/self/mountinfo
-+ $found
-+ fi
-+ grep "^/dev/" /proc/mounts | parse_proc_mounts
-+}
-diff --git a/linux-boot-prober b/linux-boot-prober
-index bacf219..804d9fe 100755
a/linux-boot-prober
-+++ b/linux-boot-prober
-@@ -17,7 +17,7 @@ bootmnt=
- bootsv=
- bootuuid=
-
--grep "^/dev/" /proc/mounts | parse_proc_mounts >"$OS_PROBER_TMP/mounted-map"
|| true
-+list_mounts >"$OS_PROBER_TMP/mounted-map" || true
-
- if [ -z "$1" ]; then
- ERR=y
-diff --git a/os-prober b/os-prober
-index b76d85b..8b0c89b 100755
a/os-prober
-+++ b/os-prober
-@@ -128,7 +128,7 @@ done
-
- # We need to properly canonicalize partitions with mount points and partitions
- # used in RAID
--grep "^/dev/" /proc/mounts | parse_proc_mounts >"$OS_PROBER_TMP/mounted-map"
|| true
-+list_mounts >"$OS_PROBER_TMP/mounted-map" || true
- : >"$OS_PROBER_TMP/swaps-map"
- if [ -f /proc/swaps ]; then
- grep "^/dev/" /proc/swaps | parse_proc_swaps
>"$OS_PROBER_TMP/swaps-map" || true
diff --git a/sys-boot/os-prober/files/os-prober-1.81-boot-detected-twice.patch
b/sys-boot/os-prober/files/os-prober-1.81-boot-detected-twice.patch
deleted file mode 100644
index b06b31d0077e..
--- a/sys-boot/os-prober/files/os-prober-1.81-boot-detected-twice.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -urN o/common.sh os-prober-1.81/common.sh
o/common.sh2023-01-22 13:43:23.333123217 -0800
-+++ os-prober-1.81/common.sh 2023-01-22 13:44:49.408153101 -0800
-@@ -326,3 +326,18 @@
- fi
- }
-
-+list_mounts() {
-+ if [ -f
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 62801c28a78743d38c4fa99411d2193b8bb412e6
Author: Ben Kohler gentoo org>
AuthorDate: Fri Jun 14 14:13:39 2024 +
Commit: Ben Kohler gentoo org>
CommitDate: Fri Jun 14 14:13:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62801c28
sys-boot/os-prober: stabilize 1.81-r3 for amd64, x86
Signed-off-by: Ben Kohler gentoo.org>
sys-boot/os-prober/os-prober-1.81-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/os-prober/os-prober-1.81-r3.ebuild
b/sys-boot/os-prober/os-prober-1.81-r3.ebuild
index 7803b480fb27..6763223a4061 100644
--- a/sys-boot/os-prober/os-prober-1.81-r3.ebuild
+++ b/sys-boot/os-prober/os-prober-1.81-r3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://salsa.debian.org/installer-team/${PN}.git";
else
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
LICENSE="GPL-3"
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: c523ccf0a2a112d0cbe69178437d429ac589a127
Author: Ben Kohler gentoo org>
AuthorDate: Fri Jun 14 14:08:51 2024 +
Commit: Ben Kohler gentoo org>
CommitDate: Fri Jun 14 14:12:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c523ccf0
sys-boot/os-prober: add 1.82
Signed-off-by: Ben Kohler gentoo.org>
sys-boot/os-prober/Manifest | 1 +
sys-boot/os-prober/os-prober-1.82.ebuild | 103 +++
2 files changed, 104 insertions(+)
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index 83a974b2e30d..82c24eab534c 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,2 +1,3 @@
DIST os-prober_1.80.tar.xz 27400 BLAKE2B
56883c7d3f4c5dde2904cffc77fdf6a2c1caf230f9e84197e8d976e446815838448bb42afd18d4c9526efac9907db3d2e77c6f54889011d2d03d284a44ff4cbd
SHA512
51b4fefb784d5ecf34f5148157ef233e2979c4a679a54600144be473bb6ccaf263c9121701a1ecc7523c7e3bfc439a4e3a92a5eb92431ead99cbe666b0f0e6f5
DIST os-prober_1.81.tar.xz 27448 BLAKE2B
0159870612d265c5e610e093a8839129aa9dc111a6f3abee65a6044b4c997ba65a69f70deca246bde53c1cf5314812312178e82c0893093d9f23ced3b0176f9d
SHA512
ffb0e618f9e58a7a8e4a265d253bad4e168c220697216684acb38dbfa20680e552eb7c5f3d2186cd750c61a8929bf152527aa85c39318ed8b025a4adde50
+DIST os-prober_1.82.tar.xz 27596 BLAKE2B
2d703cf91931fbdc89f1d2ca6b2ef87368a11fb685821f4864f826b143a92c22d5544d99f0843900012f7d9ae230d9eb858de3ee99f6df5ed488c5fd604b51df
SHA512
7ab1825e3d771a9fba8cff3a72dd54371e0e467090ba9780e0074a54a3a8451da5f771d7a8c9b51a5bbb03ad315d1887764335d7aaae77c2a6c4de426c667990
diff --git a/sys-boot/os-prober/os-prober-1.82.ebuild
b/sys-boot/os-prober/os-prober-1.82.ebuild
new file mode 100644
index ..7803b480fb27
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.82.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="https://salsa.debian.org/installer-team/os-prober";
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://salsa.debian.org/installer-team/${PN}.git";
+else
+ SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+# grub-mount needed per bug #607518
+RDEPEND="sys-boot/grub:2[mount]"
+
+# bug 594250
+QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.79-mdraid-detection.patch
+ "${FILESDIR}"/${PN}-1.79-btrfs-subvolume-detection.patch
+ "${FILESDIR}"/${PN}-1.79-use-fstab-name.patch
+ "${FILESDIR}"/${PN}-1.79-mounted-boot-partition-fix.patch
+ "${FILESDIR}"/${PN}-1.79-fix-busy-umount-message.patch
+ "${FILESDIR}"/${PN}-1.79-efi-chroot-blkid-fallback.patch
+ "${FILESDIR}"/${PN}-1.81-boot-detected-twice-v3.patch
+)
+
+DOC_CONTENTS="
+ If you intend for os-prober to detect versions of Windows installed on
+ NTFS-formatted partitions, your system must be capable of reading the
+ NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g.
+
+ NOTE: Since sys-boot/grub-2.06-rc1, grub-mkconfig disables os-prober by
default.
+ To enable it, add GRUB_DISABLE_OS_PROBER=false to /etc/default/grub.
+"
+
+src_prepare() {
+ default
+ # use default GNU rules
+ rm Makefile || die 'rm Makefile failed'
+}
+
+src_compile() {
+ tc-export CC
+ emake newns
+}
+
+src_install() {
+ dobin os-prober linux-boot-prober
+
+ # Note: as no shared libraries are installed, /usr/lib is correct
+ exeinto /usr/lib/os-prober
+ doexe newns
+
+ insinto /usr/share/os-prober
+ doins common.sh
+
+ keepdir /var/lib/os-prober
+
+ local debarch=${ARCH%-*} dir
+
+ case ${debarch} in
+ amd64) debarch=x86 ;;
+ ppc|ppc64) debarch=powerpc ;;
+ esac
+
+ for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
+ exeinto /usr/lib/${dir}
+ doexe ${dir}/common/*
+ if [[ -d ${dir}/${debarch} ]]; then
+ for exe in ${dir}/${debarch}/*; do
+ [[ ! -d "${exe}" ]] && doexe "${exe}"
+ done
+ fi
+ if [[ -d ${dir}/${debarch}/efi ]]; then
+ exeinto /usr/lib/${dir}/efi
+ doexe ${dir}/${debarch}/efi/*
+ fi
+ done
+
+ if use amd64 || use x86; then
+ exeinto /usr/lib/os-probes/mounted
+ doexe os-probes/mounted/powerpc/20macosx
+ fi
+
+ einstalldocs
+ dodoc debian/changelog
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/, sys-boot/os-prober/files/
commit: 80f9bed892f17cb69eaab7ac9a1fa547384c4927
Author: Enno Tensing suij in>
AuthorDate: Fri May 17 18:08:41 2024 +
Commit: Ben Kohler gentoo org>
CommitDate: Tue May 21 15:50:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80f9bed8
sys-boot/os-prober: Make boot-detected-twice patch POSIX sh compliant
This versions modfies the patch added by -r2 to be POSIX sh compliant.
For this we just replace the '==' in line 15 with '-eq'.
Closes: https://bugs.gentoo.org/932098
Signed-off-by: Enno Tensing suij.in>
Closes: https://github.com/gentoo/gentoo/pull/36725
Signed-off-by: Ben Kohler gentoo.org>
.../os-prober-1.81-boot-detected-twice-v3.patch| 57
sys-boot/os-prober/os-prober-1.81-r3.ebuild| 103 +
2 files changed, 160 insertions(+)
diff --git
a/sys-boot/os-prober/files/os-prober-1.81-boot-detected-twice-v3.patch
b/sys-boot/os-prober/files/os-prober-1.81-boot-detected-twice-v3.patch
new file mode 100644
index ..58e592ae7e8e
--- /dev/null
+++ b/sys-boot/os-prober/files/os-prober-1.81-boot-detected-twice-v3.patch
@@ -0,0 +1,57 @@
+diff --git a/common.sh b/common.sh
+index cc7a335..820caea 100644
+--- a/common.sh
b/common.sh
+@@ -326,3 +326,26 @@ umount() {
+ fi
+ }
+
++list_mounts() {
++ if [ -f /proc/self/mountinfo ]; then
++ local x dev mount devs found mountinfo_placeholders
++ found=:
++
++ # mountinfo may have 10 or 11 fields depending on mount
namespaces
++ if [ $(head -n1 /proc/self/mountinfo | wc -w) -eq 10 ]; then
++ mountinfo_placeholders="x x"
++ else
++ mountinfo_placeholders="x x x"
++ fi
++
++ while read -r x x dev x mount ${mountinfo_placeholders} fs x; do
++ if [ -L "/sys/dev/block/$dev" ]; then
++ devs="/dev/`readlink \"/sys/dev/block/$dev\" |
rev | cut -d/ -f1 | rev`"
++ printf '%s %s %s\n' "$(mapdevfs "$devs")"
"$mount" "$fs"
++ found="return 0"
++ fi
++ done < /proc/self/mountinfo
++ $found
++ fi
++ grep "^/dev/" /proc/mounts | parse_proc_mounts
++}
+diff --git a/linux-boot-prober b/linux-boot-prober
+index bacf219..804d9fe 100755
+--- a/linux-boot-prober
b/linux-boot-prober
+@@ -17,7 +17,7 @@ bootmnt=
+ bootsv=
+ bootuuid=
+
+-grep "^/dev/" /proc/mounts | parse_proc_mounts >"$OS_PROBER_TMP/mounted-map"
|| true
++list_mounts >"$OS_PROBER_TMP/mounted-map" || true
+
+ if [ -z "$1" ]; then
+ ERR=y
+diff --git a/os-prober b/os-prober
+index b76d85b..8b0c89b 100755
+--- a/os-prober
b/os-prober
+@@ -128,7 +128,7 @@ done
+
+ # We need to properly canonicalize partitions with mount points and partitions
+ # used in RAID
+-grep "^/dev/" /proc/mounts | parse_proc_mounts >"$OS_PROBER_TMP/mounted-map"
|| true
++list_mounts >"$OS_PROBER_TMP/mounted-map" || true
+ : >"$OS_PROBER_TMP/swaps-map"
+ if [ -f /proc/swaps ]; then
+ grep "^/dev/" /proc/swaps | parse_proc_swaps
>"$OS_PROBER_TMP/swaps-map" || true
diff --git a/sys-boot/os-prober/os-prober-1.81-r3.ebuild
b/sys-boot/os-prober/os-prober-1.81-r3.ebuild
new file mode 100644
index ..7803b480fb27
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.81-r3.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="https://salsa.debian.org/installer-team/os-prober";
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://salsa.debian.org/installer-team/${PN}.git";
+else
+ SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+# grub-mount needed per bug #607518
+RDEPEND="sys-boot/grub:2[mount]"
+
+# bug 594250
+QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.79-mdraid-detection.patch
+ "${FILESDIR}"/${PN}-1.79-btrfs-subvolume-detection.patch
+ "${FILESDIR}"/${PN}-1.79-use-fstab-name.patch
+ "${FILESDIR}"/${PN}-1.79-mounted-boot-partition-fix.patch
+ "${FILESDIR}"/${PN}-1.79-fix-busy-umount-message.patch
+ "${FILESDIR}"/${PN}-1.79-efi-chroot-blkid-fallback.patch
+ "${FILESDIR}"/${PN}-1.81-boot-detected-twice-v3.patch
+)
+
+DOC_CONTENTS="
+ If you intend for os-prober to detect versions of Windows installed on
+ NTFS-formatted partitions, your system must be capable of reading the
+ NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g.
+
+ NOTE: Since sys-boot/grub-2.06-rc1, grub-mkconfig disables os-prober by
default.
+ To enable it, add GRUB_DISABLE_OS_PROBER=false
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 18bcae8fc56848056979dbbe0af85af7d27b3928
Author: Ben Kohler gentoo org>
AuthorDate: Thu May 9 14:19:48 2024 +
Commit: Ben Kohler gentoo org>
CommitDate: Thu May 9 14:21:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18bcae8f
sys-boot/os-prober: stabilize 1.81-r2 for amd64, x86
Closes: https://bugs.gentoo.org/830655
Closes: https://bugs.gentoo.org/897700
Signed-off-by: Ben Kohler gentoo.org>
sys-boot/os-prober/os-prober-1.81-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/os-prober/os-prober-1.81-r2.ebuild
b/sys-boot/os-prober/os-prober-1.81-r2.ebuild
index 21799edbec21..59252bb84f92 100644
--- a/sys-boot/os-prober/os-prober-1.81-r2.ebuild
+++ b/sys-boot/os-prober/os-prober-1.81-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://salsa.debian.org/installer-team/${PN}.git";
else
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
LICENSE="GPL-3"
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/, sys-boot/os-prober/files/
commit: dd2aa3aeb97da6052c2645e12313cd7eec389715
Author: Ben Kohler gentoo org>
AuthorDate: Wed May 8 16:40:29 2024 +
Commit: Ben Kohler gentoo org>
CommitDate: Wed May 8 16:43:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd2aa3ae
sys-boot/os-prober: new boot-detected-twice patch
This version adds a slightly adjusted patch which accounts for the fact
that mountinfo may have an extra optional field. This does not account
for *more than one* optional field, but we can revisit this if such a
setup is found in the wild.
Bug: https://bugs.gentoo.org/897700
Signed-off-by: Ben Kohler gentoo.org>
.../os-prober-1.81-boot-detected-twice-v2.patch| 57
sys-boot/os-prober/os-prober-1.81-r2.ebuild| 103 +
2 files changed, 160 insertions(+)
diff --git
a/sys-boot/os-prober/files/os-prober-1.81-boot-detected-twice-v2.patch
b/sys-boot/os-prober/files/os-prober-1.81-boot-detected-twice-v2.patch
new file mode 100644
index ..41e661bae86f
--- /dev/null
+++ b/sys-boot/os-prober/files/os-prober-1.81-boot-detected-twice-v2.patch
@@ -0,0 +1,57 @@
+diff --git a/common.sh b/common.sh
+index cc7a335..820caea 100644
+--- a/common.sh
b/common.sh
+@@ -326,3 +326,26 @@ umount() {
+ fi
+ }
+
++list_mounts() {
++ if [ -f /proc/self/mountinfo ]; then
++ local x dev mount devs found mountinfo_placeholders
++ found=:
++
++ # mountinfo may have 10 or 11 fields depending on mount
namespaces
++ if [ $(head -n1 /proc/self/mountinfo | wc -w) == 10 ]; then
++ mountinfo_placeholders="x x"
++ else
++ mountinfo_placeholders="x x x"
++ fi
++
++ while read -r x x dev x mount ${mountinfo_placeholders} fs x; do
++ if [ -L "/sys/dev/block/$dev" ]; then
++ devs="/dev/`readlink \"/sys/dev/block/$dev\" |
rev | cut -d/ -f1 | rev`"
++ printf '%s %s %s\n' "$(mapdevfs "$devs")"
"$mount" "$fs"
++ found="return 0"
++ fi
++ done < /proc/self/mountinfo
++ $found
++ fi
++ grep "^/dev/" /proc/mounts | parse_proc_mounts
++}
+diff --git a/linux-boot-prober b/linux-boot-prober
+index bacf219..804d9fe 100755
+--- a/linux-boot-prober
b/linux-boot-prober
+@@ -17,7 +17,7 @@ bootmnt=
+ bootsv=
+ bootuuid=
+
+-grep "^/dev/" /proc/mounts | parse_proc_mounts >"$OS_PROBER_TMP/mounted-map"
|| true
++list_mounts >"$OS_PROBER_TMP/mounted-map" || true
+
+ if [ -z "$1" ]; then
+ ERR=y
+diff --git a/os-prober b/os-prober
+index b76d85b..8b0c89b 100755
+--- a/os-prober
b/os-prober
+@@ -128,7 +128,7 @@ done
+
+ # We need to properly canonicalize partitions with mount points and partitions
+ # used in RAID
+-grep "^/dev/" /proc/mounts | parse_proc_mounts >"$OS_PROBER_TMP/mounted-map"
|| true
++list_mounts >"$OS_PROBER_TMP/mounted-map" || true
+ : >"$OS_PROBER_TMP/swaps-map"
+ if [ -f /proc/swaps ]; then
+ grep "^/dev/" /proc/swaps | parse_proc_swaps
>"$OS_PROBER_TMP/swaps-map" || true
diff --git a/sys-boot/os-prober/os-prober-1.81-r2.ebuild
b/sys-boot/os-prober/os-prober-1.81-r2.ebuild
new file mode 100644
index ..21799edbec21
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.81-r2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="https://salsa.debian.org/installer-team/os-prober";
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://salsa.debian.org/installer-team/${PN}.git";
+else
+ SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+# grub-mount needed per bug #607518
+RDEPEND="sys-boot/grub:2[mount]"
+
+# bug 594250
+QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.79-mdraid-detection.patch
+ "${FILESDIR}"/${PN}-1.79-btrfs-subvolume-detection.patch
+ "${FILESDIR}"/${PN}-1.79-use-fstab-name.patch
+ "${FILESDIR}"/${PN}-1.79-mounted-boot-partition-fix.patch
+ "${FILESDIR}"/${PN}-1.79-fix-busy-umount-message.patch
+ "${FILESDIR}"/${PN}-1.79-efi-chroot-blkid-fallback.patch
+ "${FILESDIR}"/${PN}-1.81-boot-detected-twice-v2.patch
+)
+
+DOC_CONTENTS="
+ If you intend for os-prober to detect versions of Windows installed on
+ NTFS-formatted partitions, your system must be capable of reading the
+ NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g.
+
+ NOTE: Since sys-boot/grub-2.06-rc1, grub-mkconfig disables os-prober by
default.
+ To enable it, add GRUB_DISABLE_OS_PROBER=false
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/, sys-boot/os-prober/files/
commit: e0b708394fc3447613233aaa15e79a35f6b36144
Author: Ben Kohler gentoo org>
AuthorDate: Thu Feb 16 13:54:23 2023 +
Commit: Ben Kohler gentoo org>
CommitDate: Thu Feb 16 13:55:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0b70839
sys-boot/os-prober: add patch for duplicate current-OS detection
Bug: https://bugs.gentoo.org/830655
Signed-off-by: Ben Kohler gentoo.org>
.../files/os-prober-1.81-boot-detected-twice.patch | 46 +
sys-boot/os-prober/os-prober-1.81-r1.ebuild| 103 +
2 files changed, 149 insertions(+)
diff --git a/sys-boot/os-prober/files/os-prober-1.81-boot-detected-twice.patch
b/sys-boot/os-prober/files/os-prober-1.81-boot-detected-twice.patch
new file mode 100644
index ..b06b31d0077e
--- /dev/null
+++ b/sys-boot/os-prober/files/os-prober-1.81-boot-detected-twice.patch
@@ -0,0 +1,46 @@
+diff -urN o/common.sh os-prober-1.81/common.sh
+--- o/common.sh2023-01-22 13:43:23.333123217 -0800
os-prober-1.81/common.sh 2023-01-22 13:44:49.408153101 -0800
+@@ -326,3 +326,18 @@
+ fi
+ }
+
++list_mounts() {
++ if [ -f /proc/self/mountinfo ]; then
++ local x dev mount devs found
++ found=:
++ while read -r x x dev x mount x x fs x; do
++ if [ -L "/sys/dev/block/$dev" ]; then
++ devs="/dev/`readlink \"/sys/dev/block/$dev\" |
rev | cut -d/ -f1 | rev`"
++ printf '%s %s %s\n' "$(mapdevfs "$devs")"
"$mount" "$fs"
++ found="return 0"
++ fi
++ done < /proc/self/mountinfo
++ $found
++ fi
++ grep "^/dev/" /proc/mounts | parse_proc_mounts
++}
+diff -urN o/linux-boot-prober os-prober-1.81/linux-boot-prober
+--- o/linux-boot-prober2023-01-22 13:43:23.334123229 -0800
os-prober-1.81/linux-boot-prober 2023-01-22 13:43:34.897260733 -0800
+@@ -17,7 +17,7 @@
+ bootsv=
+ bootuuid=
+
+-grep "^/dev/" /proc/mounts | parse_proc_mounts >"$OS_PROBER_TMP/mounted-map"
|| true
++list_mounts >"$OS_PROBER_TMP/mounted-map" || true
+
+ if [ -z "$1" ]; then
+ ERR=y
+diff -urN o/os-prober os-prober-1.81/os-prober
+--- o/os-prober2023-01-22 13:43:23.334123229 -0800
os-prober-1.81/os-prober 2023-01-22 13:43:34.897260733 -0800
+@@ -128,7 +128,7 @@
+
+ # We need to properly canonicalize partitions with mount points and partitions
+ # used in RAID
+-grep "^/dev/" /proc/mounts | parse_proc_mounts >"$OS_PROBER_TMP/mounted-map"
|| true
++list_mounts >"$OS_PROBER_TMP/mounted-map" || true
+ : >"$OS_PROBER_TMP/swaps-map"
+ if [ -f /proc/swaps ]; then
+ grep "^/dev/" /proc/swaps | parse_proc_swaps
>"$OS_PROBER_TMP/swaps-map" || true
diff --git a/sys-boot/os-prober/os-prober-1.81-r1.ebuild
b/sys-boot/os-prober/os-prober-1.81-r1.ebuild
new file mode 100644
index ..924b7251237a
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.81-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="https://salsa.debian.org/installer-team/os-prober";
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://salsa.debian.org/installer-team/${PN}.git";
+else
+ SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+# grub-mount needed per bug #607518
+RDEPEND="sys-boot/grub:2[mount]"
+
+# bug 594250
+QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.79-mdraid-detection.patch
+ "${FILESDIR}"/${PN}-1.79-btrfs-subvolume-detection.patch
+ "${FILESDIR}"/${PN}-1.79-use-fstab-name.patch
+ "${FILESDIR}"/${PN}-1.79-mounted-boot-partition-fix.patch
+ "${FILESDIR}"/${PN}-1.79-fix-busy-umount-message.patch
+ "${FILESDIR}"/${PN}-1.79-efi-chroot-blkid-fallback.patch
+ "${FILESDIR}"/${PN}-1.81-boot-detected-twice.patch
+)
+
+DOC_CONTENTS="
+ If you intend for os-prober to detect versions of Windows installed on
+ NTFS-formatted partitions, your system must be capable of reading the
+ NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g.
+
+ NOTE: Since sys-boot/grub-2.06-rc1, grub-mkconfig disables os-prober by
default.
+ To enable it, add GRUB_DISABLE_OS_PROBER=false to /etc/default/grub.
+"
+
+src_prepare() {
+ default
+ # use default GNU rules
+ rm Makefile || die 'rm Makefile failed'
+}
+
+src_compile() {
+ tc-export CC
+ emake newns
+}
+
+src_install() {
+ dobin os-prober linux-boot-prober
+
+ # Note: as no shared libraries are installed, /usr/lib is correct
+ exeinto /usr/lib/os-prober
+ doexe newns
+
+
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 372a5a07454d9639208967a510bc62462267a7d8
Author: Pacho Ramos gentoo org>
AuthorDate: Wed Dec 28 09:41:09 2022 +
Commit: Pacho Ramos gentoo org>
CommitDate: Wed Dec 28 09:41:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=372a5a07
sys-boot/os-prober: stabilize 1.81 for amd64
Closes: https://bugs.gentoo.org/888651
Signed-off-by: Pacho Ramos gentoo.org>
sys-boot/os-prober/os-prober-1.81.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/os-prober/os-prober-1.81.ebuild
b/sys-boot/os-prober/os-prober-1.81.ebuild
index 9610ebdca8b5..39b187859a6e 100644
--- a/sys-boot/os-prober/os-prober-1.81.ebuild
+++ b/sys-boot/os-prober/os-prober-1.81.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://salsa.debian.org/installer-team/${PN}.git";
else
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
- KEYWORDS="~amd64 x86"
+ KEYWORDS="amd64 x86"
fi
LICENSE="GPL-3"
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: b475daf1314a4b038d2c65b80d8e2cdbaa743f1b
Author: Sam James gentoo org>
AuthorDate: Tue Dec 27 20:20:09 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 27 20:20:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b475daf1
sys-boot/os-prober: Stabilize 1.81 x86, #888651
Signed-off-by: Sam James gentoo.org>
sys-boot/os-prober/os-prober-1.81.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/os-prober/os-prober-1.81.ebuild
b/sys-boot/os-prober/os-prober-1.81.ebuild
index 60466c142031..9610ebdca8b5 100644
--- a/sys-boot/os-prober/os-prober-1.81.ebuild
+++ b/sys-boot/os-prober/os-prober-1.81.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://salsa.debian.org/installer-team/${PN}.git";
else
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 x86"
fi
LICENSE="GPL-3"
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 04d3d49b3e01c97ac2767e5224d932c6b5a7c32a
Author: Ben Kohler gentoo org>
AuthorDate: Tue Jul 19 14:10:31 2022 +
Commit: Ben Kohler gentoo org>
CommitDate: Tue Jul 19 14:18:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04d3d49b
sys-boot/os-prober: stabilize 1.80 for amd64, x86
Signed-off-by: Ben Kohler gentoo.org>
sys-boot/os-prober/os-prober-1.80.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/os-prober/os-prober-1.80.ebuild
b/sys-boot/os-prober/os-prober-1.80.ebuild
index 60466c142031..39b187859a6e 100644
--- a/sys-boot/os-prober/os-prober-1.80.ebuild
+++ b/sys-boot/os-prober/os-prober-1.80.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://salsa.debian.org/installer-team/${PN}.git";
else
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
LICENSE="GPL-3"
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/files/, sys-boot/os-prober/
commit: 533ed0623394154814d9414ec23b16cd42dfc0eb
Author: Ben Kohler gentoo org>
AuthorDate: Tue Jul 19 14:17:31 2022 +
Commit: Ben Kohler gentoo org>
CommitDate: Tue Jul 19 14:18:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=533ed062
sys-boot/os-prober: drop 1.78-r1, 1.79-r1, 1.79-r2
Signed-off-by: Ben Kohler gentoo.org>
sys-boot/os-prober/Manifest| 2 -
.../os-prober/files/os-prober-1.76-exherbo.patch | 26 --
.../os-prober/files/os-prober-1.78-btrfsfix.patch | 474 -
.../files/os-prober-1.79-detect-void.patch | 20 -
...-prober-1.79-handle-multiple-initrd-paths.patch | 36 --
.../os-prober/files/os-prober-1.79-ntfs3.patch | 26 --
sys-boot/os-prober/os-prober-1.78-r1.ebuild| 94
sys-boot/os-prober/os-prober-1.79-r1.ebuild| 105 -
sys-boot/os-prober/os-prober-1.79-r2.ebuild| 105 -
9 files changed, 888 deletions(-)
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index d886680c87d3..83a974b2e30d 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,4 +1,2 @@
-DIST os-prober_1.78.tar.xz 26848 BLAKE2B
eee68ab9be36807d86e8bda831cfd490a01d20d9cc3f84ca50d5e1143e5a2dd66e47d3bdf2b4780cf73cc692f0ffc9497c6cbf13ce7aa0057e996b13d706c8f7
SHA512
7a0425130d17ce8554e7d0797b53e3a984f63a2fdcf8e668c83d357418d8c68259ada25bc350b199adece2e683d9014f234e3a83ce5ab7485be2e69c45874640
-DIST os-prober_1.79.tar.xz 27028 BLAKE2B
b3efacce9d7fce3708f5ec727a219e872e8d1de6dea15540cfbc0a0e8372c1033098230d3ddb9066fb5474d44e5584ee28631e0e5ab981e8fb1dc29ee3cbd89d
SHA512
89b827b9b90a1d3bc11e0090ec04d808502cc1883ab10997b6d9edbe6005dcf8a0acdd7d200102c9dccde56297bda6087d68fb6dec419f0920090c2655c9c7d8
DIST os-prober_1.80.tar.xz 27400 BLAKE2B
56883c7d3f4c5dde2904cffc77fdf6a2c1caf230f9e84197e8d976e446815838448bb42afd18d4c9526efac9907db3d2e77c6f54889011d2d03d284a44ff4cbd
SHA512
51b4fefb784d5ecf34f5148157ef233e2979c4a679a54600144be473bb6ccaf263c9121701a1ecc7523c7e3bfc439a4e3a92a5eb92431ead99cbe666b0f0e6f5
DIST os-prober_1.81.tar.xz 27448 BLAKE2B
0159870612d265c5e610e093a8839129aa9dc111a6f3abee65a6044b4c997ba65a69f70deca246bde53c1cf5314812312178e82c0893093d9f23ced3b0176f9d
SHA512
ffb0e618f9e58a7a8e4a265d253bad4e168c220697216684acb38dbfa20680e552eb7c5f3d2186cd750c61a8929bf152527aa85c39318ed8b025a4adde50
diff --git a/sys-boot/os-prober/files/os-prober-1.76-exherbo.patch
b/sys-boot/os-prober/files/os-prober-1.76-exherbo.patch
deleted file mode 100644
index 6ef83dca223f..
--- a/sys-boot/os-prober/files/os-prober-1.76-exherbo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 09fefdb360b69c2de03a2f1c881db87f924d3c76 Mon Sep 17 00:00:00 2001
-From: Timo Gurr
-Date: Mon, 20 Feb 2017 17:33:14 +0100
-Subject: [PATCH] Add Exherbo Linux detection
-
- os-probes/mounted/common/90linux-distro | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/os-probes/mounted/common/90linux-distro
b/os-probes/mounted/common/90linux-distro
-index badfbb1..41a5553 100755
a/os-probes/mounted/common/90linux-distro
-+++ b/os-probes/mounted/common/90linux-distro
-@@ -137,6 +137,9 @@ if (ls "$dir"/lib*/ld*.so* && [ -d "$dir/boot" ] || ls
"$dir"/usr/lib*/ld*.so*)
- elif [ -e "$dir/etc/devuan_version" ]; then
- short="Devuan"
- long="$(printf "Devuan GNU/Linux (%s)\n" "$(cat
"$dir/etc/devuan_version")")"
-+ elif [ -e "$dir/etc/exherbo-release" ]; then
-+ short="Exherbo"
-+ long="Exherbo Linux"
- else
- short="Linux"
- long="unknown Linux distribution"
---
-2.11.1
-
diff --git a/sys-boot/os-prober/files/os-prober-1.78-btrfsfix.patch
b/sys-boot/os-prober/files/os-prober-1.78-btrfsfix.patch
deleted file mode 100644
index 5a74285dc73f..
--- a/sys-boot/os-prober/files/os-prober-1.78-btrfsfix.patch
+++ /dev/null
@@ -1,474 +0,0 @@
-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=688336
-
-diff --git a/common.sh b/common.sh
-index c2c5f46..8fb3c5f 100644
a/common.sh
-+++ b/common.sh
-@@ -155,6 +155,7 @@ parse_proc_mounts () {
- done
- }
-
-+# add forth parameter to pickup btrfs subvol info
- parsefstab () {
- while read -r line; do
- case "$line" in
-@@ -165,12 +166,22 @@ parsefstab () {
- set -f
- set -- $line
- set +f
-- printf '%s %s %s\n' "$1" "$2" "$3"
-+ printf '%s %s %s %s\n' "$1" "$2" "$3" "$4"
- ;;
- esac
- done
- }
-
-+#check_btrfs_mounted $bootsv $bootuuid)
-+check_btrfs_mounted () {
-+ bootsv="$1"
-+ bootuuid="$2"
-+ bootdev=$(blkid | grep "$bootuuid" | cut -d ':' -f 1)
-+ bindfrom=$(grep " btrfs " /proc/self/mountinfo |
-+ grep " $bootdev " | grep " /$bootsv "
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: c84d62bcb7a6a0f009a7660161743f122ae31569
Author: Ben Kohler gentoo org>
AuthorDate: Tue Jul 19 14:13:22 2022 +
Commit: Ben Kohler gentoo org>
CommitDate: Tue Jul 19 14:18:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c84d62bc
sys-boot/os-prober: add 1.81
Signed-off-by: Ben Kohler gentoo.org>
sys-boot/os-prober/Manifest | 1 +
sys-boot/os-prober/os-prober-1.81.ebuild | 102 +++
2 files changed, 103 insertions(+)
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index aafa95626aee..d886680c87d3 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,3 +1,4 @@
DIST os-prober_1.78.tar.xz 26848 BLAKE2B
eee68ab9be36807d86e8bda831cfd490a01d20d9cc3f84ca50d5e1143e5a2dd66e47d3bdf2b4780cf73cc692f0ffc9497c6cbf13ce7aa0057e996b13d706c8f7
SHA512
7a0425130d17ce8554e7d0797b53e3a984f63a2fdcf8e668c83d357418d8c68259ada25bc350b199adece2e683d9014f234e3a83ce5ab7485be2e69c45874640
DIST os-prober_1.79.tar.xz 27028 BLAKE2B
b3efacce9d7fce3708f5ec727a219e872e8d1de6dea15540cfbc0a0e8372c1033098230d3ddb9066fb5474d44e5584ee28631e0e5ab981e8fb1dc29ee3cbd89d
SHA512
89b827b9b90a1d3bc11e0090ec04d808502cc1883ab10997b6d9edbe6005dcf8a0acdd7d200102c9dccde56297bda6087d68fb6dec419f0920090c2655c9c7d8
DIST os-prober_1.80.tar.xz 27400 BLAKE2B
56883c7d3f4c5dde2904cffc77fdf6a2c1caf230f9e84197e8d976e446815838448bb42afd18d4c9526efac9907db3d2e77c6f54889011d2d03d284a44ff4cbd
SHA512
51b4fefb784d5ecf34f5148157ef233e2979c4a679a54600144be473bb6ccaf263c9121701a1ecc7523c7e3bfc439a4e3a92a5eb92431ead99cbe666b0f0e6f5
+DIST os-prober_1.81.tar.xz 27448 BLAKE2B
0159870612d265c5e610e093a8839129aa9dc111a6f3abee65a6044b4c997ba65a69f70deca246bde53c1cf5314812312178e82c0893093d9f23ced3b0176f9d
SHA512
ffb0e618f9e58a7a8e4a265d253bad4e168c220697216684acb38dbfa20680e552eb7c5f3d2186cd750c61a8929bf152527aa85c39318ed8b025a4adde50
diff --git a/sys-boot/os-prober/os-prober-1.81.ebuild
b/sys-boot/os-prober/os-prober-1.81.ebuild
new file mode 100644
index ..60466c142031
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.81.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="https://salsa.debian.org/installer-team/os-prober";
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://salsa.debian.org/installer-team/${PN}.git";
+else
+ SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+# grub-mount needed per bug #607518
+RDEPEND="sys-boot/grub:2[mount]"
+
+# bug 594250
+QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.79-mdraid-detection.patch
+ "${FILESDIR}"/${PN}-1.79-btrfs-subvolume-detection.patch
+ "${FILESDIR}"/${PN}-1.79-use-fstab-name.patch
+ "${FILESDIR}"/${PN}-1.79-mounted-boot-partition-fix.patch
+ "${FILESDIR}"/${PN}-1.79-fix-busy-umount-message.patch
+ "${FILESDIR}"/${PN}-1.79-efi-chroot-blkid-fallback.patch
+)
+
+DOC_CONTENTS="
+ If you intend for os-prober to detect versions of Windows installed on
+ NTFS-formatted partitions, your system must be capable of reading the
+ NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g.
+
+ NOTE: Since sys-boot/grub-2.06-rc1, grub-mkconfig disables os-prober by
default.
+ To enable it, add GRUB_DISABLE_OS_PROBER=false to /etc/default/grub.
+"
+
+src_prepare() {
+ default
+ # use default GNU rules
+ rm Makefile || die 'rm Makefile failed'
+}
+
+src_compile() {
+ tc-export CC
+ emake newns
+}
+
+src_install() {
+ dobin os-prober linux-boot-prober
+
+ # Note: as no shared libraries are installed, /usr/lib is correct
+ exeinto /usr/lib/os-prober
+ doexe newns
+
+ insinto /usr/share/os-prober
+ doins common.sh
+
+ keepdir /var/lib/os-prober
+
+ local debarch=${ARCH%-*} dir
+
+ case ${debarch} in
+ amd64) debarch=x86 ;;
+ ppc|ppc64) debarch=powerpc ;;
+ esac
+
+ for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
+ exeinto /usr/lib/${dir}
+ doexe ${dir}/common/*
+ if [[ -d ${dir}/${debarch} ]]; then
+ for exe in ${dir}/${debarch}/*; do
+ [[ ! -d "${exe}" ]] && doexe "${exe}"
+ done
+ fi
+ if [[ -d ${dir}/${debarch}/efi ]]; then
+ exeinto /usr/lib/${dir}/efi
+ doexe ${dir}/${debarch}/efi/*
+ fi
+ done
+
+ if use amd64 || use x86; then
+ exeinto /usr/li
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: f09c74340cff654c98b0ef600d28079de1a9db37
Author: Ben Kohler gentoo org>
AuthorDate: Fri May 27 16:12:47 2022 +
Commit: Ben Kohler gentoo org>
CommitDate: Fri May 27 16:13:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f09c7434
sys-boot/os-prober: add 1.80 and sync to
Signed-off-by: Ben Kohler gentoo.org>
sys-boot/os-prober/Manifest | 1 +
sys-boot/os-prober/{os-prober-.ebuild => os-prober-1.80.ebuild} | 3 +--
sys-boot/os-prober/os-prober-.ebuild| 3 +--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index 004e286db169..aafa95626aee 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,2 +1,3 @@
DIST os-prober_1.78.tar.xz 26848 BLAKE2B
eee68ab9be36807d86e8bda831cfd490a01d20d9cc3f84ca50d5e1143e5a2dd66e47d3bdf2b4780cf73cc692f0ffc9497c6cbf13ce7aa0057e996b13d706c8f7
SHA512
7a0425130d17ce8554e7d0797b53e3a984f63a2fdcf8e668c83d357418d8c68259ada25bc350b199adece2e683d9014f234e3a83ce5ab7485be2e69c45874640
DIST os-prober_1.79.tar.xz 27028 BLAKE2B
b3efacce9d7fce3708f5ec727a219e872e8d1de6dea15540cfbc0a0e8372c1033098230d3ddb9066fb5474d44e5584ee28631e0e5ab981e8fb1dc29ee3cbd89d
SHA512
89b827b9b90a1d3bc11e0090ec04d808502cc1883ab10997b6d9edbe6005dcf8a0acdd7d200102c9dccde56297bda6087d68fb6dec419f0920090c2655c9c7d8
+DIST os-prober_1.80.tar.xz 27400 BLAKE2B
56883c7d3f4c5dde2904cffc77fdf6a2c1caf230f9e84197e8d976e446815838448bb42afd18d4c9526efac9907db3d2e77c6f54889011d2d03d284a44ff4cbd
SHA512
51b4fefb784d5ecf34f5148157ef233e2979c4a679a54600144be473bb6ccaf263c9121701a1ecc7523c7e3bfc439a4e3a92a5eb92431ead99cbe666b0f0e6f5
diff --git a/sys-boot/os-prober/os-prober-.ebuild
b/sys-boot/os-prober/os-prober-1.80.ebuild
similarity index 97%
copy from sys-boot/os-prober/os-prober-.ebuild
copy to sys-boot/os-prober/os-prober-1.80.ebuild
index c854d403e4f0..60466c142031 100644
--- a/sys-boot/os-prober/os-prober-.ebuild
+++ b/sys-boot/os-prober/os-prober-1.80.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,6 @@ if [[ ${PV} == ]]; then
else
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
KEYWORDS="~amd64 ~x86"
- S="${WORKDIR}"/${PN}
fi
LICENSE="GPL-3"
diff --git a/sys-boot/os-prober/os-prober-.ebuild
b/sys-boot/os-prober/os-prober-.ebuild
index c854d403e4f0..60466c142031 100644
--- a/sys-boot/os-prober/os-prober-.ebuild
+++ b/sys-boot/os-prober/os-prober-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,6 @@ if [[ ${PV} == ]]; then
else
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
KEYWORDS="~amd64 ~x86"
- S="${WORKDIR}"/${PN}
fi
LICENSE="GPL-3"
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 96765e002d5a94602a89dc1474c28d3affc76670
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Apr 15 06:23:50 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Apr 15 06:23:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96765e00
sys-boot/os-prober: x86 stable wrt bug #838334
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-boot/os-prober/os-prober-1.79-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/os-prober/os-prober-1.79-r2.ebuild
b/sys-boot/os-prober/os-prober-1.79-r2.ebuild
index 1ae3cd3a476e..346cbb2f355a 100644
--- a/sys-boot/os-prober/os-prober-1.79-r2.ebuild
+++ b/sys-boot/os-prober/os-prober-1.79-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://salsa.debian.org/installer-team/${PN}.git";
else
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
S="${WORKDIR}"/${PN}
fi
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: e091b0472e04dbc43228f33fc16de3bd7683ca40
Author: Jakov Smolić gentoo org>
AuthorDate: Thu Apr 14 19:35:04 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Thu Apr 14 19:35:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e091b047
sys-boot/os-prober: Stabilize 1.79-r2 amd64, #838334
Signed-off-by: Jakov Smolić gentoo.org>
sys-boot/os-prober/os-prober-1.79-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/os-prober/os-prober-1.79-r2.ebuild
b/sys-boot/os-prober/os-prober-1.79-r2.ebuild
index 45b2903ceac8..1ae3cd3a476e 100644
--- a/sys-boot/os-prober/os-prober-1.79-r2.ebuild
+++ b/sys-boot/os-prober/os-prober-1.79-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://salsa.debian.org/installer-team/${PN}.git";
else
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
S="${WORKDIR}"/${PN}
fi
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/files/, sys-boot/os-prober/
commit: 2195898d5f9ed4cd445758c7616c0d46ce03a947
Author: Sergey Galkin gmail com>
AuthorDate: Sat Jan 8 05:28:10 2022 +
Commit: Ben Kohler gentoo org>
CommitDate: Tue Jan 11 17:53:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2195898d
sys-boot/os-prober: fix for kernel 5.15 with ntfs3
Closes: https://bugs.gentoo.org/830753
Signed-off-by: Sergei Galkin gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23694
Signed-off-by: Ben Kohler gentoo.org>
.../os-prober/files/os-prober-1.79-ntfs3.patch | 26 +
sys-boot/os-prober/os-prober-1.79-r2.ebuild| 105 +
2 files changed, 131 insertions(+)
diff --git a/sys-boot/os-prober/files/os-prober-1.79-ntfs3.patch
b/sys-boot/os-prober/files/os-prober-1.79-ntfs3.patch
new file mode 100644
index ..a354445ebd8b
--- /dev/null
+++ b/sys-boot/os-prober/files/os-prober-1.79-ntfs3.patch
@@ -0,0 +1,26 @@
+For 5.15 kernel with ntfs3 file system
+
+Bug: https://bugs.gentoo.org/830753
+
+--- a/os-probes/mounted/arm64/20microsoft
b/os-probes/mounted/arm64/20microsoft
+@@ -15,7 +15,7 @@ fi
+
+ # Weed out stuff that doesn't apply to us
+ case "$type" in
+- ntfs|ntfs-3g) debug "$1 is a NTFS partition" ;;
++ ntfs|ntfs-3g|ntfs3) debug "$1 is a NTFS partition" ;;
+ vfat) debug "$1 is a FAT32 partition" ;;
+ msdos) debug "$1 is a FAT16 partition" ;;
+ fat) debug "$1 is a FAT partition (mounted by GRUB)" ;;
+--- a/os-probes/mounted/x86/20microsoft
b/os-probes/mounted/x86/20microsoft
+@@ -15,7 +15,7 @@ fi
+
+ # Weed out stuff that doesn't apply to us
+ case "$type" in
+- ntfs|ntfs-3g) debug "$1 is a NTFS partition" ;;
++ ntfs|ntfs-3g|ntfs3) debug "$1 is a NTFS partition" ;;
+ vfat) debug "$1 is a FAT32 partition" ;;
+ msdos) debug "$1 is a FAT16 partition" ;;
+ fat) debug "$1 is a FAT partition (mounted by GRUB)" ;;
diff --git a/sys-boot/os-prober/os-prober-1.79-r2.ebuild
b/sys-boot/os-prober/os-prober-1.79-r2.ebuild
new file mode 100644
index ..45b2903ceac8
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.79-r2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="https://salsa.debian.org/installer-team/os-prober";
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://salsa.debian.org/installer-team/${PN}.git";
+else
+ SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}"/${PN}
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+# grub-mount needed per bug #607518
+RDEPEND="sys-boot/grub:2[mount]"
+
+# bug 594250
+QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.79-handle-multiple-initrd-paths.patch
+ "${FILESDIR}"/${PN}-1.79-mdraid-detection.patch
+ "${FILESDIR}"/${PN}-1.79-btrfs-subvolume-detection.patch
+ "${FILESDIR}"/${PN}-1.79-use-fstab-name.patch
+ "${FILESDIR}"/${PN}-1.79-mounted-boot-partition-fix.patch
+ "${FILESDIR}"/${PN}-1.79-fix-busy-umount-message.patch
+ "${FILESDIR}"/${PN}-1.79-efi-chroot-blkid-fallback.patch
+ "${FILESDIR}"/${PN}-1.79-ntfs3.patch
+)
+
+DOC_CONTENTS="
+ If you intend for os-prober to detect versions of Windows installed on
+ NTFS-formatted partitions, your system must be capable of reading the
+ NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g.
+
+ NOTE: Since sys-boot/grub-2.06-rc1, grub-mkconfig disables os-prober by
default.
+ To enable it, add GRUB_DISABLE_OS_PROBER=false to /etc/default/grub.
+"
+
+src_prepare() {
+ default
+ # use default GNU rules
+ rm Makefile || die 'rm Makefile failed'
+}
+
+src_compile() {
+ tc-export CC
+ emake newns
+}
+
+src_install() {
+ dobin os-prober linux-boot-prober
+
+ # Note: as no shared libraries are installed, /usr/lib is correct
+ exeinto /usr/lib/os-prober
+ doexe newns
+
+ insinto /usr/share/os-prober
+ doins common.sh
+
+ keepdir /var/lib/os-prober
+
+ local debarch=${ARCH%-*} dir
+
+ case ${debarch} in
+ amd64) debarch=x86 ;;
+ ppc|ppc64) debarch=powerpc ;;
+ esac
+
+ for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
+ exeinto /usr/lib/${dir}
+ doexe ${dir}/common/*
+ if [[ -d ${dir}/${debarch} ]]; then
+ for exe in ${dir}/${debarch}/*; do
+ [[ ! -d "${exe}" ]] && doexe "${exe}"
+ done
+ fi
+ if [[ -d ${dir}/${debarch}/efi ]]; then
+ exeinto /usr/lib/${dir}/efi
+
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 5b972921a2baa951eea3320f2fa0ad760d47b50f
Author: Ben Kohler gentoo org>
AuthorDate: Tue Jan 4 15:47:43 2022 +
Commit: Ben Kohler gentoo org>
CommitDate: Tue Jan 4 16:13:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b972921
sys-boot/os-prober: drop old
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Ben Kohler gentoo.org>
sys-boot/os-prober/os-prober-1.79.ebuild | 104 ---
1 file changed, 104 deletions(-)
diff --git a/sys-boot/os-prober/os-prober-1.79.ebuild
b/sys-boot/os-prober/os-prober-1.79.ebuild
deleted file mode 100644
index 811ad1fef51f..
--- a/sys-boot/os-prober/os-prober-1.79.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Utility to detect other OSs on a set of drives"
-HOMEPAGE="https://salsa.debian.org/installer-team/os-prober";
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://salsa.debian.org/installer-team/${PN}.git";
-else
- SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
- KEYWORDS="~amd64 ~x86"
- S="${WORKDIR}"/${PN}
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-# grub-mount needed per bug #607518
-RDEPEND="sys-boot/grub:2[mount]"
-
-# bug 594250
-QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.79-mdraid-detection.patch
- "${FILESDIR}"/${PN}-1.79-handle-multiple-initrd-paths.patch
- "${FILESDIR}"/${PN}-1.79-btrfs-subvolume-detection.patch
- "${FILESDIR}"/${PN}-1.79-use-fstab-name.patch
- "${FILESDIR}"/${PN}-1.79-mounted-boot-partition-fix.patch
- "${FILESDIR}"/${PN}-1.79-fix-busy-umount-message.patch
- "${FILESDIR}"/${PN}-1.79-efi-chroot-blkid-fallback.patch
-)
-
-DOC_CONTENTS="
- If you intend for os-prober to detect versions of Windows installed on
- NTFS-formatted partitions, your system must be capable of reading the
- NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g.
-
- NOTE: Since sys-boot/grub-2.06-rc1, grub-mkconfig disables os-prober by
default.
- To enable it, add GRUB_DISABLE_OS_PROBER=false to /etc/default/grub.
-"
-
-src_prepare() {
- default
- # use default GNU rules
- rm Makefile || die 'rm Makefile failed'
-}
-
-src_compile() {
- tc-export CC
- emake newns
-}
-
-src_install() {
- dobin os-prober linux-boot-prober
-
- # Note: as no shared libraries are installed, /usr/lib is correct
- exeinto /usr/lib/os-prober
- doexe newns
-
- insinto /usr/share/os-prober
- doins common.sh
-
- keepdir /var/lib/os-prober
-
- local debarch=${ARCH%-*} dir
-
- case ${debarch} in
- amd64) debarch=x86 ;;
- ppc|ppc64) debarch=powerpc ;;
- esac
-
- for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
- exeinto /usr/lib/${dir}
- doexe ${dir}/common/*
- if [[ -d ${dir}/${debarch} ]]; then
- for exe in ${dir}/${debarch}/*; do
- [[ ! -d "${exe}" ]] && doexe "${exe}"
- done
- fi
- if [[ -d ${dir}/${debarch}/efi ]]; then
- exeinto /usr/lib/${dir}/efi
- doexe ${dir}/${debarch}/efi/*
- fi
- done
-
- if use amd64 || use x86; then
- exeinto /usr/lib/os-probes/mounted
- doexe os-probes/mounted/powerpc/20macosx
- fi
-
- einstalldocs
- dodoc debian/changelog
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/files/
commit: 0615caff91ed90c3489a5107b95383cd025037af
Author: Peter Levine gmail com>
AuthorDate: Tue Dec 21 00:32:20 2021 +
Commit: Ben Kohler gentoo org>
CommitDate: Wed Dec 22 12:33:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0615caff
sys-boot/os-prober: add subsequent whitespace commit
Add a whitespace adjustment commit to
os-prober-1.79-handle-multiple-initrd-paths.patch, to bring the patch
inline with upstream HEAD.
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Peter Levine gmail.com>
Signed-off-by: Ben Kohler gentoo.org>
.../os-prober-1.79-handle-multiple-initrd-paths.patch | 17 +
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git
a/sys-boot/os-prober/files/os-prober-1.79-handle-multiple-initrd-paths.patch
b/sys-boot/os-prober/files/os-prober-1.79-handle-multiple-initrd-paths.patch
index 0b477c17c362..ceab85a92727 100644
--- a/sys-boot/os-prober/files/os-prober-1.79-handle-multiple-initrd-paths.patch
+++ b/sys-boot/os-prober/files/os-prober-1.79-handle-multiple-initrd-paths.patch
@@ -2,14 +2,15 @@ Backport handling of multiple initrd paths, like those needed
by Manjaro
installations. Note, it still requires resolution of
https://savannah.gnu.org/bugs/index.php?47681 on grub's end.
-Commit:
https://salsa.debian.org/installer-team/os-prober/-/commit/53b920e106f13acf87ef8a275161e20f94feeb8a
+Commits:
https://salsa.debian.org/installer-team/os-prober/-/commit/7641c2da0c81f78c5f2ee2a66a1c21350cab03fc
+
https://salsa.debian.org/installer-team/os-prober/-/commit/53b920e106f13acf87ef8a275161e20f94feeb8a
--- a/linux-boot-probes/mounted/common/40grub2
+++ b/linux-boot-probes/mounted/common/40grub2
-@@ -78,11 +78,21 @@
- fi
- ;;
- initrd)
+@@ -78,11 +78,21 @@ parse_grub_menu () {
+ fi
+ ;;
+ initrd)
- initrd="$(echo "$2" | sed 's/(.*)//')"
- # Initrd same.
- if [ "$partition" != "$bootpart" ]; then
@@ -30,6 +31,6 @@ Commit:
https://salsa.debian.org/installer-team/os-prober/-/commit/53b920e106f13
+ initrd="$initrd $initrd_path"
+ fi
+ done
- ;;
- "}")
- entry_result
+ ;;
+ "}")
+ entry_result
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/files/
commit: 8d6d17462775a88220078b4ae38e4e6228164a75 Author: Peter Levine gmail com> AuthorDate: Tue Dec 21 00:36:36 2021 + Commit: Ben Kohler gentoo org> CommitDate: Wed Dec 22 12:33:49 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d6d1746 sys-boot/os-prober: add void linux detection patch Bug: https://bugs.gentoo.org/817905 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Peter Levine gmail.com> Signed-off-by: Ben Kohler gentoo.org> .../os-prober/files/os-prober-1.79-detect-void.patch | 20 1 file changed, 20 insertions(+) diff --git a/sys-boot/os-prober/files/os-prober-1.79-detect-void.patch b/sys-boot/os-prober/files/os-prober-1.79-detect-void.patch new file mode 100644 index ..9d7855906b78 --- /dev/null +++ b/sys-boot/os-prober/files/os-prober-1.79-detect-void.patch @@ -0,0 +1,20 @@ +Handle Void Linux detection. From upstream https://github.com/void-linux/void-packages/blob/2fd8d4df94855a157a4de16c61d54153e16ef185/srcpkgs/os-prober/patches/detect-void.patch + +Bug: https://bugs.gentoo.org/817905 + +--- a/os-probes/mounted/common/90linux-distro b/os-probes/mounted/common/90linux-distro +@@ -116,6 +116,13 @@ + elif [ -e "$dir/sbin/pkgtool" ]; then + short="Slackware" + long="Slackware Linux" ++ elif [ -e "$dir/sbin/xbps-install" ]; then ++ short="Void" ++ if file "$dir/sbin/xbps-install"|grep -q 32-bit; then ++ long="Void Linux 32" ++ else ++ long="Void Linux 64" ++ fi + elif grep -qs OpenLinux "$dir/etc/issue"; then + short="Caldera" + long="Caldera OpenLinux"
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/files/
commit: 4e135dcb12f4cc3716becfd461786bfa370eb416
Author: Peter Levine gmail com>
AuthorDate: Tue Dec 21 00:25:05 2021 +
Commit: Ben Kohler gentoo org>
CommitDate: Wed Dec 22 12:33:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e135dcb
sys-boot/os-prober: switch btrfs patch from openSUSE to Fedora
Fixes issues related to undetected linux installations. This combines
Fedora's os-prober-btrfsfix.patch and openSUSE's
Improve-btrfs-handling-on-os-probing-for-grub2.patch, augmented to
correctly parse multiple initrd paths.
Tested-by: ernsteiswuerfel mailbox.org>
Bug: https://bugs.gentoo.org/817905
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Peter Levine gmail.com>
Signed-off-by: Ben Kohler gentoo.org>
.../os-prober-1.79-btrfs-subvolume-detection.patch | 238 +++--
1 file changed, 122 insertions(+), 116 deletions(-)
diff --git
a/sys-boot/os-prober/files/os-prober-1.79-btrfs-subvolume-detection.patch
b/sys-boot/os-prober/files/os-prober-1.79-btrfs-subvolume-detection.patch
index 14cd794530ee..61337661401f 100644
--- a/sys-boot/os-prober/files/os-prober-1.79-btrfs-subvolume-detection.patch
+++ b/sys-boot/os-prober/files/os-prober-1.79-btrfs-subvolume-detection.patch
@@ -1,23 +1,22 @@
Fixes detection of multiple linux installations on different subvolumes of the
-same partition. Also contains changes from
-https://build.opensuse.org/package/view_file/openSUSE:Factory/os-prober/os-prober-btrfs-always-detect-default.patch
-to fix https://bugs.gentoo.org/790434.
+same partition. This patch is a combination of
https://src.fedoraproject.org/rpms/os-prober/blob/a27e5121193eada672db3521a7d9de70991b/f/os-prober-btrfsfix.patch
and
https://build.opensuse.org/package/view_file/openSUSE:Factory/os-prober/Improve-btrfs-handling-on-os-probing-for-grub2.patch?rev=56
.
Bug: https://bugs.gentoo.org/790434
+ https://bugs.gentoo.org/817905
https://bugs.debian.org/688336
https://bugzilla.redhat.com/888341
--- a/common.sh
+++ b/common.sh
-@@ -155,6 +155,7 @@
+@@ -155,6 +155,7 @@ parse_proc_mounts () {
done
}
-
+
+# add forth parameter to pickup btrfs subvol info
parsefstab () {
while read -r line; do
case "$line" in
-@@ -165,12 +166,22 @@
+@@ -165,12 +166,22 @@ parsefstab () {
set -f
set -- $line
set +f
@@ -27,7 +26,7 @@ Bug: https://bugs.gentoo.org/790434
esac
done
}
-
+
+#check_btrfs_mounted $bootsv $bootuuid)
+check_btrfs_mounted () {
+ bootsv="$1"
@@ -43,8 +42,8 @@ Bug: https://bugs.gentoo.org/790434
sed 's/\\011/ /g; s/\\012/\n/g; s/\\040/ /g; s/\\134/\\/g'
--- a/linux-boot-prober
+++ b/linux-boot-prober
-@@ -5,16 +5,148 @@
-
+@@ -5,16 +5,143 @@ set -e
+
newns "$@"
require_tmpdir
+ERR="n"
@@ -58,9 +57,9 @@ Bug: https://bugs.gentoo.org/790434
+bootmnt=
+bootsv=
+bootuuid=
-
+
grep "^/dev/" /proc/mounts | parse_proc_mounts >"$OS_PROBER_TMP/mounted-map"
|| true
-
+
-partition="$1"
+if [ -z "$1" ]; then
+ ERR=y
@@ -80,14 +79,14 @@ Bug: https://bugs.gentoo.org/790434
+ partition="$1"
+ type=other
+fi
-
+
-if [ -z "$partition" ]; then
+if [ "x$ERR" != xn ]; then
echo "usage: linux-boot-prober partition" >&2
+ echo " linux-boot-prober btrfs UUID=<> subvol=<>" >&2
exit 1
fi
-
+
+if [ "$type" = btrfs ]; then
+ # handle all of the btrfs stuff here
+ if [ ! -e "/proc/self/mountinfo" ]; then
@@ -111,12 +110,7 @@ Bug: https://bugs.gentoo.org/790434
+ fi
+ if [ -z "$mpoint" ]; then
+ # mount the btrfs root
-+
-+ if [ -n "$subvol" ]; then
-+ opts="-o subvol=$subvol"
-+ fi
-+
-+ if ! mount $opts -t btrfs -U $UUID "$tmpmnt" 2>/dev/null; then
++ if ! mount -o subvol=$subvol -t btrfs -U $UUID "$tmpmnt"
2>/dev/null; then
+ warn "error mounting btrfs subvol=$subvol UUID=$UUID"
+ umount "$tmpmnt/boot" 2>/dev/null
+ umount "$tmpmnt" 2>/dev/null
@@ -194,8 +188,8 @@ Bug: https://bugs.gentoo.org/790434
if ! mapped="$(mapdevfs "$partition")"; then
log "Device '$partition' does not exist; skipping"
continue
-@@ -22,8 +154,8 @@
-
+@@ -22,8 +149,8 @@ fi
+
if ! grep -q "^$mapped " "$OS_PROBER_TMP/mounted-map"; then
for test in /usr/lib/linux-boot-probes/*; do
- debug "running $test"
@@ -206,10 +200,10 @@ Bug: https://bugs.gentoo.org/790434
break
--- a/linux-boot-probes/mounted/common/40grub2
+++ b/linux-boot-probes/mounted/common/40grub2
-@@ -2,17 +2,30 @@
+@@ -2,17 +2,42 @@
. /usr/share/os-prober/common.sh
set -e
-
+
+# add support for btrfs with no separate /boot
+# that is, rootsv = bootsv
partition="$1"
@@ -218,16 +
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 6d092b6cfd8e9f3512c536f20dfc1de445b21039
Author: Peter Levine gmail com>
AuthorDate: Tue Dec 21 00:42:02 2021 +
Commit: Ben Kohler gentoo org>
CommitDate: Wed Dec 22 12:33:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d092b6c
sys-boot/os-prober: bump os-prober-1.79-r1.ebuild
Includes the Void Linux patch and moves the multiple-initrd-paths patch
to the front since it's already accepted upstream.
Closes: https://bugs.gentoo.org/817905
Closes: https://github.com/gentoo/gentoo/pull/23445
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Peter Levine gmail.com>
Signed-off-by: Ben Kohler gentoo.org>
sys-boot/os-prober/os-prober-1.79-r1.ebuild | 105
1 file changed, 105 insertions(+)
diff --git a/sys-boot/os-prober/os-prober-1.79-r1.ebuild
b/sys-boot/os-prober/os-prober-1.79-r1.ebuild
new file mode 100644
index ..b310aa3de302
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.79-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="https://salsa.debian.org/installer-team/os-prober";
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://salsa.debian.org/installer-team/${PN}.git";
+else
+ SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}"/${PN}
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+# grub-mount needed per bug #607518
+RDEPEND="sys-boot/grub:2[mount]"
+
+# bug 594250
+QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.79-handle-multiple-initrd-paths.patch
+ "${FILESDIR}"/${PN}-1.79-mdraid-detection.patch
+ "${FILESDIR}"/${PN}-1.79-btrfs-subvolume-detection.patch
+ "${FILESDIR}"/${PN}-1.79-use-fstab-name.patch
+ "${FILESDIR}"/${PN}-1.79-mounted-boot-partition-fix.patch
+ "${FILESDIR}"/${PN}-1.79-fix-busy-umount-message.patch
+ "${FILESDIR}"/${PN}-1.79-efi-chroot-blkid-fallback.patch
+ "${FILESDIR}"/${PN}-1.79-detect-void.patch
+)
+
+DOC_CONTENTS="
+ If you intend for os-prober to detect versions of Windows installed on
+ NTFS-formatted partitions, your system must be capable of reading the
+ NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g.
+
+ NOTE: Since sys-boot/grub-2.06-rc1, grub-mkconfig disables os-prober by
default.
+ To enable it, add GRUB_DISABLE_OS_PROBER=false to /etc/default/grub.
+"
+
+src_prepare() {
+ default
+ # use default GNU rules
+ rm Makefile || die 'rm Makefile failed'
+}
+
+src_compile() {
+ tc-export CC
+ emake newns
+}
+
+src_install() {
+ dobin os-prober linux-boot-prober
+
+ # Note: as no shared libraries are installed, /usr/lib is correct
+ exeinto /usr/lib/os-prober
+ doexe newns
+
+ insinto /usr/share/os-prober
+ doins common.sh
+
+ keepdir /var/lib/os-prober
+
+ local debarch=${ARCH%-*} dir
+
+ case ${debarch} in
+ amd64) debarch=x86 ;;
+ ppc|ppc64) debarch=powerpc ;;
+ esac
+
+ for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
+ exeinto /usr/lib/${dir}
+ doexe ${dir}/common/*
+ if [[ -d ${dir}/${debarch} ]]; then
+ for exe in ${dir}/${debarch}/*; do
+ [[ ! -d "${exe}" ]] && doexe "${exe}"
+ done
+ fi
+ if [[ -d ${dir}/${debarch}/efi ]]; then
+ exeinto /usr/lib/${dir}/efi
+ doexe ${dir}/${debarch}/efi/*
+ fi
+ done
+
+ if use amd64 || use x86; then
+ exeinto /usr/lib/os-probes/mounted
+ doexe os-probes/mounted/powerpc/20macosx
+ fi
+
+ einstalldocs
+ dodoc debian/changelog
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/files/, sys-boot/os-prober/
commit: 45a0db318d24761296ad6c369202f1c1d07e3443
Author: Peter Levine gmail com>
AuthorDate: Fri Oct 8 01:25:58 2021 +
Commit: Ben Kohler gentoo org>
CommitDate: Fri Oct 8 11:12:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45a0db31
sys-boot/os-prober: use the name in fstab for devmapper partitions
For /dev/mapper/gentoo linked to /dev/dm-1, use "gentoo" instead of
"dm-1" as the patition name.
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Peter Levine gmail.com>
Signed-off-by: Ben Kohler gentoo.org>
.../files/os-prober-1.79-use-fstab-name.patch | 34 ++
sys-boot/os-prober/os-prober-.ebuild | 1 +
2 files changed, 35 insertions(+)
diff --git a/sys-boot/os-prober/files/os-prober-1.79-use-fstab-name.patch
b/sys-boot/os-prober/files/os-prober-1.79-use-fstab-name.patch
new file mode 100644
index 000..e38d85a77fe
--- /dev/null
+++ b/sys-boot/os-prober/files/os-prober-1.79-use-fstab-name.patch
@@ -0,0 +1,34 @@
+For symlinks to partions in fstab, returns the partition name from fstab
instead
+of the name of its resolved destination, eg., for /dev/mapper/mylvmvol in
fstab,
+linked to /dev/dm-2, return "mylvmvol" instead of "dm-2".
+
+Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=699839
+ https://bugzilla.redhat.com/show_bug.cgi?id=893472
+
+--- a/common.sh
b/common.sh
+@@ -269,7 +269,7 @@ linux_mount_boot () {
+ if [ "$bindfrom" != "$tmpmnt/boot" ]; then
+ if mount --bind "$bindfrom"
"$tmpmnt/boot"; then
+ mounted=1
+- bootpart="$1"
++ bootpart="$tmppart"
+ else
+ debug "failed to bind-mount
$bindfrom onto $tmpmnt/boot"
+ fi
+@@ -277,6 +277,15 @@ linux_mount_boot () {
+ fi
+ if [ "$mounted" ]; then
+ :
++ elif [ -e "$tmppart" ]; then
++ bootpart="$tmppart"
++ boottomnt="$tmppart"
++ elif [ -e "$tmpmnt/$tmppart" ]; then
++ bootpart="$tmppart"
++ boottomnt="$tmpmnt/$tmppart"
++ elif [ -e "/target/$tmppart" ]; then
++ bootpart="$tmppart"
++ boottomnt="/target/$tmppart"
+ elif [ -e "$1" ]; then
+ bootpart="$1"
+ boottomnt="$1"
diff --git a/sys-boot/os-prober/os-prober-.ebuild
b/sys-boot/os-prober/os-prober-.ebuild
index 5bd9e3b714c..392bf080566 100644
--- a/sys-boot/os-prober/os-prober-.ebuild
+++ b/sys-boot/os-prober/os-prober-.ebuild
@@ -28,6 +28,7 @@ QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
PATCHES=(
"${FILESDIR}"/${PN}-1.79-mdraid-detection.patch
"${FILESDIR}"/${PN}-1.79-btrfs-subvolume-detection.patch
+ "${FILESDIR}"/${PN}-1.79-use-fstab-name.patch
)
DOC_CONTENTS="
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 6b36233d2f828b70b35f998b178f0b7c0489e96e
Author: Ben Kohler gentoo org>
AuthorDate: Fri Oct 8 11:10:49 2021 +
Commit: Ben Kohler gentoo org>
CommitDate: Fri Oct 8 11:12:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b36233d
sys-boot/os-prober: revbump to rebuild with better btrfs patch
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Ben Kohler gentoo.org>
sys-boot/os-prober/{os-prober-1.78.ebuild => os-prober-1.78-r1.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/sys-boot/os-prober/os-prober-1.78.ebuild
b/sys-boot/os-prober/os-prober-1.78-r1.ebuild
similarity index 100%
rename from sys-boot/os-prober/os-prober-1.78.ebuild
rename to sys-boot/os-prober/os-prober-1.78-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/, sys-boot/os-prober/files/
commit: 733c692eca0ad50591ccf11cfcf89e317291f35f
Author: Peter Levine gmail com>
AuthorDate: Fri Oct 8 01:13:01 2021 +
Commit: Ben Kohler gentoo org>
CommitDate: Fri Oct 8 11:12:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=733c692e
sys-boot/os-prober: replace os-prober-1.78-btrfsfix.patch
Replace os-prober-1.78-btrfsfix.patch with changes from OpenSUSE's
os-prober-btrfs-always-detect-default.patch to fix OS detection issues.
Closes: https://bugs.gentoo.org/790434
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Peter Levine gmail.com>
Signed-off-by: Ben Kohler gentoo.org>
.../os-prober-1.79-btrfs-subvolume-detection.patch | 505 +
sys-boot/os-prober/os-prober-.ebuild | 2 +-
2 files changed, 506 insertions(+), 1 deletion(-)
diff --git
a/sys-boot/os-prober/files/os-prober-1.79-btrfs-subvolume-detection.patch
b/sys-boot/os-prober/files/os-prober-1.79-btrfs-subvolume-detection.patch
new file mode 100644
index 000..14cd794530e
--- /dev/null
+++ b/sys-boot/os-prober/files/os-prober-1.79-btrfs-subvolume-detection.patch
@@ -0,0 +1,505 @@
+Fixes detection of multiple linux installations on different subvolumes of the
+same partition. Also contains changes from
+https://build.opensuse.org/package/view_file/openSUSE:Factory/os-prober/os-prober-btrfs-always-detect-default.patch
+to fix https://bugs.gentoo.org/790434.
+
+Bug: https://bugs.gentoo.org/790434
+ https://bugs.debian.org/688336
+ https://bugzilla.redhat.com/888341
+
+--- a/common.sh
b/common.sh
+@@ -155,6 +155,7 @@
+ done
+ }
+
++# add forth parameter to pickup btrfs subvol info
+ parsefstab () {
+ while read -r line; do
+ case "$line" in
+@@ -165,12 +166,22 @@
+ set -f
+ set -- $line
+ set +f
+- printf '%s %s %s\n' "$1" "$2" "$3"
++ printf '%s %s %s %s\n' "$1" "$2" "$3" "$4"
+ ;;
+ esac
+ done
+ }
+
++#check_btrfs_mounted $bootsv $bootuuid)
++check_btrfs_mounted () {
++ bootsv="$1"
++ bootuuid="$2"
++ bootdev=$(blkid | grep "$bootuuid" | cut -d ':' -f 1)
++ bindfrom=$(grep " btrfs " /proc/self/mountinfo |
++ grep " $bootdev " | grep " /$bootsv " | cut -d ' ' -f 5)
++ printf "%s" "$bindfrom"
++}
++
+ unescape_mount () {
+ printf %s "$1" | \
+ sed 's/\\011/ /g; s/\\012/\n/g; s/\\040/ /g; s/\\134/\\/g'
+--- a/linux-boot-prober
b/linux-boot-prober
+@@ -5,16 +5,148 @@
+
+ newns "$@"
+ require_tmpdir
++ERR="n"
++
++tmpmnt=/var/lib/os-prober/mount
++if [ ! -d "$tmpmnt" ]; then
++ mkdir "$tmpmnt"
++fi
++
++mounted=
++bootmnt=
++bootsv=
++bootuuid=
+
+ grep "^/dev/" /proc/mounts | parse_proc_mounts >"$OS_PROBER_TMP/mounted-map"
|| true
+
+-partition="$1"
++if [ -z "$1" ]; then
++ ERR=y
++elif [ "$1" = btrfs -a -z "$2" ]; then
++ ERR=y
++elif [ "$1" = btrfs -a -z "$3" ]; then
++ ERR=y
++elif [ "$1" = btrfs ]; then
++ type=btrfs
++ echo "$2" | grep -q "^UUID=" || ERR=y
++ echo "$3" | grep -q "^subvol=" || ERR=y
++ export "$2"
++ export "$3"
++ partition=$(blkid | grep "$UUID" | cut -d ':' -f 1 | tr '\n' ' ' | cut
-d ' ' -f 1)
++ debug "btrfs: partition=$partition, UUID=$UUID, subvol=$subvol"
++else
++ partition="$1"
++ type=other
++fi
+
+-if [ -z "$partition" ]; then
++if [ "x$ERR" != xn ]; then
+ echo "usage: linux-boot-prober partition" >&2
++ echo " linux-boot-prober btrfs UUID=<> subvol=<>" >&2
+ exit 1
+ fi
+
++if [ "$type" = btrfs ]; then
++ # handle all of the btrfs stuff here
++ if [ ! -e "/proc/self/mountinfo" ]; then
++ warn "/proc/self/mountinfo does not exist, exiting"
++ umount "$tmpmnt" 2>/dev/null
++ rmdir "$tmpmnt" 2>/dev/null
++ exit 1
++ fi
++ mpoint=$(grep "btrfs" /proc/self/mountinfo | grep " /$subvol " | grep "
$partition " | cut -d ' ' -f 5)
++ if [ "$mpoint" = "/" ]; then
++ warn "specifying active root not valid, exiting"
++ umount "$tmpmnt" 2>/dev/null
++ rmdir "$tmpmnt" 2>/dev/null
++ exit 1
++ fi
++ if [ "$mpoint" = "$tmpmnt" ]; then
++ warn "btrfs subvol=$subvool, UUID=$UUID, already mounted on
$tmpmnt **ERROR**"
++ umount "$tmpmnt" 2>/dev/null
++ rmdir "$tmpmnt" 2>/dev/null
++ exit 1
++ fi
++ if [ -z "$mpoint" ]; then
++ # mount the btrfs root
++
++ if [ -n "$subvol" ]; then
++ opts="-o subvol=$subvol"
++ fi
++
++ if ! mount $opts -t btrfs -U $UUID "$tmpmnt" 2>/dev/null; then
++ warn "error mounting btrfs subvol=$subvol UUID=$UUID"
++
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 9614f93406eec0f806b9216b728c184778b622ed
Author: Peter Levine gmail com>
AuthorDate: Fri Oct 8 01:53:04 2021 +
Commit: Ben Kohler gentoo org>
CommitDate: Fri Oct 8 11:12:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9614f934
sys-boot/os-prober: bump os-prober-1.79
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Peter Levine gmail.com>
Signed-off-by: Ben Kohler gentoo.org>
sys-boot/os-prober/Manifest | 1 +
sys-boot/os-prober/os-prober-1.79.ebuild | 103 +++
2 files changed, 104 insertions(+)
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index 3d27c08a60f..004e286db16 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1 +1,2 @@
DIST os-prober_1.78.tar.xz 26848 BLAKE2B
eee68ab9be36807d86e8bda831cfd490a01d20d9cc3f84ca50d5e1143e5a2dd66e47d3bdf2b4780cf73cc692f0ffc9497c6cbf13ce7aa0057e996b13d706c8f7
SHA512
7a0425130d17ce8554e7d0797b53e3a984f63a2fdcf8e668c83d357418d8c68259ada25bc350b199adece2e683d9014f234e3a83ce5ab7485be2e69c45874640
+DIST os-prober_1.79.tar.xz 27028 BLAKE2B
b3efacce9d7fce3708f5ec727a219e872e8d1de6dea15540cfbc0a0e8372c1033098230d3ddb9066fb5474d44e5584ee28631e0e5ab981e8fb1dc29ee3cbd89d
SHA512
89b827b9b90a1d3bc11e0090ec04d808502cc1883ab10997b6d9edbe6005dcf8a0acdd7d200102c9dccde56297bda6087d68fb6dec419f0920090c2655c9c7d8
diff --git a/sys-boot/os-prober/os-prober-1.79.ebuild
b/sys-boot/os-prober/os-prober-1.79.ebuild
new file mode 100644
index 000..c854d403e4f
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.79.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="https://salsa.debian.org/installer-team/os-prober";
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://salsa.debian.org/installer-team/${PN}.git";
+else
+ SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}"/${PN}
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+# grub-mount needed per bug #607518
+RDEPEND="sys-boot/grub:2[mount]"
+
+# bug 594250
+QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.79-mdraid-detection.patch
+ "${FILESDIR}"/${PN}-1.79-btrfs-subvolume-detection.patch
+ "${FILESDIR}"/${PN}-1.79-use-fstab-name.patch
+ "${FILESDIR}"/${PN}-1.79-mounted-boot-partition-fix.patch
+ "${FILESDIR}"/${PN}-1.79-fix-busy-umount-message.patch
+ "${FILESDIR}"/${PN}-1.79-efi-chroot-blkid-fallback.patch
+)
+
+DOC_CONTENTS="
+ If you intend for os-prober to detect versions of Windows installed on
+ NTFS-formatted partitions, your system must be capable of reading the
+ NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g.
+
+ NOTE: Since sys-boot/grub-2.06-rc1, grub-mkconfig disables os-prober by
default.
+ To enable it, add GRUB_DISABLE_OS_PROBER=false to /etc/default/grub.
+"
+
+src_prepare() {
+ default
+ # use default GNU rules
+ rm Makefile || die 'rm Makefile failed'
+}
+
+src_compile() {
+ tc-export CC
+ emake newns
+}
+
+src_install() {
+ dobin os-prober linux-boot-prober
+
+ # Note: as no shared libraries are installed, /usr/lib is correct
+ exeinto /usr/lib/os-prober
+ doexe newns
+
+ insinto /usr/share/os-prober
+ doins common.sh
+
+ keepdir /var/lib/os-prober
+
+ local debarch=${ARCH%-*} dir
+
+ case ${debarch} in
+ amd64) debarch=x86 ;;
+ ppc|ppc64) debarch=powerpc ;;
+ esac
+
+ for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
+ exeinto /usr/lib/${dir}
+ doexe ${dir}/common/*
+ if [[ -d ${dir}/${debarch} ]]; then
+ for exe in ${dir}/${debarch}/*; do
+ [[ ! -d "${exe}" ]] && doexe "${exe}"
+ done
+ fi
+ if [[ -d ${dir}/${debarch}/efi ]]; then
+ exeinto /usr/lib/${dir}/efi
+ doexe ${dir}/${debarch}/efi/*
+ fi
+ done
+
+ if use amd64 || use x86; then
+ exeinto /usr/lib/os-probes/mounted
+ doexe os-probes/mounted/powerpc/20macosx
+ fi
+
+ einstalldocs
+ dodoc debian/changelog
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/, sys-boot/os-prober/files/
commit: 84564ed5e8df1bf6240aa2b5401562ff81e27081
Author: Peter Levine gmail com>
AuthorDate: Fri Oct 8 01:46:36 2021 +
Commit: Ben Kohler gentoo org>
CommitDate: Fri Oct 8 11:12:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84564ed5
sys-boot/os-prober: fix os-prober in chroot and no mounted /run/udev
When /run/udev isn't mounted or udev isn't available, fallback to blkid.
Bug: https://bugs.gentoo.org/761475
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Peter Levine gmail.com>
Signed-off-by: Ben Kohler gentoo.org>
.../os-prober-1.79-efi-chroot-blkid-fallback.patch | 24 ++
sys-boot/os-prober/os-prober-.ebuild | 3 +--
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git
a/sys-boot/os-prober/files/os-prober-1.79-efi-chroot-blkid-fallback.patch
b/sys-boot/os-prober/files/os-prober-1.79-efi-chroot-blkid-fallback.patch
new file mode 100644
index 000..b5b90b2214d
--- /dev/null
+++ b/sys-boot/os-prober/files/os-prober-1.79-efi-chroot-blkid-fallback.patch
@@ -0,0 +1,24 @@
+Fixes missing entries when os-prober is run in a chroot environment by falling
back
+to blkid if udev isn't available or if /run/udev isn't bind mounted. Modified
from
+https://build.opensuse.org/package/view_file/Base:System/os-prober/os-prober-05efi-blkid.patch?rev=103
+
+Bug: https://bugs.gentoo.org/761475
+ https://bugzilla.opensuse.org/1076779
+
+--- a/os-probes/mounted/x86/05efi
b/os-probes/mounted/x86/05efi
+@@ -46,6 +46,14 @@ if type udevinfo > /dev/null 2>&1; then
+ fi
+
+ eval "$(udevinfo -q property -n "$partition" | grep -E
'^ID_PART_ENTRY_(TYPE|SCHEME)=')"
++
++ # udev may not work in chroot as its db may not be there, bailout that
by blkid (bsc#1076779)
++ if [ -z "$ID_PART_ENTRY_TYPE" -a -z "$ID_PART_ENTRY_SCHEME" ] &&
++ type blkid > /dev/null 2>&1; then
++ debug "fallback to blkid"
++ eval "$(blkid -p -o udev "$partition" | grep -E
'^(ID_PART_ENTRY_(TYPE|SCHEME))=')"
++ fi
++
+ debug "$partition partition scheme is $ID_PART_ENTRY_SCHEME"
+ debug "$partition partition type is $ID_PART_ENTRY_TYPE"
+
diff --git a/sys-boot/os-prober/os-prober-.ebuild
b/sys-boot/os-prober/os-prober-.ebuild
index 4c80110b806..c854d403e4f 100644
--- a/sys-boot/os-prober/os-prober-.ebuild
+++ b/sys-boot/os-prober/os-prober-.ebuild
@@ -31,14 +31,13 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.79-use-fstab-name.patch
"${FILESDIR}"/${PN}-1.79-mounted-boot-partition-fix.patch
"${FILESDIR}"/${PN}-1.79-fix-busy-umount-message.patch
+ "${FILESDIR}"/${PN}-1.79-efi-chroot-blkid-fallback.patch
)
DOC_CONTENTS="
If you intend for os-prober to detect versions of Windows installed on
NTFS-formatted partitions, your system must be capable of reading the
NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g.
- Also, in a chroot environment, it is necessary to bind mount /run/udev
- (see https://wiki.gentoo.org/wiki/GRUB2#os-prober_and_UEFI_in_chroot).
NOTE: Since sys-boot/grub-2.06-rc1, grub-mkconfig disables os-prober by
default.
To enable it, add GRUB_DISABLE_OS_PROBER=false to /etc/default/grub.
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/files/, sys-boot/os-prober/
commit: fdcd2c6597c04b0c2b24e1966b6d6380f5fa32bb
Author: Peter Levine gmail com>
AuthorDate: Fri Oct 8 02:15:06 2021 +
Commit: Ben Kohler gentoo org>
CommitDate: Fri Oct 8 11:12:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdcd2c65
sys-boot/os-prober: fix handling of multiple initrd paths
Backport of upstream fix for handling multiple initrd paths like those
needed for Majaro installations. Still requires changes in grub from
https://savannah.gnu.org/bugs/index.php?47681, if and when it gets merged
upstream.
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Peter Levine gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22513
Signed-off-by: Ben Kohler gentoo.org>
...-prober-1.79-handle-multiple-initrd-paths.patch | 35 ++
sys-boot/os-prober/os-prober-1.79.ebuild | 1 +
2 files changed, 36 insertions(+)
diff --git
a/sys-boot/os-prober/files/os-prober-1.79-handle-multiple-initrd-paths.patch
b/sys-boot/os-prober/files/os-prober-1.79-handle-multiple-initrd-paths.patch
new file mode 100644
index 000..0b477c17c36
--- /dev/null
+++ b/sys-boot/os-prober/files/os-prober-1.79-handle-multiple-initrd-paths.patch
@@ -0,0 +1,35 @@
+Backport handling of multiple initrd paths, like those needed by Manjaro
+installations. Note, it still requires resolution of
+https://savannah.gnu.org/bugs/index.php?47681 on grub's end.
+
+Commit:
https://salsa.debian.org/installer-team/os-prober/-/commit/53b920e106f13acf87ef8a275161e20f94feeb8a
+
+--- a/linux-boot-probes/mounted/common/40grub2
b/linux-boot-probes/mounted/common/40grub2
+@@ -78,11 +78,21 @@
+ fi
+ ;;
+ initrd)
+- initrd="$(echo "$2" | sed 's/(.*)//')"
+- # Initrd same.
+- if [ "$partition" != "$bootpart" ]; then
+- initrd="/boot$initrd"
+- fi
++ shift
++ initrd=""
++ for initrd_path in "$@"; do
++ # sed hack, as above
++ initrd_path="$(echo "$initrd_path" |
sed 's/(.*)//')"
++ # Initrd same.
++ if [ "$partition" != "$bootpart" ]; then
++ initrd_path="/boot$initrd_path"
++ fi
++ if [ -z "$initrd" ]; then
++ initrd="$initrd_path"
++ else
++ initrd="$initrd $initrd_path"
++ fi
++ done
+ ;;
+ "}")
+ entry_result
diff --git a/sys-boot/os-prober/os-prober-1.79.ebuild
b/sys-boot/os-prober/os-prober-1.79.ebuild
index c854d403e4f..811ad1fef51 100644
--- a/sys-boot/os-prober/os-prober-1.79.ebuild
+++ b/sys-boot/os-prober/os-prober-1.79.ebuild
@@ -27,6 +27,7 @@ QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
PATCHES=(
"${FILESDIR}"/${PN}-1.79-mdraid-detection.patch
+ "${FILESDIR}"/${PN}-1.79-handle-multiple-initrd-paths.patch
"${FILESDIR}"/${PN}-1.79-btrfs-subvolume-detection.patch
"${FILESDIR}"/${PN}-1.79-use-fstab-name.patch
"${FILESDIR}"/${PN}-1.79-mounted-boot-partition-fix.patch
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: e1b5c04466dbe144b71f74aee6d93fa752d781d4
Author: Peter Levine gmail com>
AuthorDate: Thu Oct 7 23:54:19 2021 +
Commit: Ben Kohler gentoo org>
CommitDate: Fri Oct 8 11:12:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1b5c044
sys-boot/os-prober: bump live ebuild
Bump ebuild for live testing upstream.
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Peter Levine gmail.com>
Signed-off-by: Ben Kohler gentoo.org>
sys-boot/os-prober/os-prober-.ebuild | 100 +++
1 file changed, 100 insertions(+)
diff --git a/sys-boot/os-prober/os-prober-.ebuild
b/sys-boot/os-prober/os-prober-.ebuild
new file mode 100644
index 000..27278da5f56
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="https://salsa.debian.org/installer-team/os-prober";
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://salsa.debian.org/installer-team/${PN}.git";
+else
+ SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+# grub-mount needed per bug #607518
+RDEPEND="sys-boot/grub:2[mount]"
+
+# bug 594250
+QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.76-exherbo.patch
+ "${FILESDIR}"/${PN}-1.78-btrfsfix.patch
+)
+
+DOC_CONTENTS="
+ If you intend for os-prober to detect versions of Windows installed on
+ NTFS-formatted partitions, your system must be capable of reading the
+ NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g.
+ Also, in a chroot environment, it is necessary to bind mount /run/udev
+ (see https://wiki.gentoo.org/wiki/GRUB2#os-prober_and_UEFI_in_chroot).
+
+ NOTE: Since sys-boot/grub-2.06-rc1, grub-mkconfig disables os-prober by
default.
+ To enable it, add GRUB_DISABLE_OS_PROBER=false to /etc/default/grub.
+"
+
+src_prepare() {
+ default
+ # use default GNU rules
+ rm Makefile || die 'rm Makefile failed'
+}
+
+src_compile() {
+ tc-export CC
+ emake newns
+}
+
+src_install() {
+ dobin os-prober linux-boot-prober
+
+ # Note: as no shared libraries are installed, /usr/lib is correct
+ exeinto /usr/lib/os-prober
+ doexe newns
+
+ insinto /usr/share/os-prober
+ doins common.sh
+
+ keepdir /var/lib/os-prober
+
+ local debarch=${ARCH%-*} dir
+
+ case ${debarch} in
+ amd64) debarch=x86 ;;
+ ppc|ppc64) debarch=powerpc ;;
+ esac
+
+ for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
+ exeinto /usr/lib/${dir}
+ doexe ${dir}/common/*
+ if [[ -d ${dir}/${debarch} ]]; then
+ for exe in ${dir}/${debarch}/*; do
+ [[ ! -d "${exe}" ]] && doexe "${exe}"
+ done
+ fi
+ if [[ -d ${dir}/${debarch}/efi ]]; then
+ exeinto /usr/lib/${dir}/efi
+ doexe ${dir}/${debarch}/efi/*
+ fi
+ done
+
+ if use amd64 || use x86; then
+ exeinto /usr/lib/os-probes/mounted
+ doexe os-probes/mounted/powerpc/20macosx
+ fi
+
+ einstalldocs
+ dodoc debian/changelog
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: a3554ad8880bab8a7d5b2efb2e9d24045dae412a
Author: Peter Levine gmail com>
AuthorDate: Fri Oct 8 00:02:31 2021 +
Commit: Ben Kohler gentoo org>
CommitDate: Fri Oct 8 11:12:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3554ad8
sys-boot/os-prober: change S to "${WORkDIR}"/${PN}
Now for >=sys-boot/os-prober-1.79, S="${WORkDIR}"/${PN}
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Peter Levine gmail.com>
Signed-off-by: Ben Kohler gentoo.org>
sys-boot/os-prober/os-prober-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys-boot/os-prober/os-prober-.ebuild
b/sys-boot/os-prober/os-prober-.ebuild
index 4bd5a3f2192..622282f13d5 100644
--- a/sys-boot/os-prober/os-prober-.ebuild
+++ b/sys-boot/os-prober/os-prober-.ebuild
@@ -13,6 +13,7 @@ if [[ ${PV} == ]]; then
else
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}"/${PN}
fi
LICENSE="GPL-3"
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/, sys-boot/os-prober/files/
commit: 8c241e87363c2550d0d8b629353e9167573ab29c
Author: Peter Levine gmail com>
AuthorDate: Fri Oct 8 01:39:50 2021 +
Commit: Ben Kohler gentoo org>
CommitDate: Fri Oct 8 11:12:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c241e87
sys-boot/os-prober: fix error message from umount delay
Sometimes, umount may take time to complete. Fix corner-case of
"umount: /var/lib/os-prober/mount: target is busy."
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Peter Levine gmail.com>
Signed-off-by: Ben Kohler gentoo.org>
.../os-prober-1.79-fix-busy-umount-message.patch| 21 +
sys-boot/os-prober/os-prober-.ebuild| 1 +
2 files changed, 22 insertions(+)
diff --git
a/sys-boot/os-prober/files/os-prober-1.79-fix-busy-umount-message.patch
b/sys-boot/os-prober/files/os-prober-1.79-fix-busy-umount-message.patch
new file mode 100644
index 000..a9859f5005a
--- /dev/null
+++ b/sys-boot/os-prober/files/os-prober-1.79-fix-busy-umount-message.patch
@@ -0,0 +1,21 @@
+Fixes errors like "umount: /var/lib/os-prober/mount: target is busy."
+which can appear in some corner-cases.
+
+Bug: https://bugzilla.redhat.com/903906
+
+--- a/common.sh
b/common.sh
+@@ -336,3 +336,13 @@ linux_mount_boot () {
+
+ mountboot="$bootpart $mounted"
+ }
++
++umount_exec=$(which umount)
++umount() {
++ if ! $umount_exec $@ 2> /dev/null; then
++ error "umount error, retrying after 1 sec"
++ sleep 1
++ $umount_exec $@
++ fi
++}
++
diff --git a/sys-boot/os-prober/os-prober-.ebuild
b/sys-boot/os-prober/os-prober-.ebuild
index 59539158759..4c80110b806 100644
--- a/sys-boot/os-prober/os-prober-.ebuild
+++ b/sys-boot/os-prober/os-prober-.ebuild
@@ -30,6 +30,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.79-btrfs-subvolume-detection.patch
"${FILESDIR}"/${PN}-1.79-use-fstab-name.patch
"${FILESDIR}"/${PN}-1.79-mounted-boot-partition-fix.patch
+ "${FILESDIR}"/${PN}-1.79-fix-busy-umount-message.patch
)
DOC_CONTENTS="
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/, sys-boot/os-prober/files/
commit: 5023585e4f13834627b835125d7c6f9dee62f21a
Author: Peter Levine gmail com>
AuthorDate: Fri Oct 8 01:31:47 2021 +
Commit: Ben Kohler gentoo org>
CommitDate: Fri Oct 8 11:12:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5023585e
sys-boot/os-prober: return boot instead of root if both are mounted
Fixes a corner-case in which the root partition is returned instead of
the boot partition, when both are mounted.
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Peter Levine gmail.com>
Signed-off-by: Ben Kohler gentoo.org>
.../os-prober-1.79-mounted-boot-partition-fix.patch | 17 +
sys-boot/os-prober/os-prober-.ebuild| 1 +
2 files changed, 18 insertions(+)
diff --git
a/sys-boot/os-prober/files/os-prober-1.79-mounted-boot-partition-fix.patch
b/sys-boot/os-prober/files/os-prober-1.79-mounted-boot-partition-fix.patch
new file mode 100644
index 000..1be8c810ddf
--- /dev/null
+++ b/sys-boot/os-prober/files/os-prober-1.79-mounted-boot-partition-fix.patch
@@ -0,0 +1,17 @@
+Fixes the problem of the root partition being returned instead of the boot
+partition when both are already mounted somewhere.
+
+Bug: https://bugs.debian.org/699840
+ https://bugzilla.redhat.com/906886
+
+--- a/linux-boot-prober
b/linux-boot-prober
+@@ -167,7 +167,7 @@ else
+ bootpart="${mountboot%% *}"
+ bootmounted="${mountboot#* }"
+ else
+- bootpart="$partition"
++ bootpart="$(grep " $mpoint/boot "
"$OS_PROBER_TMP/mounted-map" | head -n1 | cut -d " " -f 4)"
+ bootmounted=0
+ fi
+ for test in /usr/lib/linux-boot-probes/mounted/*; do
diff --git a/sys-boot/os-prober/os-prober-.ebuild
b/sys-boot/os-prober/os-prober-.ebuild
index 392bf080566..59539158759 100644
--- a/sys-boot/os-prober/os-prober-.ebuild
+++ b/sys-boot/os-prober/os-prober-.ebuild
@@ -29,6 +29,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.79-mdraid-detection.patch
"${FILESDIR}"/${PN}-1.79-btrfs-subvolume-detection.patch
"${FILESDIR}"/${PN}-1.79-use-fstab-name.patch
+ "${FILESDIR}"/${PN}-1.79-mounted-boot-partition-fix.patch
)
DOC_CONTENTS="
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/, sys-boot/os-prober/files/
commit: c305cbb85b681269a94554866be0e3738ed4111d
Author: Peter Levine gmail com>
AuthorDate: Fri Oct 8 01:06:15 2021 +
Commit: Ben Kohler gentoo org>
CommitDate: Fri Oct 8 11:12:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c305cbb8
sys-boot/os-prober: fix detection on software-raid devices
Fixes detection of OSes installed on /dev/md* devices (not linked to
/dev/mapper/*).
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Peter Levine gmail.com>
Signed-off-by: Ben Kohler gentoo.org>
.../files/os-prober-1.79-mdraid-detection.patch| 28 ++
sys-boot/os-prober/os-prober-.ebuild | 1 +
2 files changed, 29 insertions(+)
diff --git a/sys-boot/os-prober/files/os-prober-1.79-mdraid-detection.patch
b/sys-boot/os-prober/files/os-prober-1.79-mdraid-detection.patch
new file mode 100644
index 000..15b9de5117a
--- /dev/null
+++ b/sys-boot/os-prober/files/os-prober-1.79-mdraid-detection.patch
@@ -0,0 +1,28 @@
+Fixes OS detection on mdraid devices
+
+Bug: https://bugs.debian.org/648251
+ https://bugzilla.redhat.com/752402
+
+--- a/os-prober
b/os-prober
+@@ -64,6 +64,11 @@ partitions () {
+ exit 0
+ fi
+
++ # Add MD RAID devices
++ if [ -f /proc/mdstat ] ; then
++ awk '/^md/ {printf "/dev/"$1"\n"}' /proc/mdstat
++ fi
++
+ # Also detect OSes on LVM volumes (assumes LVM is active)
+ if type lvs >/dev/null 2>&1; then
+ echo "$(LVM_SUPPRESS_FD_WARNINGS=1 log_output lvs --noheadings
--separator : -o vg_name,lv_name |
+@@ -123,7 +128,7 @@ if [ -f /proc/swaps ]; then
+ fi
+ : >"$OS_PROBER_TMP/raided-map"
+ if [ -f /proc/mdstat ] ; then
+- grep "^md" /proc/mdstat | parse_proc_mdstat
>"$OS_PROBER_TMP/raided-map" || true
++ grep "^md" /proc/mdstat | cut -d: -f2- | parse_proc_mdstat
>"$OS_PROBER_TMP/raided-map" || true
+ fi
+
+ for partition in $(partitions); do
diff --git a/sys-boot/os-prober/os-prober-.ebuild
b/sys-boot/os-prober/os-prober-.ebuild
index 2b0ace332d0..4feb1e2b320 100644
--- a/sys-boot/os-prober/os-prober-.ebuild
+++ b/sys-boot/os-prober/os-prober-.ebuild
@@ -26,6 +26,7 @@ RDEPEND="sys-boot/grub:2[mount]"
QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
PATCHES=(
+ "${FILESDIR}"/${PN}-1.79-mdraid-detection.patch
"${FILESDIR}"/${PN}-1.78-btrfsfix.patch
)
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 3ed65f5245f1e7522c794fae1ef3223fae00bd6a Author: Peter Levine gmail com> AuthorDate: Thu Oct 7 23:56:23 2021 + Commit: Ben Kohler gentoo org> CommitDate: Fri Oct 8 11:12:11 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ed65f52 sys-boot/os-prober: set EAPI=8 for live ebuild Package-Manager: Portage-3.0.26, Repoman-3.0.3 Signed-off-by: Peter Levine gmail.com> Signed-off-by: Ben Kohler gentoo.org> sys-boot/os-prober/os-prober-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-boot/os-prober/os-prober-.ebuild b/sys-boot/os-prober/os-prober-.ebuild index 27278da5f56..4bd5a3f2192 100644 --- a/sys-boot/os-prober/os-prober-.ebuild +++ b/sys-boot/os-prober/os-prober-.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit readme.gentoo-r1 toolchain-funcs DESCRIPTION="Utility to detect other OSs on a set of drives"
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: d8d05b898cb6850303e9e8cc07f06901fe3cb47b
Author: Peter Levine gmail com>
AuthorDate: Fri Oct 8 00:51:11 2021 +
Commit: Ben Kohler gentoo org>
CommitDate: Fri Oct 8 11:12:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8d05b89
sys-boot/os-prober: remove exherbo patch
Fixed with upstream commit 1994dfb18a2a3ce08d1a2041963f250e6987a63a.
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Peter Levine gmail.com>
Signed-off-by: Ben Kohler gentoo.org>
sys-boot/os-prober/os-prober-.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/sys-boot/os-prober/os-prober-.ebuild
b/sys-boot/os-prober/os-prober-.ebuild
index 622282f13d5..2b0ace332d0 100644
--- a/sys-boot/os-prober/os-prober-.ebuild
+++ b/sys-boot/os-prober/os-prober-.ebuild
@@ -26,7 +26,6 @@ RDEPEND="sys-boot/grub:2[mount]"
QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
PATCHES=(
- "${FILESDIR}"/${PN}-1.76-exherbo.patch
"${FILESDIR}"/${PN}-1.78-btrfsfix.patch
)
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 074cfd8e74ec0b4524677cb6c8dbe6cd6c3706fd
Author: Ben Kohler gentoo org>
AuthorDate: Tue Sep 28 12:51:33 2021 +
Commit: Ben Kohler gentoo org>
CommitDate: Tue Sep 28 17:33:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=074cfd8e
sys-boot/os-prober: better homepage
Package-Manager: Portage-3.0.24, Repoman-3.0.3
Signed-off-by: Ben Kohler gentoo.org>
sys-boot/os-prober/os-prober-1.78.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/os-prober/os-prober-1.78.ebuild
b/sys-boot/os-prober/os-prober-1.78.ebuild
index 0ee253a646f..ba56852a216 100644
--- a/sys-boot/os-prober/os-prober-1.78.ebuild
+++ b/sys-boot/os-prober/os-prober-1.78.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit readme.gentoo-r1 toolchain-funcs
DESCRIPTION="Utility to detect other OSs on a set of drives"
-HOMEPAGE="https://packages.debian.org/source/sid/os-prober";
+HOMEPAGE="https://salsa.debian.org/installer-team/os-prober";
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
LICENSE="GPL-3"
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: dabb1f1e8c2631155520e81db5f8508d5d1fdd45
Author: Ben Kohler gentoo org>
AuthorDate: Tue Jul 13 13:35:41 2021 +
Commit: Ben Kohler gentoo org>
CommitDate: Tue Jul 13 13:35:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dabb1f1e
sys-boot/os-prober: drop old
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ben Kohler gentoo.org>
sys-boot/os-prober/Manifest | 1 -
sys-boot/os-prober/os-prober-1.77.ebuild | 86
2 files changed, 87 deletions(-)
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index 99438f1607b..3d27c08a60f 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,2 +1 @@
-DIST os-prober_1.77.tar.xz 26660 BLAKE2B
cff8d96927cf251e9d8ee95561289e9c49a89fbcf9045e7c7169f73b1eeb151797db7b075ebc14dbbdd96996d007b07001e2843cf835defd675f63595614297b
SHA512
4d9c22ccc4d950644a06a17ec4424aca5ff82aeb20052dc389dd451b6b9a1799c5a9438644a29093153730af42066ab78f593f2564314c9adbd43f60e39b
DIST os-prober_1.78.tar.xz 26848 BLAKE2B
eee68ab9be36807d86e8bda831cfd490a01d20d9cc3f84ca50d5e1143e5a2dd66e47d3bdf2b4780cf73cc692f0ffc9497c6cbf13ce7aa0057e996b13d706c8f7
SHA512
7a0425130d17ce8554e7d0797b53e3a984f63a2fdcf8e668c83d357418d8c68259ada25bc350b199adece2e683d9014f234e3a83ce5ab7485be2e69c45874640
diff --git a/sys-boot/os-prober/os-prober-1.77.ebuild
b/sys-boot/os-prober/os-prober-1.77.ebuild
deleted file mode 100644
index 7c4cb9daf1b..000
--- a/sys-boot/os-prober/os-prober-1.77.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Utility to detect other OSs on a set of drives"
-HOMEPAGE="https://packages.debian.org/source/sid/os-prober";
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# grub-mount needed per bug #607518
-RDEPEND="sys-boot/grub:2[mount]"
-DEPEND=""
-
-# bug 594250
-QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.76-exherbo.patch )
-
-DOC_CONTENTS="
- If you intend for os-prober to detect versions of Windows installed on
- NTFS-formatted partitions, your system must be capable of reading the
- NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g
-"
-
-src_prepare() {
- default
- # use default GNU rules
- rm Makefile || die 'rm Makefile failed'
-}
-
-src_compile() {
- tc-export CC
- emake newns
-}
-
-src_install() {
- dobin os-prober linux-boot-prober
-
- # Note: as no shared libraries are installed, /usr/lib is correct
- exeinto /usr/lib/os-prober
- doexe newns
-
- insinto /usr/share/os-prober
- doins common.sh
-
- keepdir /var/lib/os-prober
-
- local debarch=${ARCH%-*} dir
-
- case ${debarch} in
- amd64) debarch=x86 ;;
- ppc|ppc64) debarch=powerpc ;;
- esac
-
- for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
- exeinto /usr/lib/${dir}
- doexe ${dir}/common/*
- if [[ -d ${dir}/${debarch} ]]; then
- doexe ${dir}/${debarch}/*
- fi
- if [[ -d ${dir}/${debarch}/efi ]]; then
- exeinto /usr/lib/${dir}/efi
- doexe ${dir}/${debarch}/efi/*
- fi
- done
-
- if use amd64 || use x86; then
- exeinto /usr/lib/os-probes/mounted
- doexe os-probes/mounted/powerpc/20macosx
- fi
-
- einstalldocs
- dodoc debian/changelog
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 321c760220fd523363eaf8ecdabd113ee8634437
Author: Sam James gentoo org>
AuthorDate: Wed Apr 28 17:02:31 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Apr 28 17:04:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=321c7602
sys-boot/os-prober: Stabilize 1.78 amd64, #786453
Signed-off-by: Sam James gentoo.org>
sys-boot/os-prober/os-prober-1.78.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/os-prober/os-prober-1.78.ebuild
b/sys-boot/os-prober/os-prober-1.78.ebuild
index f5f3e6732f5..0ee253a646f 100644
--- a/sys-boot/os-prober/os-prober-1.78.ebuild
+++ b/sys-boot/os-prober/os-prober-1.78.ebuild
@@ -10,7 +10,7 @@
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
# grub-mount needed per bug #607518
RDEPEND="sys-boot/grub:2[mount]"
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 231c1ee0fbd7f0799f5734f60a552deb1c30f751
Author: Sam James gentoo org>
AuthorDate: Wed Apr 28 02:45:14 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Apr 28 02:47:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=231c1ee0
sys-boot/os-prober: Stabilize 1.78 x86, #786453
Signed-off-by: Sam James gentoo.org>
sys-boot/os-prober/os-prober-1.78.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/os-prober/os-prober-1.78.ebuild
b/sys-boot/os-prober/os-prober-1.78.ebuild
index 93272217dfe..f5f3e6732f5 100644
--- a/sys-boot/os-prober/os-prober-1.78.ebuild
+++ b/sys-boot/os-prober/os-prober-1.78.ebuild
@@ -10,7 +10,7 @@
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
# grub-mount needed per bug #607518
RDEPEND="sys-boot/grub:2[mount]"
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: d8d4347b25d5cdb04014efbecd08cec970ff8abd
Author: Ben Kohler gentoo org>
AuthorDate: Mon Mar 29 12:26:24 2021 +
Commit: Ben Kohler gentoo org>
CommitDate: Mon Mar 29 12:26:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8d4347b
sys-boot/os-prober: fix doexe warning
Thanks to Peter-Levine for fix
Closes: https://github.com/gentoo/gentoo/pull/20109
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Ben Kohler gentoo.org>
sys-boot/os-prober/os-prober-1.78.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sys-boot/os-prober/os-prober-1.78.ebuild
b/sys-boot/os-prober/os-prober-1.78.ebuild
index 6b81b75a08c..93272217dfe 100644
--- a/sys-boot/os-prober/os-prober-1.78.ebuild
+++ b/sys-boot/os-prober/os-prober-1.78.ebuild
@@ -68,7 +68,9 @@ src_install() {
exeinto /usr/lib/${dir}
doexe ${dir}/common/*
if [[ -d ${dir}/${debarch} ]]; then
- doexe ${dir}/${debarch}/*
+ for exe in ${dir}/${debarch}/*; do
+ [[ ! -d "${exe}" ]] && doexe "${exe}"
+ done
fi
if [[ -d ${dir}/${debarch}/efi ]]; then
exeinto /usr/lib/${dir}/efi
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 2fd1a9461fe97e1bf9eeb2993f17d465e89aa64a Author: Ben Kohler gentoo org> AuthorDate: Fri Mar 26 15:56:14 2021 + Commit: Ben Kohler gentoo org> CommitDate: Fri Mar 26 17:44:35 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fd1a946 sys-boot/os-prober: take package w/ proxied co-maintainer Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Ben Kohler gentoo.org> sys-boot/os-prober/metadata.xml | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys-boot/os-prober/metadata.xml b/sys-boot/os-prober/metadata.xml index 6f49eba8f49..e76d1b851a0 100644 --- a/sys-boot/os-prober/metadata.xml +++ b/sys-boot/os-prober/metadata.xml @@ -1,5 +1,12 @@ http://www.gentoo.org/dtd/metadata.dtd";> - + + plevine...@gmail.com + Peter Levine + + + bkoh...@gentoo.org + Ben Kohler +
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/files/, sys-boot/os-prober/
commit: bbf60434d536741d561d99faf2965f7f351d2d75
Author: Peter Levine gmail com>
AuthorDate: Thu Mar 25 02:10:37 2021 +
Commit: Ben Kohler gentoo org>
CommitDate: Fri Mar 26 17:44:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbf60434
sys-boot/os-prober: Fix OS discovery on multiple btrfs subvolumes
Fixes discovery of OSes on multiple subvolumes of the same btrfs
partition, instead of just one that's mounted at root.
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Peter Levine gmail.com>
Signed-off-by: Ben Kohler gentoo.org>
.../os-prober/files/os-prober-1.78-btrfsfix.patch | 474 +
sys-boot/os-prober/os-prober-1.78.ebuild | 5 +-
2 files changed, 478 insertions(+), 1 deletion(-)
diff --git a/sys-boot/os-prober/files/os-prober-1.78-btrfsfix.patch
b/sys-boot/os-prober/files/os-prober-1.78-btrfsfix.patch
new file mode 100644
index 000..5a74285dc73
--- /dev/null
+++ b/sys-boot/os-prober/files/os-prober-1.78-btrfsfix.patch
@@ -0,0 +1,474 @@
+Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=688336
+
+diff --git a/common.sh b/common.sh
+index c2c5f46..8fb3c5f 100644
+--- a/common.sh
b/common.sh
+@@ -155,6 +155,7 @@ parse_proc_mounts () {
+ done
+ }
+
++# add forth parameter to pickup btrfs subvol info
+ parsefstab () {
+ while read -r line; do
+ case "$line" in
+@@ -165,12 +166,22 @@ parsefstab () {
+ set -f
+ set -- $line
+ set +f
+- printf '%s %s %s\n' "$1" "$2" "$3"
++ printf '%s %s %s %s\n' "$1" "$2" "$3" "$4"
+ ;;
+ esac
+ done
+ }
+
++#check_btrfs_mounted $bootsv $bootuuid)
++check_btrfs_mounted () {
++ bootsv="$1"
++ bootuuid="$2"
++ bootdev=$(blkid | grep "$bootuuid" | cut -d ':' -f 1)
++ bindfrom=$(grep " btrfs " /proc/self/mountinfo |
++ grep " $bootdev " | grep " /$bootsv " | cut -d ' ' -f 5)
++ printf "%s" "$bindfrom"
++}
++
+ unescape_mount () {
+ printf %s "$1" | \
+ sed 's/\\011/ /g; s/\\012/\n/g; s/\\040/ /g; s/\\134/\\/g'
+diff --git a/linux-boot-prober b/linux-boot-prober
+index e32dc84..2a60fa2 100755
+--- a/linux-boot-prober
b/linux-boot-prober
+@@ -5,16 +5,143 @@ set -e
+
+ newns "$@"
+ require_tmpdir
++ERR="n"
++
++tmpmnt=/var/lib/os-prober/mount
++if [ ! -d "$tmpmnt" ]; then
++ mkdir "$tmpmnt"
++fi
++
++mounted=
++bootmnt=
++bootsv=
++bootuuid=
+
+ grep "^/dev/" /proc/mounts | parse_proc_mounts >"$OS_PROBER_TMP/mounted-map"
|| true
+
+-partition="$1"
++if [ -z "$1" ]; then
++ ERR=y
++elif [ "$1" = btrfs -a -z "$2" ]; then
++ ERR=y
++elif [ "$1" = btrfs -a -z "$3" ]; then
++ ERR=y
++elif [ "$1" = btrfs ]; then
++ type=btrfs
++ echo "$2" | grep -q "^UUID=" || ERR=y
++ echo "$3" | grep -q "^subvol=" || ERR=y
++ export "$2"
++ export "$3"
++ partition=$(blkid | grep "$UUID" | cut -d ':' -f 1 | tr '\n' ' ' | cut
-d ' ' -f 1)
++ debug "btrfs: partition=$partition, UUID=$UUID, subvol=$subvol"
++else
++ partition="$1"
++ type=other
++fi
+
+-if [ -z "$partition" ]; then
++if [ "x$ERR" != xn ]; then
+ echo "usage: linux-boot-prober partition" >&2
++ echo " linux-boot-prober btrfs UUID=<> subvol=<>" >&2
+ exit 1
+ fi
+
++if [ "$type" = btrfs ]; then
++ # handle all of the btrfs stuff here
++ if [ ! -e "/proc/self/mountinfo" ]; then
++ warn "/proc/self/mountinfo does not exist, exiting"
++ umount "$tmpmnt" 2>/dev/null
++ rmdir "$tmpmnt" 2>/dev/null
++ exit 1
++ fi
++ mpoint=$(grep "btrfs" /proc/self/mountinfo | grep " /$subvol " | grep "
$partition " | cut -d ' ' -f 5)
++ if [ "$mpoint" = "/" ]; then
++ warn "specifying active root not valid, exiting"
++ umount "$tmpmnt" 2>/dev/null
++ rmdir "$tmpmnt" 2>/dev/null
++ exit 1
++ fi
++ if [ "$mpoint" = "$tmpmnt" ]; then
++ warn "btrfs subvol=$subvool, UUID=$UUID, already mounted on
$tmpmnt **ERROR**"
++ umount "$tmpmnt" 2>/dev/null
++ rmdir "$tmpmnt" 2>/dev/null
++ exit 1
++ fi
++ if [ -z "$mpoint" ]; then
++ # mount the btrfs root
++ if ! mount -o subvol=$subvol -t btrfs -U $UUID "$tmpmnt"
2>/dev/null; then
++ warn "error mounting btrfs subvol=$subvol UUID=$UUID"
++ umount "$tmpmnt/boot" 2>/dev/null
++ umount "$tmpmnt" 2>/dev/null
++ rmdir "$tmpmnt" 2>/dev/null
++ exit 1
++ fi
++ else
++ # bind-mount
++ if ! mount -o bind "$mpoint" "$tmpmnt" 2>/dev/null; then
++
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: b01bb5f0a091aca1cbdd16f3a6fc009bcc60ecea
Author: Peter Levine gmail com>
AuthorDate: Thu Mar 25 02:16:09 2021 +
Commit: Ben Kohler gentoo org>
CommitDate: Fri Mar 26 17:44:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b01bb5f0
sys-boot/os-prober: Remove empty optional ebuild variables
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Peter Levine gmail.com>
Signed-off-by: Ben Kohler gentoo.org>
sys-boot/os-prober/os-prober-1.78.ebuild | 2 --
1 file changed, 2 deletions(-)
diff --git a/sys-boot/os-prober/os-prober-1.78.ebuild
b/sys-boot/os-prober/os-prober-1.78.ebuild
index 5c4721ad5c0..6b81b75a08c 100644
--- a/sys-boot/os-prober/os-prober-1.78.ebuild
+++ b/sys-boot/os-prober/os-prober-1.78.ebuild
@@ -11,11 +11,9 @@
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
# grub-mount needed per bug #607518
RDEPEND="sys-boot/grub:2[mount]"
-DEPEND=""
# bug 594250
QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: cafa4c43d97fd9b6b12fa5a25fa82ef2a14304d8
Author: Peter Levine gmail com>
AuthorDate: Thu Mar 25 01:35:28 2021 +
Commit: Ben Kohler gentoo org>
CommitDate: Fri Mar 26 17:44:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cafa4c43
sys-boot/os-prober: Add new elog info
Add a message about the necessity of bind mounting /run/udev. Also,
warn about the defaulting of GRUB_DISABLE_OS_PROBER=true with
grub-mkconfig.
Closes: https://bugs.gentoo.org/761475
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Peter Levine gmail.com>
Signed-off-by: Ben Kohler gentoo.org>
sys-boot/os-prober/os-prober-1.78.ebuild | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/sys-boot/os-prober/os-prober-1.78.ebuild
b/sys-boot/os-prober/os-prober-1.78.ebuild
index 022694360f8..0ed65355dd7 100644
--- a/sys-boot/os-prober/os-prober-1.78.ebuild
+++ b/sys-boot/os-prober/os-prober-1.78.ebuild
@@ -25,7 +25,12 @@ PATCHES=( "${FILESDIR}"/${PN}-1.76-exherbo.patch )
DOC_CONTENTS="
If you intend for os-prober to detect versions of Windows installed on
NTFS-formatted partitions, your system must be capable of reading the
- NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g
+ NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g.
+ Also, in a chroot environment, it is necessary to bind mount /run/udev
+ (see https://wiki.gentoo.org/wiki/GRUB2#os-prober_and_UEFI_in_chroot).
+
+ NOTE: Since sys-boot/grub-2.06-rc1, grub-mkconfig disables os-prober by
default.
+ To enable it, add GRUB_DISABLE_OS_PROBER=false to /etc/default/grub.
"
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: e75b15ef1376599b83dce247eb3419dbb1a0e1b1
Author: Peter Levine gmail com>
AuthorDate: Tue Mar 23 01:16:49 2021 +
Commit: Ben Kohler gentoo org>
CommitDate: Fri Mar 26 17:44:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e75b15ef
sys-boot/os-prober: Bump os-prober-1.78
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Peter Levine gmail.com>
Signed-off-by: Ben Kohler gentoo.org>
sys-boot/os-prober/Manifest | 1 +
sys-boot/os-prober/os-prober-1.78.ebuild | 86
2 files changed, 87 insertions(+)
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index 7773f73ff5d..99438f1607b 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1 +1,2 @@
DIST os-prober_1.77.tar.xz 26660 BLAKE2B
cff8d96927cf251e9d8ee95561289e9c49a89fbcf9045e7c7169f73b1eeb151797db7b075ebc14dbbdd96996d007b07001e2843cf835defd675f63595614297b
SHA512
4d9c22ccc4d950644a06a17ec4424aca5ff82aeb20052dc389dd451b6b9a1799c5a9438644a29093153730af42066ab78f593f2564314c9adbd43f60e39b
+DIST os-prober_1.78.tar.xz 26848 BLAKE2B
eee68ab9be36807d86e8bda831cfd490a01d20d9cc3f84ca50d5e1143e5a2dd66e47d3bdf2b4780cf73cc692f0ffc9497c6cbf13ce7aa0057e996b13d706c8f7
SHA512
7a0425130d17ce8554e7d0797b53e3a984f63a2fdcf8e668c83d357418d8c68259ada25bc350b199adece2e683d9014f234e3a83ce5ab7485be2e69c45874640
diff --git a/sys-boot/os-prober/os-prober-1.78.ebuild
b/sys-boot/os-prober/os-prober-1.78.ebuild
new file mode 100644
index 000..022694360f8
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.78.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="https://packages.debian.org/source/sid/os-prober";
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# grub-mount needed per bug #607518
+RDEPEND="sys-boot/grub:2[mount]"
+DEPEND=""
+
+# bug 594250
+QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.76-exherbo.patch )
+
+DOC_CONTENTS="
+ If you intend for os-prober to detect versions of Windows installed on
+ NTFS-formatted partitions, your system must be capable of reading the
+ NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g
+"
+
+src_prepare() {
+ default
+ # use default GNU rules
+ rm Makefile || die 'rm Makefile failed'
+}
+
+src_compile() {
+ tc-export CC
+ emake newns
+}
+
+src_install() {
+ dobin os-prober linux-boot-prober
+
+ # Note: as no shared libraries are installed, /usr/lib is correct
+ exeinto /usr/lib/os-prober
+ doexe newns
+
+ insinto /usr/share/os-prober
+ doins common.sh
+
+ keepdir /var/lib/os-prober
+
+ local debarch=${ARCH%-*} dir
+
+ case ${debarch} in
+ amd64) debarch=x86 ;;
+ ppc|ppc64) debarch=powerpc ;;
+ esac
+
+ for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
+ exeinto /usr/lib/${dir}
+ doexe ${dir}/common/*
+ if [[ -d ${dir}/${debarch} ]]; then
+ doexe ${dir}/${debarch}/*
+ fi
+ if [[ -d ${dir}/${debarch}/efi ]]; then
+ exeinto /usr/lib/${dir}/efi
+ doexe ${dir}/${debarch}/efi/*
+ fi
+ done
+
+ if use amd64 || use x86; then
+ exeinto /usr/lib/os-probes/mounted
+ doexe os-probes/mounted/powerpc/20macosx
+ fi
+
+ einstalldocs
+ dodoc debian/changelog
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 299fca2cfd55f86812d880e5823d20820fe7
Author: Pacho Ramos gentoo org>
AuthorDate: Thu Dec 5 07:49:58 2019 +
Commit: Pacho Ramos gentoo org>
CommitDate: Thu Dec 5 07:49:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=299fca2c
sys-boot/os-prober: Drop old
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Pacho Ramos gentoo.org>
sys-boot/os-prober/Manifest | 1 -
sys-boot/os-prober/os-prober-1.76-r1.ebuild | 86 -
2 files changed, 87 deletions(-)
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index f611d9e9304..7773f73ff5d 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,2 +1 @@
-DIST os-prober_1.76.tar.xz 26432 BLAKE2B
edefc2be0bb51fff3cc0cd582c46a50871228b2c94312e50320e717b9f218854a0682d0b4e66b4bef6455751fcf016fa290ab03923d89acc6965bbc9efcbaafd
SHA512
64800c99e0959a35edb639f50d2467453c6f6a7d7fa7a8d74141be36e0ade96ce4f874ba6376adfd663585ce9f47b99038dc00c2f722e6236344047567ed14f3
DIST os-prober_1.77.tar.xz 26660 BLAKE2B
cff8d96927cf251e9d8ee95561289e9c49a89fbcf9045e7c7169f73b1eeb151797db7b075ebc14dbbdd96996d007b07001e2843cf835defd675f63595614297b
SHA512
4d9c22ccc4d950644a06a17ec4424aca5ff82aeb20052dc389dd451b6b9a1799c5a9438644a29093153730af42066ab78f593f2564314c9adbd43f60e39b
diff --git a/sys-boot/os-prober/os-prober-1.76-r1.ebuild
b/sys-boot/os-prober/os-prober-1.76-r1.ebuild
deleted file mode 100644
index 8b3109fb18a..000
--- a/sys-boot/os-prober/os-prober-1.76-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Utility to detect other OSs on a set of drives"
-HOMEPAGE="https://packages.debian.org/source/sid/os-prober";
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# grub-mount needed per bug #607518
-RDEPEND="sys-boot/grub:2[mount]"
-DEPEND=""
-
-# bug 594250
-QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.76-exherbo.patch )
-
-DOC_CONTENTS="
- If you intend for os-prober to detect versions of Windows installed on
- NTFS-formatted partitions, your system must be capable of reading the
- NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g
-"
-
-src_prepare() {
- default
- # use default GNU rules
- rm Makefile || die 'rm Makefile failed'
-}
-
-src_compile() {
- tc-export CC
- emake newns
-}
-
-src_install() {
- dobin os-prober linux-boot-prober
-
- # Note: as no shared libraries are installed, /usr/lib is correct
- exeinto /usr/lib/os-prober
- doexe newns
-
- insinto /usr/share/os-prober
- doins common.sh
-
- keepdir /var/lib/os-prober
-
- local debarch=${ARCH%-*} dir
-
- case ${debarch} in
- amd64) debarch=x86 ;;
- ppc|ppc64) debarch=powerpc ;;
- esac
-
- for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
- exeinto /usr/lib/$dir
- doexe $dir/common/*
- if [[ -d $dir/$debarch ]]; then
- doexe $dir/$debarch/*
- fi
- if [[ -d $dir/$debarch/efi ]]; then
- exeinto /usr/lib/$dir/efi
- doexe $dir/$debarch/efi/*
- fi
- done
-
- if use amd64 || use x86; then
- exeinto /usr/lib/os-probes/mounted
- doexe os-probes/mounted/powerpc/20macosx
- fi
-
- einstalldocs
- dodoc debian/changelog
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 18347d498bfc070057a0a798df2b81a7d3d8f38d
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Nov 20 15:40:18 2019 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Nov 20 15:40:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18347d49
sys-boot/os-prober: x86 stable wrt bug #700662
Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-boot/os-prober/os-prober-1.77.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/os-prober/os-prober-1.77.ebuild
b/sys-boot/os-prober/os-prober-1.77.ebuild
index e0c64f85ff7..7c4cb9daf1b 100644
--- a/sys-boot/os-prober/os-prober-1.77.ebuild
+++ b/sys-boot/os-prober/os-prober-1.77.ebuild
@@ -10,7 +10,7 @@
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
# grub-mount needed per bug #607518
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: b9a37b4c496023f41f934f997b4927e975cae5fc
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Nov 20 11:15:02 2019 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Nov 20 11:15:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9a37b4c
sys-boot/os-prober: amd64 stable wrt bug #700662
Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-boot/os-prober/os-prober-1.77.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/os-prober/os-prober-1.77.ebuild
b/sys-boot/os-prober/os-prober-1.77.ebuild
index fb76f8f0130..e0c64f85ff7 100644
--- a/sys-boot/os-prober/os-prober-1.77.ebuild
+++ b/sys-boot/os-prober/os-prober-1.77.ebuild
@@ -10,7 +10,7 @@
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
# grub-mount needed per bug #607518
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: b3281f8073042a5501dbbae2cff059901845c2a9
Author: Lars Wendler gentoo org>
AuthorDate: Thu Jun 27 13:36:10 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu Jun 27 13:36:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3281f80
sys-boot/os-prober: Removed superfluous "local dir" statement
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Lars Wendler gentoo.org>
sys-boot/os-prober/os-prober-1.77.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/sys-boot/os-prober/os-prober-1.77.ebuild
b/sys-boot/os-prober/os-prober-1.77.ebuild
index f3a75923bd7..fb76f8f0130 100644
--- a/sys-boot/os-prober/os-prober-1.77.ebuild
+++ b/sys-boot/os-prober/os-prober-1.77.ebuild
@@ -58,7 +58,6 @@ src_install() {
ppc|ppc64) debarch=powerpc ;;
esac
- local dir
for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
exeinto /usr/lib/${dir}
doexe ${dir}/common/*
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 84d10e06d0a1c78b7f8bf4839f6f18d8b8ec861a
Author: Lars Wendler gentoo org>
AuthorDate: Thu Jun 27 13:33:07 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu Jun 27 13:34:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84d10e06
sys-boot/os-prober: Bump to version 1.77
Thanks-to: paintchip hotmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12175
Closes: https://bugs.gentoo.org/680538
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Lars Wendler gentoo.org>
sys-boot/os-prober/Manifest | 1 +
sys-boot/os-prober/os-prober-1.77.ebuild | 87
2 files changed, 88 insertions(+)
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index 6308e693288..f611d9e9304 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1 +1,2 @@
DIST os-prober_1.76.tar.xz 26432 BLAKE2B
edefc2be0bb51fff3cc0cd582c46a50871228b2c94312e50320e717b9f218854a0682d0b4e66b4bef6455751fcf016fa290ab03923d89acc6965bbc9efcbaafd
SHA512
64800c99e0959a35edb639f50d2467453c6f6a7d7fa7a8d74141be36e0ade96ce4f874ba6376adfd663585ce9f47b99038dc00c2f722e6236344047567ed14f3
+DIST os-prober_1.77.tar.xz 26660 BLAKE2B
cff8d96927cf251e9d8ee95561289e9c49a89fbcf9045e7c7169f73b1eeb151797db7b075ebc14dbbdd96996d007b07001e2843cf835defd675f63595614297b
SHA512
4d9c22ccc4d950644a06a17ec4424aca5ff82aeb20052dc389dd451b6b9a1799c5a9438644a29093153730af42066ab78f593f2564314c9adbd43f60e39b
diff --git a/sys-boot/os-prober/os-prober-1.77.ebuild
b/sys-boot/os-prober/os-prober-1.77.ebuild
new file mode 100644
index 000..f3a75923bd7
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.77.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="https://packages.debian.org/source/sid/os-prober";
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# grub-mount needed per bug #607518
+RDEPEND="sys-boot/grub:2[mount]"
+DEPEND=""
+
+# bug 594250
+QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.76-exherbo.patch )
+
+DOC_CONTENTS="
+ If you intend for os-prober to detect versions of Windows installed on
+ NTFS-formatted partitions, your system must be capable of reading the
+ NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g
+"
+
+src_prepare() {
+ default
+ # use default GNU rules
+ rm Makefile || die 'rm Makefile failed'
+}
+
+src_compile() {
+ tc-export CC
+ emake newns
+}
+
+src_install() {
+ dobin os-prober linux-boot-prober
+
+ # Note: as no shared libraries are installed, /usr/lib is correct
+ exeinto /usr/lib/os-prober
+ doexe newns
+
+ insinto /usr/share/os-prober
+ doins common.sh
+
+ keepdir /var/lib/os-prober
+
+ local debarch=${ARCH%-*} dir
+
+ case ${debarch} in
+ amd64) debarch=x86 ;;
+ ppc|ppc64) debarch=powerpc ;;
+ esac
+
+ local dir
+ for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
+ exeinto /usr/lib/${dir}
+ doexe ${dir}/common/*
+ if [[ -d ${dir}/${debarch} ]]; then
+ doexe ${dir}/${debarch}/*
+ fi
+ if [[ -d ${dir}/${debarch}/efi ]]; then
+ exeinto /usr/lib/${dir}/efi
+ doexe ${dir}/${debarch}/efi/*
+ fi
+ done
+
+ if use amd64 || use x86; then
+ exeinto /usr/lib/os-probes/mounted
+ doexe os-probes/mounted/powerpc/20macosx
+ fi
+
+ einstalldocs
+ dodoc debian/changelog
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: b6bd2eb94922d22ff72f39f448afdcf3d5e4c10b
Author: Lars Wendler gentoo org>
AuthorDate: Mon May 14 10:21:24 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Mon May 14 10:21:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6bd2eb9
sys-boot/os-prober: Removed old.
Package-Manager: Portage-2.3.36, Repoman-2.3.9
sys-boot/os-prober/Manifest | 1 -
sys-boot/os-prober/os-prober-1.71.ebuild | 74
2 files changed, 75 deletions(-)
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index fa180a6f3a2..6308e693288 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,2 +1 @@
-DIST os-prober_1.71.tar.xz 25540 BLAKE2B
8b55b763fd859cc0a62f10d919a7188eeadfedcbfa45738b25f74a1d4651d0e656ecadbc84b8fd7aad97e75179b64a51e58382f2c8c0bb36acf309fea724470c
SHA512
adb7b8cf54c6169510c7ce2bf40e4b659c97eecfb7c1dd149269520ef13cdc2b6587f221fcfcb95c18caf9dba8144bbba561abb158e986ab02f4e0d338317d04
DIST os-prober_1.76.tar.xz 26432 BLAKE2B
edefc2be0bb51fff3cc0cd582c46a50871228b2c94312e50320e717b9f218854a0682d0b4e66b4bef6455751fcf016fa290ab03923d89acc6965bbc9efcbaafd
SHA512
64800c99e0959a35edb639f50d2467453c6f6a7d7fa7a8d74141be36e0ade96ce4f874ba6376adfd663585ce9f47b99038dc00c2f722e6236344047567ed14f3
diff --git a/sys-boot/os-prober/os-prober-1.71.ebuild
b/sys-boot/os-prober/os-prober-1.71.ebuild
deleted file mode 100644
index a5ea7d98061..000
--- a/sys-boot/os-prober/os-prober-1.71.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-#inherit eutils multilib toolchain-funcs
-inherit toolchain-funcs
-
-DESCRIPTION="Utility to detect other OSs on a set of drives"
-HOMEPAGE="https://packages.debian.org/source/sid/os-prober";
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# bug 594250
-QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
-
-src_prepare() {
- # use default GNU rules
- rm Makefile || die 'rm Makefile failed'
-}
-
-src_compile() {
- tc-export CC
- emake newns
-}
-
-src_install() {
- dobin os-prober linux-boot-prober
-
- # Note: as no shared libraries are installed, /usr/lib is correct
- exeinto /usr/lib/os-prober
- doexe newns
-
- insinto /usr/share/os-prober
- doins common.sh
-
- keepdir /var/lib/os-prober
-
- local debarch=${ARCH%-*} dir
-
- case ${debarch} in
- amd64) debarch=x86 ;;
- ppc|ppc64) debarch=powerpc ;;
- esac
-
- for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
- exeinto /usr/lib/$dir
- doexe $dir/common/*
- if [[ -d $dir/$debarch ]]; then
- doexe $dir/$debarch/*
- fi
- if [[ -d $dir/$debarch/efi ]]; then
- exeinto /usr/lib/$dir/efi
- doexe $dir/$debarch/efi/*
- fi
- done
-
- if use amd64 || use x86; then
- exeinto /usr/lib/os-probes/mounted
- doexe os-probes/mounted/powerpc/20macosx
- fi
-
- dodoc README TODO debian/changelog
-}
-
-pkg_postinst() {
- elog "If you intend for os-prober to detect versions of Windows
installed on"
- elog "NTFS-formatted partitions, your system must be capable of reading
the"
- elog "NTFS filesystem. One way to do this is by installing
sys-fs/ntfs3g"
-}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: d9478c134d9986386607049a114896f90b25f7af
Author: Aaron Bauman gentoo org>
AuthorDate: Sun May 13 23:42:22 2018 +
Commit: Aaron Bauman gentoo org>
CommitDate: Sun May 13 23:42:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9478c13
sys-boot/os-prober: amd64 stable wrt bug #655648
Package-Manager: Portage-2.3.36, Repoman-2.3.9
sys-boot/os-prober/os-prober-1.76-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/os-prober/os-prober-1.76-r1.ebuild
b/sys-boot/os-prober/os-prober-1.76-r1.ebuild
index 4ab3c90c759..8b3109fb18a 100644
--- a/sys-boot/os-prober/os-prober-1.76-r1.ebuild
+++ b/sys-boot/os-prober/os-prober-1.76-r1.ebuild
@@ -10,7 +10,7 @@
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE=""
# grub-mount needed per bug #607518
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: a186307176820ae1fa4849263091efc9d5ca9b3d
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sun May 13 22:01:32 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sun May 13 22:06:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1863071
sys-boot/os-prober: x86 stable (bug #655648)
Package-Manager: Portage-2.3.34, Repoman-2.3.9
sys-boot/os-prober/os-prober-1.76-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-boot/os-prober/os-prober-1.76-r1.ebuild
b/sys-boot/os-prober/os-prober-1.76-r1.ebuild
index 1baceb5af89..4ab3c90c759 100644
--- a/sys-boot/os-prober/os-prober-1.76-r1.ebuild
+++ b/sys-boot/os-prober/os-prober-1.76-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE=""
# grub-mount needed per bug #607518
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: ba5d29bac0ba24b76fb9bd4c324ba8f6b9e56ca4
Author: Pacho Ramos gentoo org>
AuthorDate: Tue Dec 26 12:52:51 2017 +
Commit: Pacho Ramos gentoo org>
CommitDate: Tue Dec 26 12:53:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba5d29ba
sys-boot/os-prober: Drop old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sys-boot/os-prober/Manifest | 1 -
sys-boot/os-prober/os-prober-1.74.ebuild | 76
sys-boot/os-prober/os-prober-1.76.ebuild | 74 ---
3 files changed, 151 deletions(-)
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index 800b382987c..fa180a6f3a2 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,3 +1,2 @@
DIST os-prober_1.71.tar.xz 25540 BLAKE2B
8b55b763fd859cc0a62f10d919a7188eeadfedcbfa45738b25f74a1d4651d0e656ecadbc84b8fd7aad97e75179b64a51e58382f2c8c0bb36acf309fea724470c
SHA512
adb7b8cf54c6169510c7ce2bf40e4b659c97eecfb7c1dd149269520ef13cdc2b6587f221fcfcb95c18caf9dba8144bbba561abb158e986ab02f4e0d338317d04
-DIST os-prober_1.74.tar.xz 26692 BLAKE2B
a5bb0e9ac7ced7abac38fef863c7d08d9809894a1073b64f209e77ab9a61c33f97ecfbe87151bc7725a84bb99b44ac209b776be33fcd7c0aaec4f02e8da60d3f
SHA512
5407fb3c782ae0532120995d60cfc307028de9bea52ce5534baaf940a99269b735c1174ef0f7a5316be485a1e8bfd097108c2819eadf00e2e38595bfc2c22245
DIST os-prober_1.76.tar.xz 26432 BLAKE2B
edefc2be0bb51fff3cc0cd582c46a50871228b2c94312e50320e717b9f218854a0682d0b4e66b4bef6455751fcf016fa290ab03923d89acc6965bbc9efcbaafd
SHA512
64800c99e0959a35edb639f50d2467453c6f6a7d7fa7a8d74141be36e0ade96ce4f874ba6376adfd663585ce9f47b99038dc00c2f722e6236344047567ed14f3
diff --git a/sys-boot/os-prober/os-prober-1.74.ebuild
b/sys-boot/os-prober/os-prober-1.74.ebuild
deleted file mode 100644
index 38529501daa..000
--- a/sys-boot/os-prober/os-prober-1.74.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-#inherit eutils multilib toolchain-funcs
-inherit toolchain-funcs
-
-DESCRIPTION="Utility to detect other OSs on a set of drives"
-HOMEPAGE="https://packages.debian.org/source/sid/os-prober";
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-# bug 594250
-QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
-
-src_prepare() {
- # use default GNU rules
- rm Makefile || die 'rm Makefile failed'
-}
-
-src_compile() {
- tc-export CC
- emake newns
-}
-
-src_install() {
- dobin os-prober linux-boot-prober
-
- # Note: as no shared libraries are installed, /usr/lib is correct
- exeinto /usr/lib/os-prober
- doexe newns
-
- insinto /usr/share/os-prober
- doins common.sh
-
- keepdir /var/lib/os-prober
-
- local debarch=${ARCH%-*} dir
-
- case ${debarch} in
- amd64) debarch=x86 ;;
- ppc|ppc64) debarch=powerpc ;;
- esac
-
- for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
- exeinto /usr/lib/$dir
- doexe $dir/common/*
- if [[ -d $dir/$debarch ]]; then
- doexe $dir/$debarch/*
- fi
- if [[ -d $dir/$debarch/efi ]]; then
- exeinto /usr/lib/$dir/efi
- doexe $dir/$debarch/efi/*
- fi
- done
-
- if use amd64 || use x86; then
- exeinto /usr/lib/os-probes/mounted
- doexe os-probes/mounted/powerpc/20macosx
- fi
-
- dodoc README TODO debian/changelog
-}
-
-pkg_postinst() {
- elog "If you intend for os-prober to detect versions of Windows
installed on"
- elog "NTFS-formatted partitions, your system must be capable of reading
the"
- elog "NTFS filesystem. One way to do this is by installing
sys-fs/ntfs3g"
-}
diff --git a/sys-boot/os-prober/os-prober-1.76.ebuild
b/sys-boot/os-prober/os-prober-1.76.ebuild
deleted file mode 100644
index 0fcffc88252..000
--- a/sys-boot/os-prober/os-prober-1.76.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-#inherit eutils multilib toolchain-funcs
-inherit toolchain-funcs
-
-DESCRIPTION="Utility to detect other OSs on a set of drives"
-HOMEPAGE="https://packages.debian.org/source/sid/os-prober";
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# bug 594250
-QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
-
-src_prepare() {
- # use default GNU rules
- rm Makefile || die 'rm Makefile failed'
-}
-
-src_compile() {
- tc-export CC
- emake newns
-}
-
-src_install() {
-
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/, sys-boot/os-prober/files/
commit: de6cdf76e3813b4cf1e916f28c1a8ad2cf9d190e
Author: Pacho Ramos gentoo org>
AuthorDate: Tue Dec 26 12:52:14 2017 +
Commit: Pacho Ramos gentoo org>
CommitDate: Tue Dec 26 12:53:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de6cdf76
sys-boot/os-prober: grub-mount is needed (#607518), support Exherbo (#518658)
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../os-prober/files/os-prober-1.76-exherbo.patch | 26 +++
sys-boot/os-prober/os-prober-1.76-r1.ebuild| 86 ++
2 files changed, 112 insertions(+)
diff --git a/sys-boot/os-prober/files/os-prober-1.76-exherbo.patch
b/sys-boot/os-prober/files/os-prober-1.76-exherbo.patch
new file mode 100644
index 000..6ef83dca223
--- /dev/null
+++ b/sys-boot/os-prober/files/os-prober-1.76-exherbo.patch
@@ -0,0 +1,26 @@
+From 09fefdb360b69c2de03a2f1c881db87f924d3c76 Mon Sep 17 00:00:00 2001
+From: Timo Gurr
+Date: Mon, 20 Feb 2017 17:33:14 +0100
+Subject: [PATCH] Add Exherbo Linux detection
+
+---
+ os-probes/mounted/common/90linux-distro | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/os-probes/mounted/common/90linux-distro
b/os-probes/mounted/common/90linux-distro
+index badfbb1..41a5553 100755
+--- a/os-probes/mounted/common/90linux-distro
b/os-probes/mounted/common/90linux-distro
+@@ -137,6 +137,9 @@ if (ls "$dir"/lib*/ld*.so* && [ -d "$dir/boot" ] || ls
"$dir"/usr/lib*/ld*.so*)
+ elif [ -e "$dir/etc/devuan_version" ]; then
+ short="Devuan"
+ long="$(printf "Devuan GNU/Linux (%s)\n" "$(cat
"$dir/etc/devuan_version")")"
++ elif [ -e "$dir/etc/exherbo-release" ]; then
++ short="Exherbo"
++ long="Exherbo Linux"
+ else
+ short="Linux"
+ long="unknown Linux distribution"
+--
+2.11.1
+
diff --git a/sys-boot/os-prober/os-prober-1.76-r1.ebuild
b/sys-boot/os-prober/os-prober-1.76-r1.ebuild
new file mode 100644
index 000..1baceb5af89
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.76-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="https://packages.debian.org/source/sid/os-prober";
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# grub-mount needed per bug #607518
+RDEPEND="sys-boot/grub:2[mount]"
+DEPEND=""
+
+# bug 594250
+QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.76-exherbo.patch )
+
+DOC_CONTENTS="
+ If you intend for os-prober to detect versions of Windows installed on
+ NTFS-formatted partitions, your system must be capable of reading the
+ NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g
+"
+
+src_prepare() {
+ default
+ # use default GNU rules
+ rm Makefile || die 'rm Makefile failed'
+}
+
+src_compile() {
+ tc-export CC
+ emake newns
+}
+
+src_install() {
+ dobin os-prober linux-boot-prober
+
+ # Note: as no shared libraries are installed, /usr/lib is correct
+ exeinto /usr/lib/os-prober
+ doexe newns
+
+ insinto /usr/share/os-prober
+ doins common.sh
+
+ keepdir /var/lib/os-prober
+
+ local debarch=${ARCH%-*} dir
+
+ case ${debarch} in
+ amd64) debarch=x86 ;;
+ ppc|ppc64) debarch=powerpc ;;
+ esac
+
+ for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
+ exeinto /usr/lib/$dir
+ doexe $dir/common/*
+ if [[ -d $dir/$debarch ]]; then
+ doexe $dir/$debarch/*
+ fi
+ if [[ -d $dir/$debarch/efi ]]; then
+ exeinto /usr/lib/$dir/efi
+ doexe $dir/$debarch/efi/*
+ fi
+ done
+
+ if use amd64 || use x86; then
+ exeinto /usr/lib/os-probes/mounted
+ doexe os-probes/mounted/powerpc/20macosx
+ fi
+
+ einstalldocs
+ dodoc debian/changelog
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: d21105b6a1dcfdaa9c76eaa2696ca1e91c738b98
Author: Jonas Stein gentoo org>
AuthorDate: Sun Oct 29 19:30:31 2017 +
Commit: Jonas Stein gentoo org>
CommitDate: Sun Oct 29 19:30:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d21105b6
sys-boot/os-prober: add https for HOMEPAGE
makes repoman happy now.
Package-Manager: Portage-2.3.13, Repoman-2.3.4
sys-boot/os-prober/os-prober-1.71.ebuild | 2 +-
sys-boot/os-prober/os-prober-1.74.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-boot/os-prober/os-prober-1.71.ebuild
b/sys-boot/os-prober/os-prober-1.71.ebuild
index f6aa7a1d903..a5ea7d98061 100644
--- a/sys-boot/os-prober/os-prober-1.71.ebuild
+++ b/sys-boot/os-prober/os-prober-1.71.ebuild
@@ -7,7 +7,7 @@ EAPI=5
inherit toolchain-funcs
DESCRIPTION="Utility to detect other OSs on a set of drives"
-HOMEPAGE="http://packages.debian.org/source/sid/os-prober";
+HOMEPAGE="https://packages.debian.org/source/sid/os-prober";
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
LICENSE="GPL-3"
diff --git a/sys-boot/os-prober/os-prober-1.74.ebuild
b/sys-boot/os-prober/os-prober-1.74.ebuild
index db333f13929..38529501daa 100644
--- a/sys-boot/os-prober/os-prober-1.74.ebuild
+++ b/sys-boot/os-prober/os-prober-1.74.ebuild
@@ -7,7 +7,7 @@ EAPI=5
inherit toolchain-funcs
DESCRIPTION="Utility to detect other OSs on a set of drives"
-HOMEPAGE="http://packages.debian.org/source/sid/os-prober";
+HOMEPAGE="https://packages.debian.org/source/sid/os-prober";
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
LICENSE="GPL-3"
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 6bf6c83814ebbd814124dfe4991300369a7331d8 Author: Jonas Stein gentoo org> AuthorDate: Sun Oct 29 19:24:38 2017 + Commit: Jonas Stein gentoo org> CommitDate: Sun Oct 29 19:24:38 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bf6c838 sys-boot/os-prober: Removed proxied maintainer Removed proxied maintainer due to inactivity. Closes: https://bugs.gentoo.org/633154 Package-Manager: Portage-2.3.13, Repoman-2.3.4 sys-boot/os-prober/metadata.xml | 9 + 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/sys-boot/os-prober/metadata.xml b/sys-boot/os-prober/metadata.xml index 50b549386cf..6f49eba8f49 100644 --- a/sys-boot/os-prober/metadata.xml +++ b/sys-boot/os-prober/metadata.xml @@ -1,12 +1,5 @@ http://www.gentoo.org/dtd/metadata.dtd";> - - wizzl...@gmail.com - Locke Shinseiko - - - proxy-ma...@gentoo.org - Proxy Maintainers - +
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 5b524e055c0cf9fe3caec20eeff805ffd2fe88db
Author: Manuel Rüger gentoo org>
AuthorDate: Mon Oct 9 18:22:12 2017 +
Commit: Manuel Rüger gentoo org>
CommitDate: Mon Oct 9 18:22:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b524e05
sys-boot/os-prober: Remove old
Package-Manager: Portage-2.3.11, Repoman-2.3.3
sys-boot/os-prober/Manifest | 1 -
sys-boot/os-prober/os-prober-1.73.ebuild | 74
2 files changed, 75 deletions(-)
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index 54ce3c18d68..2d5f83df77a 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,4 +1,3 @@
DIST os-prober_1.71.tar.xz 25540 SHA256
5d6141e02b58e82194422b97d683d61c7ff78175d89c2f055f5d2e7a363bdd20 SHA512
adb7b8cf54c6169510c7ce2bf40e4b659c97eecfb7c1dd149269520ef13cdc2b6587f221fcfcb95c18caf9dba8144bbba561abb158e986ab02f4e0d338317d04
WHIRLPOOL
cb3d8596c1e753fc2d687b30c6bd386d160114524b7b4f2d39dfe208191b231962311103a3106a7ccad8fa05bee132a5faa72265c44c33e22cb3d6090dd1cb04
-DIST os-prober_1.73.tar.xz 26532 SHA256
588395e38e9123f414cc1e7ea2374e4bd133bb7a8d0e0aff18acc8d7f8d23adf SHA512
7db2c276a16fefb53750889c5e784cdfe285b0124e8eb0c5dd92a9ce7addef95ef6e62d6ccd3c66788f6d1c9d029e9e98ae21040d1d84885e756691504e63ea4
WHIRLPOOL
7ed340397ff4075b28d6de5e4de347a2cbfeddaa52f4861dbe96efb7b07dda729c39f926abbdf689899cee157c0b900edcacf10c7340c6118d9b84a431a385a8
DIST os-prober_1.74.tar.xz 26692 SHA256
c8e97ae193783eb8b5f5aba6b6d447b2e3e60696bb71f86ad029c33e14c5a7be SHA512
5407fb3c782ae0532120995d60cfc307028de9bea52ce5534baaf940a99269b735c1174ef0f7a5316be485a1e8bfd097108c2819eadf00e2e38595bfc2c22245
WHIRLPOOL
31d478df1d8cf2fa353620632baf0b668ba3676f9286ec5eb21ed72be3995958f7d0cbbcd8403999dfe2234997f02589bb9b0e67aee919938282feb2c1d1a37d
DIST os-prober_1.76.tar.xz 26432 SHA256
d3a580610e0148ee1fea98de993b27b856870fb0a31e9ce1a33be2654e2c64ed SHA512
64800c99e0959a35edb639f50d2467453c6f6a7d7fa7a8d74141be36e0ade96ce4f874ba6376adfd663585ce9f47b99038dc00c2f722e6236344047567ed14f3
WHIRLPOOL
1000e53e9c8bb508fa73d228b65f2fb97823dd84134f976ba569edefd5727ffdb901b77bc07906a0b2c322d2ed8814957be715537e4b7c0ec9751288ee8f626c
diff --git a/sys-boot/os-prober/os-prober-1.73.ebuild
b/sys-boot/os-prober/os-prober-1.73.ebuild
deleted file mode 100644
index e7bd06a6be4..000
--- a/sys-boot/os-prober/os-prober-1.73.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-#inherit eutils multilib toolchain-funcs
-inherit toolchain-funcs
-
-DESCRIPTION="Utility to detect other OSs on a set of drives"
-HOMEPAGE="http://packages.debian.org/source/sid/os-prober";
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# bug 594250
-QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
-
-src_prepare() {
- # use default GNU rules
- rm Makefile || die 'rm Makefile failed'
-}
-
-src_compile() {
- tc-export CC
- emake newns
-}
-
-src_install() {
- dobin os-prober linux-boot-prober
-
- # Note: as no shared libraries are installed, /usr/lib is correct
- exeinto /usr/lib/os-prober
- doexe newns
-
- insinto /usr/share/os-prober
- doins common.sh
-
- keepdir /var/lib/os-prober
-
- local debarch=${ARCH%-*} dir
-
- case ${debarch} in
- amd64) debarch=x86 ;;
- ppc|ppc64) debarch=powerpc ;;
- esac
-
- for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
- exeinto /usr/lib/$dir
- doexe $dir/common/*
- if [[ -d $dir/$debarch ]]; then
- doexe $dir/$debarch/*
- fi
- if [[ -d $dir/$debarch/efi ]]; then
- exeinto /usr/lib/$dir/efi
- doexe $dir/$debarch/efi/*
- fi
- done
-
- if use amd64 || use x86; then
- exeinto /usr/lib/os-probes/mounted
- doexe os-probes/mounted/powerpc/20macosx
- fi
-
- dodoc README TODO debian/changelog
-}
-
-pkg_postinst() {
- elog "If you intend for os-prober to detect versions of Windows
installed on"
- elog "NTFS-formatted partitions, your system must be capable of reading
the"
- elog "NTFS filesystem. One way to do this is by installing
sys-fs/ntfs3g"
-}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: d1e6a0c08311e86204590525daa211dd4d387089
Author: Manuel Rüger gentoo org>
AuthorDate: Mon Oct 9 18:21:50 2017 +
Commit: Manuel Rüger gentoo org>
CommitDate: Mon Oct 9 18:21:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1e6a0c0
sys-boot/os-prober: Version bump to 1.76
Package-Manager: Portage-2.3.11, Repoman-2.3.3
sys-boot/os-prober/Manifest | 1 +
sys-boot/os-prober/os-prober-1.76.ebuild | 74
2 files changed, 75 insertions(+)
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index ef180e19d9f..54ce3c18d68 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,3 +1,4 @@
DIST os-prober_1.71.tar.xz 25540 SHA256
5d6141e02b58e82194422b97d683d61c7ff78175d89c2f055f5d2e7a363bdd20 SHA512
adb7b8cf54c6169510c7ce2bf40e4b659c97eecfb7c1dd149269520ef13cdc2b6587f221fcfcb95c18caf9dba8144bbba561abb158e986ab02f4e0d338317d04
WHIRLPOOL
cb3d8596c1e753fc2d687b30c6bd386d160114524b7b4f2d39dfe208191b231962311103a3106a7ccad8fa05bee132a5faa72265c44c33e22cb3d6090dd1cb04
DIST os-prober_1.73.tar.xz 26532 SHA256
588395e38e9123f414cc1e7ea2374e4bd133bb7a8d0e0aff18acc8d7f8d23adf SHA512
7db2c276a16fefb53750889c5e784cdfe285b0124e8eb0c5dd92a9ce7addef95ef6e62d6ccd3c66788f6d1c9d029e9e98ae21040d1d84885e756691504e63ea4
WHIRLPOOL
7ed340397ff4075b28d6de5e4de347a2cbfeddaa52f4861dbe96efb7b07dda729c39f926abbdf689899cee157c0b900edcacf10c7340c6118d9b84a431a385a8
DIST os-prober_1.74.tar.xz 26692 SHA256
c8e97ae193783eb8b5f5aba6b6d447b2e3e60696bb71f86ad029c33e14c5a7be SHA512
5407fb3c782ae0532120995d60cfc307028de9bea52ce5534baaf940a99269b735c1174ef0f7a5316be485a1e8bfd097108c2819eadf00e2e38595bfc2c22245
WHIRLPOOL
31d478df1d8cf2fa353620632baf0b668ba3676f9286ec5eb21ed72be3995958f7d0cbbcd8403999dfe2234997f02589bb9b0e67aee919938282feb2c1d1a37d
+DIST os-prober_1.76.tar.xz 26432 SHA256
d3a580610e0148ee1fea98de993b27b856870fb0a31e9ce1a33be2654e2c64ed SHA512
64800c99e0959a35edb639f50d2467453c6f6a7d7fa7a8d74141be36e0ade96ce4f874ba6376adfd663585ce9f47b99038dc00c2f722e6236344047567ed14f3
WHIRLPOOL
1000e53e9c8bb508fa73d228b65f2fb97823dd84134f976ba569edefd5727ffdb901b77bc07906a0b2c322d2ed8814957be715537e4b7c0ec9751288ee8f626c
diff --git a/sys-boot/os-prober/os-prober-1.76.ebuild
b/sys-boot/os-prober/os-prober-1.76.ebuild
new file mode 100644
index 000..0fcffc88252
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.76.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+#inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="https://packages.debian.org/source/sid/os-prober";
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# bug 594250
+QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
+
+src_prepare() {
+ # use default GNU rules
+ rm Makefile || die 'rm Makefile failed'
+}
+
+src_compile() {
+ tc-export CC
+ emake newns
+}
+
+src_install() {
+ dobin os-prober linux-boot-prober
+
+ # Note: as no shared libraries are installed, /usr/lib is correct
+ exeinto /usr/lib/os-prober
+ doexe newns
+
+ insinto /usr/share/os-prober
+ doins common.sh
+
+ keepdir /var/lib/os-prober
+
+ local debarch=${ARCH%-*} dir
+
+ case ${debarch} in
+ amd64) debarch=x86 ;;
+ ppc|ppc64) debarch=powerpc ;;
+ esac
+
+ for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
+ exeinto /usr/lib/$dir
+ doexe $dir/common/*
+ if [[ -d $dir/$debarch ]]; then
+ doexe $dir/$debarch/*
+ fi
+ if [[ -d $dir/$debarch/efi ]]; then
+ exeinto /usr/lib/$dir/efi
+ doexe $dir/$debarch/efi/*
+ fi
+ done
+
+ if use amd64 || use x86; then
+ exeinto /usr/lib/os-probes/mounted
+ doexe os-probes/mounted/powerpc/20macosx
+ fi
+
+ dodoc README TODO debian/changelog
+}
+
+pkg_postinst() {
+ elog "If you intend for os-prober to detect versions of Windows
installed on"
+ elog "NTFS-formatted partitions, your system must be capable of reading
the"
+ elog "NTFS filesystem. One way to do this is by installing
sys-fs/ntfs3g"
+}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: bd62b20a2fc4b8d3b049067bb6347917eaf43aba
Author: Manuel Rüger gentoo org>
AuthorDate: Sun Feb 19 20:12:42 2017 +
Commit: Manuel Rüger gentoo org>
CommitDate: Sun Feb 19 20:12:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd62b20a
sys-boot/os-prober: Version bump to 1.74
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-boot/os-prober/Manifest | 1 +
sys-boot/os-prober/os-prober-1.74.ebuild | 77
2 files changed, 78 insertions(+)
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index 288d5e42ce..ef180e19d9 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,2 +1,3 @@
DIST os-prober_1.71.tar.xz 25540 SHA256
5d6141e02b58e82194422b97d683d61c7ff78175d89c2f055f5d2e7a363bdd20 SHA512
adb7b8cf54c6169510c7ce2bf40e4b659c97eecfb7c1dd149269520ef13cdc2b6587f221fcfcb95c18caf9dba8144bbba561abb158e986ab02f4e0d338317d04
WHIRLPOOL
cb3d8596c1e753fc2d687b30c6bd386d160114524b7b4f2d39dfe208191b231962311103a3106a7ccad8fa05bee132a5faa72265c44c33e22cb3d6090dd1cb04
DIST os-prober_1.73.tar.xz 26532 SHA256
588395e38e9123f414cc1e7ea2374e4bd133bb7a8d0e0aff18acc8d7f8d23adf SHA512
7db2c276a16fefb53750889c5e784cdfe285b0124e8eb0c5dd92a9ce7addef95ef6e62d6ccd3c66788f6d1c9d029e9e98ae21040d1d84885e756691504e63ea4
WHIRLPOOL
7ed340397ff4075b28d6de5e4de347a2cbfeddaa52f4861dbe96efb7b07dda729c39f926abbdf689899cee157c0b900edcacf10c7340c6118d9b84a431a385a8
+DIST os-prober_1.74.tar.xz 26692 SHA256
c8e97ae193783eb8b5f5aba6b6d447b2e3e60696bb71f86ad029c33e14c5a7be SHA512
5407fb3c782ae0532120995d60cfc307028de9bea52ce5534baaf940a99269b735c1174ef0f7a5316be485a1e8bfd097108c2819eadf00e2e38595bfc2c22245
WHIRLPOOL
31d478df1d8cf2fa353620632baf0b668ba3676f9286ec5eb21ed72be3995958f7d0cbbcd8403999dfe2234997f02589bb9b0e67aee919938282feb2c1d1a37d
diff --git a/sys-boot/os-prober/os-prober-1.74.ebuild
b/sys-boot/os-prober/os-prober-1.74.ebuild
new file mode 100644
index 00..d636a50160
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.74.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="http://packages.debian.org/source/sid/os-prober";
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+# bug 594250
+QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
+
+src_prepare() {
+ # use default GNU rules
+ rm Makefile || die 'rm Makefile failed'
+}
+
+src_compile() {
+ tc-export CC
+ emake newns
+}
+
+src_install() {
+ dobin os-prober linux-boot-prober
+
+ # Note: as no shared libraries are installed, /usr/lib is correct
+ exeinto /usr/lib/os-prober
+ doexe newns
+
+ insinto /usr/share/os-prober
+ doins common.sh
+
+ keepdir /var/lib/os-prober
+
+ local debarch=${ARCH%-*} dir
+
+ case ${debarch} in
+ amd64) debarch=x86 ;;
+ ppc|ppc64) debarch=powerpc ;;
+ esac
+
+ for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
+ exeinto /usr/lib/$dir
+ doexe $dir/common/*
+ if [[ -d $dir/$debarch ]]; then
+ doexe $dir/$debarch/*
+ fi
+ if [[ -d $dir/$debarch/efi ]]; then
+ exeinto /usr/lib/$dir/efi
+ doexe $dir/$debarch/efi/*
+ fi
+ done
+
+ if use amd64 || use x86; then
+ exeinto /usr/lib/os-probes/mounted
+ doexe os-probes/mounted/powerpc/20macosx
+ fi
+
+ dodoc README TODO debian/changelog
+}
+
+pkg_postinst() {
+ elog "If you intend for os-prober to detect versions of Windows
installed on"
+ elog "NTFS-formatted partitions, your system must be capable of reading
the"
+ elog "NTFS filesystem. One way to do this is by installing
sys-fs/ntfs3g"
+}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 969f465961e49cdc44d2084da452d456f3f29824
Author: Manuel Rüger gentoo org>
AuthorDate: Sun Jan 22 01:48:32 2017 +
Commit: Manuel Rüger gentoo org>
CommitDate: Sun Jan 22 01:48:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=969f4659
sys-boot/os-prober: Remove old
Package-Manager: portage-2.3.3
sys-boot/os-prober/Manifest | 2 -
sys-boot/os-prober/os-prober-1.65.ebuild | 74
sys-boot/os-prober/os-prober-1.70.ebuild | 72 ---
3 files changed, 148 deletions(-)
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index d0a26f6..92c12aa 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,3 +1 @@
-DIST os-prober_1.65.tar.xz 24712 SHA256
c4a7661a52edae722f7e6bacb3f107cf7086cbe768275fadf5398d04360bfc84 SHA512
64dd9042a26dc859d9186bb48545d85b1a369d00a93b5045c420eac0c4b672ab32cb6028eada5f1cc21c8ab9386c35b8eedb79bc7975faf7b0a7b2841b284f53
WHIRLPOOL
397a92312b018fa08b2e838bc6b85fa4d55502dfb8e8725c79f4a0ae397e3bd258a7bb302f74b2293cd85f4ddabf4cba75ff2b4b57fa9904094c3a50e1ace36e
-DIST os-prober_1.70.tar.xz 25468 SHA256
f95a8998e106578edf105c42c84809c71e413a01370be9bd0b6d238d5b63bf1d SHA512
d060a7fd4e128693b1bb79cff014b4583f56fd0ed4fdd1afd9670623538c03c4e458697c85c753ef4746b1acc5f91e31ef1f0d83fcb696e35ae8355f16edd9a4
WHIRLPOOL
9414e27187223aa6cddf910bcf77f2b677bf1bef0b358b287a59dbbd2acb9a35060163d18c26808a97da061b8d3e77713e283de2d32e23188400fde975c607a7
DIST os-prober_1.71.tar.xz 25540 SHA256
5d6141e02b58e82194422b97d683d61c7ff78175d89c2f055f5d2e7a363bdd20 SHA512
adb7b8cf54c6169510c7ce2bf40e4b659c97eecfb7c1dd149269520ef13cdc2b6587f221fcfcb95c18caf9dba8144bbba561abb158e986ab02f4e0d338317d04
WHIRLPOOL
cb3d8596c1e753fc2d687b30c6bd386d160114524b7b4f2d39dfe208191b231962311103a3106a7ccad8fa05bee132a5faa72265c44c33e22cb3d6090dd1cb04
diff --git a/sys-boot/os-prober/os-prober-1.65.ebuild
b/sys-boot/os-prober/os-prober-1.65.ebuild
deleted file mode 100644
index 094db02..
--- a/sys-boot/os-prober/os-prober-1.65.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#inherit eutils multilib toolchain-funcs
-inherit toolchain-funcs
-
-DESCRIPTION="Utility to detect other OSs on a set of drives"
-HOMEPAGE="http://packages.debian.org/source/sid/os-prober";
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
- # use default GNU rules
- rm Makefile || die 'rm Makefile failed'
-}
-
-src_compile() {
- tc-export CC
- emake newns
-}
-
-src_install() {
- dobin os-prober linux-boot-prober
-
- # Note: as no shared libraries are installed, /usr/lib is correct
- exeinto /usr/lib/os-prober
- doexe newns
-
- insinto /usr/share/os-prober
- doins common.sh
-
- keepdir /var/lib/os-prober
-
- local debarch=${ARCH%-*} dir
-
- case ${debarch} in
- amd64) debarch=x86 ;;
- ppc|ppc64) debarch=powerpc ;;
- esac
-
- for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
- exeinto /usr/lib/$dir
- doexe $dir/common/*
- if [[ -d $dir/$debarch ]]; then
- doexe $dir/$debarch/*
- fi
- if [[ -d $dir/$debarch/efi ]]; then
- exeinto /usr/lib/$dir/efi
- doexe $dir/$debarch/efi/*
- fi
- done
-
- if use amd64 || use x86; then
- exeinto /usr/lib/os-probes/mounted
- doexe os-probes/mounted/powerpc/20macosx
- fi
-
- dodoc README TODO debian/changelog
-}
-
-pkg_postinst() {
- elog "If you intend for os-prober to detect versions of Windows
installed on"
- elog "NTFS-formatted partitions, your system must be capable of reading
the"
- elog "NTFS filesystem. One way to do this is by installing
sys-fs/ntfs3g"
-}
diff --git a/sys-boot/os-prober/os-prober-1.70.ebuild
b/sys-boot/os-prober/os-prober-1.70.ebuild
deleted file mode 100644
index 160c0c4..
--- a/sys-boot/os-prober/os-prober-1.70.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#inherit eutils multilib toolchain-funcs
-inherit toolchain-funcs
-
-DESCRIPTION="Utility to detect other OSs on a set of drives"
-HOMEPAGE="http://packages.debian.org/source/sid/os-prober";
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
- # use default GNU rules
- rm Makefile || die 'rm Makefile failed'
-}
-
-sr
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 27abb828ec5f03a8dd5a1f19f8d77938647ce100
Author: Manuel Rüger gentoo org>
AuthorDate: Sun Jan 22 01:51:32 2017 +
Commit: Manuel Rüger gentoo org>
CommitDate: Sun Jan 22 01:51:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27abb828
sys-boot/os-prober: Version bump to 1.73
Package-Manager: portage-2.3.3
sys-boot/os-prober/Manifest | 1 +
sys-boot/os-prober/os-prober-1.73.ebuild | 75
2 files changed, 76 insertions(+)
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index 92c12aa..288d5e4 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1 +1,2 @@
DIST os-prober_1.71.tar.xz 25540 SHA256
5d6141e02b58e82194422b97d683d61c7ff78175d89c2f055f5d2e7a363bdd20 SHA512
adb7b8cf54c6169510c7ce2bf40e4b659c97eecfb7c1dd149269520ef13cdc2b6587f221fcfcb95c18caf9dba8144bbba561abb158e986ab02f4e0d338317d04
WHIRLPOOL
cb3d8596c1e753fc2d687b30c6bd386d160114524b7b4f2d39dfe208191b231962311103a3106a7ccad8fa05bee132a5faa72265c44c33e22cb3d6090dd1cb04
+DIST os-prober_1.73.tar.xz 26532 SHA256
588395e38e9123f414cc1e7ea2374e4bd133bb7a8d0e0aff18acc8d7f8d23adf SHA512
7db2c276a16fefb53750889c5e784cdfe285b0124e8eb0c5dd92a9ce7addef95ef6e62d6ccd3c66788f6d1c9d029e9e98ae21040d1d84885e756691504e63ea4
WHIRLPOOL
7ed340397ff4075b28d6de5e4de347a2cbfeddaa52f4861dbe96efb7b07dda729c39f926abbdf689899cee157c0b900edcacf10c7340c6118d9b84a431a385a8
diff --git a/sys-boot/os-prober/os-prober-1.73.ebuild
b/sys-boot/os-prober/os-prober-1.73.ebuild
new file mode 100644
index ..f859958
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.73.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="http://packages.debian.org/source/sid/os-prober";
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# bug 594250
+QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
+
+src_prepare() {
+ # use default GNU rules
+ rm Makefile || die 'rm Makefile failed'
+}
+
+src_compile() {
+ tc-export CC
+ emake newns
+}
+
+src_install() {
+ dobin os-prober linux-boot-prober
+
+ # Note: as no shared libraries are installed, /usr/lib is correct
+ exeinto /usr/lib/os-prober
+ doexe newns
+
+ insinto /usr/share/os-prober
+ doins common.sh
+
+ keepdir /var/lib/os-prober
+
+ local debarch=${ARCH%-*} dir
+
+ case ${debarch} in
+ amd64) debarch=x86 ;;
+ ppc|ppc64) debarch=powerpc ;;
+ esac
+
+ for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
+ exeinto /usr/lib/$dir
+ doexe $dir/common/*
+ if [[ -d $dir/$debarch ]]; then
+ doexe $dir/$debarch/*
+ fi
+ if [[ -d $dir/$debarch/efi ]]; then
+ exeinto /usr/lib/$dir/efi
+ doexe $dir/$debarch/efi/*
+ fi
+ done
+
+ if use amd64 || use x86; then
+ exeinto /usr/lib/os-probes/mounted
+ doexe os-probes/mounted/powerpc/20macosx
+ fi
+
+ dodoc README TODO debian/changelog
+}
+
+pkg_postinst() {
+ elog "If you intend for os-prober to detect versions of Windows
installed on"
+ elog "NTFS-formatted partitions, your system must be capable of reading
the"
+ elog "NTFS filesystem. One way to do this is by installing
sys-fs/ntfs3g"
+}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 3245ddfeed69b172734a7e4c6f3faa6ab995a230
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Jan 5 16:57:58 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Jan 5 16:58:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3245ddfe
sys-boot/os-prober: silence invalid multilib-strict warning
Gentoo-bug: 594250
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-boot/os-prober/os-prober-1.71.ebuild | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sys-boot/os-prober/os-prober-1.71.ebuild
b/sys-boot/os-prober/os-prober-1.71.ebuild
index 9defe1b..1a3bc8a 100644
--- a/sys-boot/os-prober/os-prober-1.71.ebuild
+++ b/sys-boot/os-prober/os-prober-1.71.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,6 +16,9 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
+# bug 594250
+QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
+
src_prepare() {
# use default GNU rules
rm Makefile || die 'rm Makefile failed'
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 8837cd937bb69976f18cf9a805248bb175d68fc3
Author: Pacho Ramos gentoo org>
AuthorDate: Sat Dec 31 15:59:27 2016 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sat Dec 31 15:59:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8837cd93
sys-boot/os-prober: amd64/x86 stable, bug #600112
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-boot/os-prober/os-prober-1.71.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/os-prober/os-prober-1.71.ebuild
b/sys-boot/os-prober/os-prober-1.71.ebuild
index 160c0c4..9defe1b 100644
--- a/sys-boot/os-prober/os-prober-1.71.ebuild
+++ b/sys-boot/os-prober/os-prober-1.71.ebuild
@@ -13,7 +13,7 @@
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 8b626374fa4c46a3f6900e1566db72d2fb7ab710
Author: Mike Gilbert gentoo org>
AuthorDate: Tue Nov 1 13:58:23 2016 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Nov 1 13:58:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b626374
sys-boot/os-prober: drop grub2 sed
Package-Manager: portage-2.3.2_p1
sys-boot/os-prober/os-prober-1.65.ebuild | 7 +--
sys-boot/os-prober/os-prober-1.70.ebuild | 7 +--
sys-boot/os-prober/os-prober-1.71.ebuild | 5 -
3 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/sys-boot/os-prober/os-prober-1.65.ebuild
b/sys-boot/os-prober/os-prober-1.65.ebuild
index adebd56..094db02 100644
--- a/sys-boot/os-prober/os-prober-1.65.ebuild
+++ b/sys-boot/os-prober/os-prober-1.65.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -21,11 +21,6 @@ S=${WORKDIR}/${PN}
src_prepare() {
# use default GNU rules
rm Makefile || die 'rm Makefile failed'
- # Fix references to grub-mount
- sed -i -e 's:grub-mount:grub2-mount:g' \
- common.sh \
- linux-boot-probes/common/50mounted-tests \
- os-probes/common/50mounted-tests
}
src_compile() {
diff --git a/sys-boot/os-prober/os-prober-1.70.ebuild
b/sys-boot/os-prober/os-prober-1.70.ebuild
index 35c50c6..160c0c4 100644
--- a/sys-boot/os-prober/os-prober-1.70.ebuild
+++ b/sys-boot/os-prober/os-prober-1.70.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -19,11 +19,6 @@ IUSE=""
src_prepare() {
# use default GNU rules
rm Makefile || die 'rm Makefile failed'
- # Fix references to grub-mount
- sed -i -e 's:grub-mount:grub2-mount:g' \
- common.sh \
- linux-boot-probes/common/50mounted-tests \
- os-probes/common/50mounted-tests || die
}
src_compile() {
diff --git a/sys-boot/os-prober/os-prober-1.71.ebuild
b/sys-boot/os-prober/os-prober-1.71.ebuild
index 83b93c9..160c0c4 100644
--- a/sys-boot/os-prober/os-prober-1.71.ebuild
+++ b/sys-boot/os-prober/os-prober-1.71.ebuild
@@ -19,11 +19,6 @@ IUSE=""
src_prepare() {
# use default GNU rules
rm Makefile || die 'rm Makefile failed'
- # Fix references to grub-mount
- sed -i -e 's:grub-mount:grub2-mount:g' \
- common.sh \
- linux-boot-probes/common/50mounted-tests \
- os-probes/common/50mounted-tests || die
}
src_compile() {
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 301ffd1b27166e0afe46b2be988b1c99439b1c73 Author: Jonathan Callen gentoo org> AuthorDate: Sun May 22 19:02:29 2016 + Commit: Jonathan Callen gentoo org> CommitDate: Sun May 22 19:04:45 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=301ffd1b sys-boot/os-prober: Drop self as maintainer (no longer use) Package-Manager: portage-2.3.0_rc1 sys-boot/os-prober/metadata.xml | 5 - 1 file changed, 5 deletions(-) diff --git a/sys-boot/os-prober/metadata.xml b/sys-boot/os-prober/metadata.xml index b9da535..50b5493 100644 --- a/sys-boot/os-prober/metadata.xml +++ b/sys-boot/os-prober/metadata.xml @@ -5,11 +5,6 @@ wizzl...@gmail.com Locke Shinseiko - - jcal...@gentoo.org - Jonathan Callen - Proxy maintainer (CC bugs) - proxy-ma...@gentoo.org Proxy Maintainers
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 5625f482d04d1e441dbdcfa463bea140e524366e
Author: Manuel Rüger gentoo org>
AuthorDate: Wed Feb 3 00:16:04 2016 +
Commit: Manuel Rüger gentoo org>
CommitDate: Wed Feb 3 00:16:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5625f482
sys-boot/os-prober: Remove old
Package-Manager: portage-2.2.27
sys-boot/os-prober/Manifest | 1 -
sys-boot/os-prober/os-prober-1.68.ebuild | 79
2 files changed, 80 deletions(-)
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index e4b2bd4..d0a26f6 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,4 +1,3 @@
DIST os-prober_1.65.tar.xz 24712 SHA256
c4a7661a52edae722f7e6bacb3f107cf7086cbe768275fadf5398d04360bfc84 SHA512
64dd9042a26dc859d9186bb48545d85b1a369d00a93b5045c420eac0c4b672ab32cb6028eada5f1cc21c8ab9386c35b8eedb79bc7975faf7b0a7b2841b284f53
WHIRLPOOL
397a92312b018fa08b2e838bc6b85fa4d55502dfb8e8725c79f4a0ae397e3bd258a7bb302f74b2293cd85f4ddabf4cba75ff2b4b57fa9904094c3a50e1ace36e
-DIST os-prober_1.68.tar.xz 25336 SHA256
ad0b98c3e59239bff94e8f03bb618c21043c5314a7d00726d53f84add8478804 SHA512
b545cb42eb6e46da051aa7b63ec2cb29549aa197d0e0c361fa5d4a92ae3774c665003b4c1cd4294c9d26a63a71cd50cce75fed3be9d770adffeb0bd0b8cfc79e
WHIRLPOOL
a337446d1e6691d50b749fe3843452389845dbb5de5e06227baebd90b2535aa3111f7373f7c26335feef5637dc84ae5c1f0faa8bcaf97dfa4393129129e8cbf2
DIST os-prober_1.70.tar.xz 25468 SHA256
f95a8998e106578edf105c42c84809c71e413a01370be9bd0b6d238d5b63bf1d SHA512
d060a7fd4e128693b1bb79cff014b4583f56fd0ed4fdd1afd9670623538c03c4e458697c85c753ef4746b1acc5f91e31ef1f0d83fcb696e35ae8355f16edd9a4
WHIRLPOOL
9414e27187223aa6cddf910bcf77f2b677bf1bef0b358b287a59dbbd2acb9a35060163d18c26808a97da061b8d3e77713e283de2d32e23188400fde975c607a7
DIST os-prober_1.71.tar.xz 25540 SHA256
5d6141e02b58e82194422b97d683d61c7ff78175d89c2f055f5d2e7a363bdd20 SHA512
adb7b8cf54c6169510c7ce2bf40e4b659c97eecfb7c1dd149269520ef13cdc2b6587f221fcfcb95c18caf9dba8144bbba561abb158e986ab02f4e0d338317d04
WHIRLPOOL
cb3d8596c1e753fc2d687b30c6bd386d160114524b7b4f2d39dfe208191b231962311103a3106a7ccad8fa05bee132a5faa72265c44c33e22cb3d6090dd1cb04
diff --git a/sys-boot/os-prober/os-prober-1.68.ebuild
b/sys-boot/os-prober/os-prober-1.68.ebuild
deleted file mode 100644
index 1f28f43..000
--- a/sys-boot/os-prober/os-prober-1.68.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#inherit eutils multilib toolchain-funcs
-inherit toolchain-funcs
-
-DESCRIPTION="Utility to detect other OSs on a set of drives"
-HOMEPAGE="http://packages.debian.org/source/sid/os-prober";
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
- # use default GNU rules
- rm Makefile || die 'rm Makefile failed'
- # Fix references to grub-mount
- sed -i -e 's:grub-mount:grub2-mount:g' \
- common.sh \
- linux-boot-probes/common/50mounted-tests \
- os-probes/common/50mounted-tests || die
-}
-
-src_compile() {
- tc-export CC
- emake newns
-}
-
-src_install() {
- dobin os-prober linux-boot-prober
-
- # Note: as no shared libraries are installed, /usr/lib is correct
- exeinto /usr/lib/os-prober
- doexe newns
-
- insinto /usr/share/os-prober
- doins common.sh
-
- keepdir /var/lib/os-prober
-
- local debarch=${ARCH%-*} dir
-
- case ${debarch} in
- amd64) debarch=x86 ;;
- ppc|ppc64) debarch=powerpc ;;
- esac
-
- for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
- exeinto /usr/lib/$dir
- doexe $dir/common/*
- if [[ -d $dir/$debarch ]]; then
- doexe $dir/$debarch/*
- fi
- if [[ -d $dir/$debarch/efi ]]; then
- exeinto /usr/lib/$dir/efi
- doexe $dir/$debarch/efi/*
- fi
- done
-
- if use amd64 || use x86; then
- exeinto /usr/lib/os-probes/mounted
- doexe os-probes/mounted/powerpc/20macosx
- fi
-
- dodoc README TODO debian/changelog
-}
-
-pkg_postinst() {
- elog "If you intend for os-prober to detect versions of Windows
installed on"
- elog "NTFS-formatted partitions, your system must be capable of reading
the"
- elog "NTFS filesystem. One way to do this is by installing
sys-fs/ntfs3g"
-}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 83bf1db55c74f5b3f3b8837d65214abf2fa420f2
Author: Manuel Rüger gentoo org>
AuthorDate: Wed Feb 3 00:15:33 2016 +
Commit: Manuel Rüger gentoo org>
CommitDate: Wed Feb 3 00:15:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83bf1db5
sys-boot/os-prober: Version bump
Package-Manager: portage-2.2.27
sys-boot/os-prober/Manifest | 1 +
sys-boot/os-prober/os-prober-1.71.ebuild | 77
2 files changed, 78 insertions(+)
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index 8ed88c0..e4b2bd4 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,3 +1,4 @@
DIST os-prober_1.65.tar.xz 24712 SHA256
c4a7661a52edae722f7e6bacb3f107cf7086cbe768275fadf5398d04360bfc84 SHA512
64dd9042a26dc859d9186bb48545d85b1a369d00a93b5045c420eac0c4b672ab32cb6028eada5f1cc21c8ab9386c35b8eedb79bc7975faf7b0a7b2841b284f53
WHIRLPOOL
397a92312b018fa08b2e838bc6b85fa4d55502dfb8e8725c79f4a0ae397e3bd258a7bb302f74b2293cd85f4ddabf4cba75ff2b4b57fa9904094c3a50e1ace36e
DIST os-prober_1.68.tar.xz 25336 SHA256
ad0b98c3e59239bff94e8f03bb618c21043c5314a7d00726d53f84add8478804 SHA512
b545cb42eb6e46da051aa7b63ec2cb29549aa197d0e0c361fa5d4a92ae3774c665003b4c1cd4294c9d26a63a71cd50cce75fed3be9d770adffeb0bd0b8cfc79e
WHIRLPOOL
a337446d1e6691d50b749fe3843452389845dbb5de5e06227baebd90b2535aa3111f7373f7c26335feef5637dc84ae5c1f0faa8bcaf97dfa4393129129e8cbf2
DIST os-prober_1.70.tar.xz 25468 SHA256
f95a8998e106578edf105c42c84809c71e413a01370be9bd0b6d238d5b63bf1d SHA512
d060a7fd4e128693b1bb79cff014b4583f56fd0ed4fdd1afd9670623538c03c4e458697c85c753ef4746b1acc5f91e31ef1f0d83fcb696e35ae8355f16edd9a4
WHIRLPOOL
9414e27187223aa6cddf910bcf77f2b677bf1bef0b358b287a59dbbd2acb9a35060163d18c26808a97da061b8d3e77713e283de2d32e23188400fde975c607a7
+DIST os-prober_1.71.tar.xz 25540 SHA256
5d6141e02b58e82194422b97d683d61c7ff78175d89c2f055f5d2e7a363bdd20 SHA512
adb7b8cf54c6169510c7ce2bf40e4b659c97eecfb7c1dd149269520ef13cdc2b6587f221fcfcb95c18caf9dba8144bbba561abb158e986ab02f4e0d338317d04
WHIRLPOOL
cb3d8596c1e753fc2d687b30c6bd386d160114524b7b4f2d39dfe208191b231962311103a3106a7ccad8fa05bee132a5faa72265c44c33e22cb3d6090dd1cb04
diff --git a/sys-boot/os-prober/os-prober-1.71.ebuild
b/sys-boot/os-prober/os-prober-1.71.ebuild
new file mode 100644
index 000..83b93c9
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.71.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="http://packages.debian.org/source/sid/os-prober";
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+ # use default GNU rules
+ rm Makefile || die 'rm Makefile failed'
+ # Fix references to grub-mount
+ sed -i -e 's:grub-mount:grub2-mount:g' \
+ common.sh \
+ linux-boot-probes/common/50mounted-tests \
+ os-probes/common/50mounted-tests || die
+}
+
+src_compile() {
+ tc-export CC
+ emake newns
+}
+
+src_install() {
+ dobin os-prober linux-boot-prober
+
+ # Note: as no shared libraries are installed, /usr/lib is correct
+ exeinto /usr/lib/os-prober
+ doexe newns
+
+ insinto /usr/share/os-prober
+ doins common.sh
+
+ keepdir /var/lib/os-prober
+
+ local debarch=${ARCH%-*} dir
+
+ case ${debarch} in
+ amd64) debarch=x86 ;;
+ ppc|ppc64) debarch=powerpc ;;
+ esac
+
+ for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
+ exeinto /usr/lib/$dir
+ doexe $dir/common/*
+ if [[ -d $dir/$debarch ]]; then
+ doexe $dir/$debarch/*
+ fi
+ if [[ -d $dir/$debarch/efi ]]; then
+ exeinto /usr/lib/$dir/efi
+ doexe $dir/$debarch/efi/*
+ fi
+ done
+
+ if use amd64 || use x86; then
+ exeinto /usr/lib/os-probes/mounted
+ doexe os-probes/mounted/powerpc/20macosx
+ fi
+
+ dodoc README TODO debian/changelog
+}
+
+pkg_postinst() {
+ elog "If you intend for os-prober to detect versions of Windows
installed on"
+ elog "NTFS-formatted partitions, your system must be capable of reading
the"
+ elog "NTFS filesystem. One way to do this is by installing
sys-fs/ntfs3g"
+}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: fcf53ed4c017295808ea28b3adbfbd198d87ba63
Author: Manuel Rüger gentoo org>
AuthorDate: Sat Nov 7 11:40:27 2015 +
Commit: Manuel Rüger gentoo org>
CommitDate: Sat Nov 7 11:40:44 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcf53ed4
sys-boot/os-prober: Remove old
Package-Manager: portage-2.2.24
sys-boot/os-prober/Manifest | 2 -
sys-boot/os-prober/os-prober-1.66.ebuild | 79
sys-boot/os-prober/os-prober-1.67.ebuild | 77 ---
3 files changed, 158 deletions(-)
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index 234f557..8ed88c0 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,5 +1,3 @@
DIST os-prober_1.65.tar.xz 24712 SHA256
c4a7661a52edae722f7e6bacb3f107cf7086cbe768275fadf5398d04360bfc84 SHA512
64dd9042a26dc859d9186bb48545d85b1a369d00a93b5045c420eac0c4b672ab32cb6028eada5f1cc21c8ab9386c35b8eedb79bc7975faf7b0a7b2841b284f53
WHIRLPOOL
397a92312b018fa08b2e838bc6b85fa4d55502dfb8e8725c79f4a0ae397e3bd258a7bb302f74b2293cd85f4ddabf4cba75ff2b4b57fa9904094c3a50e1ace36e
-DIST os-prober_1.66.tar.xz 24904 SHA256
ab66eab63223d651cb6f9221ddffc958521b13edee4996c4fd87f08cb1955057 SHA512
6aaa2787be9ea522ae71b8c65fc04bb05af233c81e2a8cd0c27b79d6f8c697c5585b5f5fce91c67eab3bbc782e29087fb22db2626609702ab272a398e59ce333
WHIRLPOOL
12d058e78ddd168938b0160b8a2348b497d24c17b99a30a34edcd3e663e8c57eded8d85d02d97c85ad936aadce123387c85dd9c3f0510bf200a9fbf632fd95bf
-DIST os-prober_1.67.tar.xz 25092 SHA256
69d5b5f5ab9182025fda9cfd9f09be20f28ed6fe7ea07c26664d5e571ed355aa SHA512
bc05256d9e1ef808ccaf5a95e23a811f3086ad5b54b444b30b9b21e0c56c71f5c4a7dc69b5d2604ec90209f9a0ef1e00286da016f953f430a5c269a6dc75a718
WHIRLPOOL
5b88ed969d64555ee663a19572bfeaff8ecd3ca750765133791fe597f953394630b3a631c49733142775291ad61fedccec0090f26ab3017f0df2607fc49ad6ca
DIST os-prober_1.68.tar.xz 25336 SHA256
ad0b98c3e59239bff94e8f03bb618c21043c5314a7d00726d53f84add8478804 SHA512
b545cb42eb6e46da051aa7b63ec2cb29549aa197d0e0c361fa5d4a92ae3774c665003b4c1cd4294c9d26a63a71cd50cce75fed3be9d770adffeb0bd0b8cfc79e
WHIRLPOOL
a337446d1e6691d50b749fe3843452389845dbb5de5e06227baebd90b2535aa3111f7373f7c26335feef5637dc84ae5c1f0faa8bcaf97dfa4393129129e8cbf2
DIST os-prober_1.70.tar.xz 25468 SHA256
f95a8998e106578edf105c42c84809c71e413a01370be9bd0b6d238d5b63bf1d SHA512
d060a7fd4e128693b1bb79cff014b4583f56fd0ed4fdd1afd9670623538c03c4e458697c85c753ef4746b1acc5f91e31ef1f0d83fcb696e35ae8355f16edd9a4
WHIRLPOOL
9414e27187223aa6cddf910bcf77f2b677bf1bef0b358b287a59dbbd2acb9a35060163d18c26808a97da061b8d3e77713e283de2d32e23188400fde975c607a7
diff --git a/sys-boot/os-prober/os-prober-1.66.ebuild
b/sys-boot/os-prober/os-prober-1.66.ebuild
deleted file mode 100644
index 9e98b17..000
--- a/sys-boot/os-prober/os-prober-1.66.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#inherit eutils multilib toolchain-funcs
-inherit toolchain-funcs
-
-DESCRIPTION="Utility to detect other OSs on a set of drives"
-HOMEPAGE="http://packages.debian.org/source/sid/os-prober";
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
- # use default GNU rules
- rm Makefile || die 'rm Makefile failed'
- # Fix references to grub-mount
- sed -i -e 's:grub-mount:grub2-mount:g' \
- common.sh \
- linux-boot-probes/common/50mounted-tests \
- os-probes/common/50mounted-tests
-}
-
-src_compile() {
- tc-export CC
- emake newns
-}
-
-src_install() {
- dobin os-prober linux-boot-prober
-
- # Note: as no shared libraries are installed, /usr/lib is correct
- exeinto /usr/lib/os-prober
- doexe newns
-
- insinto /usr/share/os-prober
- doins common.sh
-
- keepdir /var/lib/os-prober
-
- local debarch=${ARCH%-*} dir
-
- case ${debarch} in
- amd64) debarch=x86 ;;
- ppc|ppc64) debarch=powerpc ;;
- esac
-
- for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
- exeinto /usr/lib/$dir
- doexe $dir/common/*
- if [[ -d $dir/$debarch ]]; then
- doexe $dir/$debarch/*
- fi
- if [[ -d $dir/$debarch/efi ]]; then
- exeinto /usr/lib/$dir/efi
- doexe $dir/$debarch/efi/*
- fi
- done
-
- if use amd64 || use x86; then
- exeinto /usr/lib/os-probes/mounted
- doexe os-probes/mounted/powerpc/20macosx
- fi
-
- dodoc README TODO debian/changelog
-}
-
-pkg_postinst() {
- elog "If you intend for os-prober to det
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 0cec7803fb50f0a81a0de86808fb4c691daecf0a
Author: Manuel Rüger gentoo org>
AuthorDate: Sat Nov 7 11:40:01 2015 +
Commit: Manuel Rüger gentoo org>
CommitDate: Sat Nov 7 11:40:44 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cec7803
sys-boot/os-prober: Version bump
Package-Manager: portage-2.2.24
sys-boot/os-prober/Manifest | 1 +
sys-boot/os-prober/os-prober-1.70.ebuild | 77
2 files changed, 78 insertions(+)
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index b09ed0e..234f557 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -2,3 +2,4 @@ DIST os-prober_1.65.tar.xz 24712 SHA256
c4a7661a52edae722f7e6bacb3f107cf7086cbe7
DIST os-prober_1.66.tar.xz 24904 SHA256
ab66eab63223d651cb6f9221ddffc958521b13edee4996c4fd87f08cb1955057 SHA512
6aaa2787be9ea522ae71b8c65fc04bb05af233c81e2a8cd0c27b79d6f8c697c5585b5f5fce91c67eab3bbc782e29087fb22db2626609702ab272a398e59ce333
WHIRLPOOL
12d058e78ddd168938b0160b8a2348b497d24c17b99a30a34edcd3e663e8c57eded8d85d02d97c85ad936aadce123387c85dd9c3f0510bf200a9fbf632fd95bf
DIST os-prober_1.67.tar.xz 25092 SHA256
69d5b5f5ab9182025fda9cfd9f09be20f28ed6fe7ea07c26664d5e571ed355aa SHA512
bc05256d9e1ef808ccaf5a95e23a811f3086ad5b54b444b30b9b21e0c56c71f5c4a7dc69b5d2604ec90209f9a0ef1e00286da016f953f430a5c269a6dc75a718
WHIRLPOOL
5b88ed969d64555ee663a19572bfeaff8ecd3ca750765133791fe597f953394630b3a631c49733142775291ad61fedccec0090f26ab3017f0df2607fc49ad6ca
DIST os-prober_1.68.tar.xz 25336 SHA256
ad0b98c3e59239bff94e8f03bb618c21043c5314a7d00726d53f84add8478804 SHA512
b545cb42eb6e46da051aa7b63ec2cb29549aa197d0e0c361fa5d4a92ae3774c665003b4c1cd4294c9d26a63a71cd50cce75fed3be9d770adffeb0bd0b8cfc79e
WHIRLPOOL
a337446d1e6691d50b749fe3843452389845dbb5de5e06227baebd90b2535aa3111f7373f7c26335feef5637dc84ae5c1f0faa8bcaf97dfa4393129129e8cbf2
+DIST os-prober_1.70.tar.xz 25468 SHA256
f95a8998e106578edf105c42c84809c71e413a01370be9bd0b6d238d5b63bf1d SHA512
d060a7fd4e128693b1bb79cff014b4583f56fd0ed4fdd1afd9670623538c03c4e458697c85c753ef4746b1acc5f91e31ef1f0d83fcb696e35ae8355f16edd9a4
WHIRLPOOL
9414e27187223aa6cddf910bcf77f2b677bf1bef0b358b287a59dbbd2acb9a35060163d18c26808a97da061b8d3e77713e283de2d32e23188400fde975c607a7
diff --git a/sys-boot/os-prober/os-prober-1.70.ebuild
b/sys-boot/os-prober/os-prober-1.70.ebuild
new file mode 100644
index 000..35c50c6
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.70.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="http://packages.debian.org/source/sid/os-prober";
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+ # use default GNU rules
+ rm Makefile || die 'rm Makefile failed'
+ # Fix references to grub-mount
+ sed -i -e 's:grub-mount:grub2-mount:g' \
+ common.sh \
+ linux-boot-probes/common/50mounted-tests \
+ os-probes/common/50mounted-tests || die
+}
+
+src_compile() {
+ tc-export CC
+ emake newns
+}
+
+src_install() {
+ dobin os-prober linux-boot-prober
+
+ # Note: as no shared libraries are installed, /usr/lib is correct
+ exeinto /usr/lib/os-prober
+ doexe newns
+
+ insinto /usr/share/os-prober
+ doins common.sh
+
+ keepdir /var/lib/os-prober
+
+ local debarch=${ARCH%-*} dir
+
+ case ${debarch} in
+ amd64) debarch=x86 ;;
+ ppc|ppc64) debarch=powerpc ;;
+ esac
+
+ for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
+ exeinto /usr/lib/$dir
+ doexe $dir/common/*
+ if [[ -d $dir/$debarch ]]; then
+ doexe $dir/$debarch/*
+ fi
+ if [[ -d $dir/$debarch/efi ]]; then
+ exeinto /usr/lib/$dir/efi
+ doexe $dir/$debarch/efi/*
+ fi
+ done
+
+ if use amd64 || use x86; then
+ exeinto /usr/lib/os-probes/mounted
+ doexe os-probes/mounted/powerpc/20macosx
+ fi
+
+ dodoc README TODO debian/changelog
+}
+
+pkg_postinst() {
+ elog "If you intend for os-prober to detect versions of Windows
installed on"
+ elog "NTFS-formatted partitions, your system must be capable of reading
the"
+ elog "NTFS filesystem. One way to do this is by installing
sys-fs/ntfs3g"
+}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: b37795bec4c5f05819669dd0bc1edcabb428a1a6
Author: Manuel Rüger gentoo org>
AuthorDate: Thu Oct 15 20:52:44 2015 +
Commit: Manuel Rüger gentoo org>
CommitDate: Thu Oct 15 20:53:01 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b37795be
sys-boot/os-prober: Version bump
Package-Manager: portage-2.2.23
sys-boot/os-prober/Manifest | 1 +
sys-boot/os-prober/os-prober-1.68.ebuild | 79
2 files changed, 80 insertions(+)
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index 6b16974..b09ed0e 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,3 +1,4 @@
DIST os-prober_1.65.tar.xz 24712 SHA256
c4a7661a52edae722f7e6bacb3f107cf7086cbe768275fadf5398d04360bfc84 SHA512
64dd9042a26dc859d9186bb48545d85b1a369d00a93b5045c420eac0c4b672ab32cb6028eada5f1cc21c8ab9386c35b8eedb79bc7975faf7b0a7b2841b284f53
WHIRLPOOL
397a92312b018fa08b2e838bc6b85fa4d55502dfb8e8725c79f4a0ae397e3bd258a7bb302f74b2293cd85f4ddabf4cba75ff2b4b57fa9904094c3a50e1ace36e
DIST os-prober_1.66.tar.xz 24904 SHA256
ab66eab63223d651cb6f9221ddffc958521b13edee4996c4fd87f08cb1955057 SHA512
6aaa2787be9ea522ae71b8c65fc04bb05af233c81e2a8cd0c27b79d6f8c697c5585b5f5fce91c67eab3bbc782e29087fb22db2626609702ab272a398e59ce333
WHIRLPOOL
12d058e78ddd168938b0160b8a2348b497d24c17b99a30a34edcd3e663e8c57eded8d85d02d97c85ad936aadce123387c85dd9c3f0510bf200a9fbf632fd95bf
DIST os-prober_1.67.tar.xz 25092 SHA256
69d5b5f5ab9182025fda9cfd9f09be20f28ed6fe7ea07c26664d5e571ed355aa SHA512
bc05256d9e1ef808ccaf5a95e23a811f3086ad5b54b444b30b9b21e0c56c71f5c4a7dc69b5d2604ec90209f9a0ef1e00286da016f953f430a5c269a6dc75a718
WHIRLPOOL
5b88ed969d64555ee663a19572bfeaff8ecd3ca750765133791fe597f953394630b3a631c49733142775291ad61fedccec0090f26ab3017f0df2607fc49ad6ca
+DIST os-prober_1.68.tar.xz 25336 SHA256
ad0b98c3e59239bff94e8f03bb618c21043c5314a7d00726d53f84add8478804 SHA512
b545cb42eb6e46da051aa7b63ec2cb29549aa197d0e0c361fa5d4a92ae3774c665003b4c1cd4294c9d26a63a71cd50cce75fed3be9d770adffeb0bd0b8cfc79e
WHIRLPOOL
a337446d1e6691d50b749fe3843452389845dbb5de5e06227baebd90b2535aa3111f7373f7c26335feef5637dc84ae5c1f0faa8bcaf97dfa4393129129e8cbf2
diff --git a/sys-boot/os-prober/os-prober-1.68.ebuild
b/sys-boot/os-prober/os-prober-1.68.ebuild
new file mode 100644
index 000..1f28f43
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.68.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="http://packages.debian.org/source/sid/os-prober";
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+ # use default GNU rules
+ rm Makefile || die 'rm Makefile failed'
+ # Fix references to grub-mount
+ sed -i -e 's:grub-mount:grub2-mount:g' \
+ common.sh \
+ linux-boot-probes/common/50mounted-tests \
+ os-probes/common/50mounted-tests || die
+}
+
+src_compile() {
+ tc-export CC
+ emake newns
+}
+
+src_install() {
+ dobin os-prober linux-boot-prober
+
+ # Note: as no shared libraries are installed, /usr/lib is correct
+ exeinto /usr/lib/os-prober
+ doexe newns
+
+ insinto /usr/share/os-prober
+ doins common.sh
+
+ keepdir /var/lib/os-prober
+
+ local debarch=${ARCH%-*} dir
+
+ case ${debarch} in
+ amd64) debarch=x86 ;;
+ ppc|ppc64) debarch=powerpc ;;
+ esac
+
+ for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
+ exeinto /usr/lib/$dir
+ doexe $dir/common/*
+ if [[ -d $dir/$debarch ]]; then
+ doexe $dir/$debarch/*
+ fi
+ if [[ -d $dir/$debarch/efi ]]; then
+ exeinto /usr/lib/$dir/efi
+ doexe $dir/$debarch/efi/*
+ fi
+ done
+
+ if use amd64 || use x86; then
+ exeinto /usr/lib/os-probes/mounted
+ doexe os-probes/mounted/powerpc/20macosx
+ fi
+
+ dodoc README TODO debian/changelog
+}
+
+pkg_postinst() {
+ elog "If you intend for os-prober to detect versions of Windows
installed on"
+ elog "NTFS-formatted partitions, your system must be capable of reading
the"
+ elog "NTFS filesystem. One way to do this is by installing
sys-fs/ntfs3g"
+}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 49f4489e8ccb7be4d245d8f8a333e6c9df3922d5
Author: Manuel Rüger gentoo org>
AuthorDate: Mon Oct 5 22:25:10 2015 +
Commit: Manuel Rüger gentoo org>
CommitDate: Mon Oct 5 22:25:10 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49f4489e
sys-boot/os-prober: Version bump
Package-Manager: portage-2.2.22
sys-boot/os-prober/Manifest | 1 +
sys-boot/os-prober/os-prober-1.67.ebuild | 77
2 files changed, 78 insertions(+)
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index 2300cc3..6b16974 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,2 +1,3 @@
DIST os-prober_1.65.tar.xz 24712 SHA256
c4a7661a52edae722f7e6bacb3f107cf7086cbe768275fadf5398d04360bfc84 SHA512
64dd9042a26dc859d9186bb48545d85b1a369d00a93b5045c420eac0c4b672ab32cb6028eada5f1cc21c8ab9386c35b8eedb79bc7975faf7b0a7b2841b284f53
WHIRLPOOL
397a92312b018fa08b2e838bc6b85fa4d55502dfb8e8725c79f4a0ae397e3bd258a7bb302f74b2293cd85f4ddabf4cba75ff2b4b57fa9904094c3a50e1ace36e
DIST os-prober_1.66.tar.xz 24904 SHA256
ab66eab63223d651cb6f9221ddffc958521b13edee4996c4fd87f08cb1955057 SHA512
6aaa2787be9ea522ae71b8c65fc04bb05af233c81e2a8cd0c27b79d6f8c697c5585b5f5fce91c67eab3bbc782e29087fb22db2626609702ab272a398e59ce333
WHIRLPOOL
12d058e78ddd168938b0160b8a2348b497d24c17b99a30a34edcd3e663e8c57eded8d85d02d97c85ad936aadce123387c85dd9c3f0510bf200a9fbf632fd95bf
+DIST os-prober_1.67.tar.xz 25092 SHA256
69d5b5f5ab9182025fda9cfd9f09be20f28ed6fe7ea07c26664d5e571ed355aa SHA512
bc05256d9e1ef808ccaf5a95e23a811f3086ad5b54b444b30b9b21e0c56c71f5c4a7dc69b5d2604ec90209f9a0ef1e00286da016f953f430a5c269a6dc75a718
WHIRLPOOL
5b88ed969d64555ee663a19572bfeaff8ecd3ca750765133791fe597f953394630b3a631c49733142775291ad61fedccec0090f26ab3017f0df2607fc49ad6ca
diff --git a/sys-boot/os-prober/os-prober-1.67.ebuild
b/sys-boot/os-prober/os-prober-1.67.ebuild
new file mode 100644
index 000..1163bc0
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.67.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="http://packages.debian.org/source/sid/os-prober";
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+ # use default GNU rules
+ rm Makefile || die 'rm Makefile failed'
+ # Fix references to grub-mount
+ sed -i -e 's:grub-mount:grub2-mount:g' \
+ common.sh \
+ linux-boot-probes/common/50mounted-tests \
+ os-probes/common/50mounted-tests
+}
+
+src_compile() {
+ tc-export CC
+ emake newns
+}
+
+src_install() {
+ dobin os-prober linux-boot-prober
+
+ # Note: as no shared libraries are installed, /usr/lib is correct
+ exeinto /usr/lib/os-prober
+ doexe newns
+
+ insinto /usr/share/os-prober
+ doins common.sh
+
+ keepdir /var/lib/os-prober
+
+ local debarch=${ARCH%-*} dir
+
+ case ${debarch} in
+ amd64) debarch=x86 ;;
+ ppc|ppc64) debarch=powerpc ;;
+ esac
+
+ for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
+ exeinto /usr/lib/$dir
+ doexe $dir/common/*
+ if [[ -d $dir/$debarch ]]; then
+ doexe $dir/$debarch/*
+ fi
+ if [[ -d $dir/$debarch/efi ]]; then
+ exeinto /usr/lib/$dir/efi
+ doexe $dir/$debarch/efi/*
+ fi
+ done
+
+ if use amd64 || use x86; then
+ exeinto /usr/lib/os-probes/mounted
+ doexe os-probes/mounted/powerpc/20macosx
+ fi
+
+ dodoc README TODO debian/changelog
+}
+
+pkg_postinst() {
+ elog "If you intend for os-prober to detect versions of Windows
installed on"
+ elog "NTFS-formatted partitions, your system must be capable of reading
the"
+ elog "NTFS filesystem. One way to do this is by installing
sys-fs/ntfs3g"
+}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 935b12970870721178d8e1501c0657d5f968f635
Author: Manuel Rüger gentoo org>
AuthorDate: Mon Aug 31 22:54:38 2015 +
Commit: Manuel Rüger gentoo org>
CommitDate: Mon Aug 31 22:54:38 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=935b1297
sys-boot/os-prober: Remove old
Package-Manager: portage-2.2.20.1
sys-boot/os-prober/Manifest | 3 --
sys-boot/os-prober/os-prober-1.53.ebuild| 68 -
sys-boot/os-prober/os-prober-1.57-r1.ebuild | 73 ---
sys-boot/os-prober/os-prober-1.62.ebuild| 77 -
4 files changed, 221 deletions(-)
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index 8f23d4a..2300cc3 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,5 +1,2 @@
-DIST os-prober_1.53.tar.gz 26132 SHA256
58c47274b8e531fdc8b525fa5903885b92dbc3ee39bf13dd87e40336703a58c2 SHA512
4e983d6774cb85df9bec1e8e7ca53d9eec6605bf7308b141d1ee1f118b11534e440a19c0aae17c38f717f433c1ef853ad5879feac1ba4ee10774b3f85bb544ad
WHIRLPOOL
b555c053fd0d2b934c3e894971744f0a11298695730d8f5b4b344ad175938c8f4e877da20031d6c89ae6a286894f52d18b64b6a8f63136814019b73754298def
-DIST os-prober_1.57.tar.gz 26717 SHA256
d63c6cbb825a7e411aac5e4805edc6db2fbf77a59282b71c10bd29723b8d860c SHA512
b5c2af89e3a69688d3585ea52fd57e48fe85844a9ad5372735f57b9a780027e2f96cc86b1307be7e24b9e141ecea3d4c26316c0cc043eb7a97d24ee46bb07665
WHIRLPOOL
918015a67a3b6530788c093e866cfaa0ae0cd717f869677270b6c6f401d3c891378312f58c9e5f3ec9c22b566f09c33eeb3b0e71839b8a0ca47f530f900c974c
-DIST os-prober_1.62.tar.gz 28592 SHA256
5f25decfef22318c4c705594c9c2049e8d1e662fc8817a4a8e5b114cd26ee1c1 SHA512
6d888de867b5420767491ba66e3ebc0796320bfea5c7efc9a1eabf9bb8290b25e5292fc9b22ffc24101a9faf0e846c85fb1ba73fa1ec44a2c0c0c198c89ea49a
WHIRLPOOL
e98b54c769fa9a199b1f64b37ccca801499ed3e6e0dbe1189a63220cbbfdca1b1e8411a8d4b4cb6a15b48a83cde39c887288d2f40c3b69d276ddfdaf4e178b96
DIST os-prober_1.65.tar.xz 24712 SHA256
c4a7661a52edae722f7e6bacb3f107cf7086cbe768275fadf5398d04360bfc84 SHA512
64dd9042a26dc859d9186bb48545d85b1a369d00a93b5045c420eac0c4b672ab32cb6028eada5f1cc21c8ab9386c35b8eedb79bc7975faf7b0a7b2841b284f53
WHIRLPOOL
397a92312b018fa08b2e838bc6b85fa4d55502dfb8e8725c79f4a0ae397e3bd258a7bb302f74b2293cd85f4ddabf4cba75ff2b4b57fa9904094c3a50e1ace36e
DIST os-prober_1.66.tar.xz 24904 SHA256
ab66eab63223d651cb6f9221ddffc958521b13edee4996c4fd87f08cb1955057 SHA512
6aaa2787be9ea522ae71b8c65fc04bb05af233c81e2a8cd0c27b79d6f8c697c5585b5f5fce91c67eab3bbc782e29087fb22db2626609702ab272a398e59ce333
WHIRLPOOL
12d058e78ddd168938b0160b8a2348b497d24c17b99a30a34edcd3e663e8c57eded8d85d02d97c85ad936aadce123387c85dd9c3f0510bf200a9fbf632fd95bf
diff --git a/sys-boot/os-prober/os-prober-1.53.ebuild
b/sys-boot/os-prober/os-prober-1.53.ebuild
deleted file mode 100644
index fd9e50a..000
--- a/sys-boot/os-prober/os-prober-1.53.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Utility to detect other OSs on a set of drives"
-HOMEPAGE="http://packages.debian.org/source/sid/os-prober";
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-src_prepare() {
- find "${S}" -type f -exec sed -i -e "s:/usr/lib/:/usr/libexec/:g" {} +
|| die
-
- # use default GNU rules
- rm Makefile
-}
-
-src_compile() {
- tc-export CC
- emake newns
-}
-
-src_install() {
- dobin os-prober linux-boot-prober
-
- exeinto /usr/libexec/os-prober
- doexe newns
-
- insinto /usr/share/os-prober
- doins common.sh
-
- keepdir /var/lib/os-prober
-
- local debarch=${ARCH%-*} dir
-
- case ${debarch} in
- amd64) debarch=x86 ;;
- ppc|ppc64) debarch=powerpc ;;
- esac
-
- for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
- exeinto /usr/libexec/$dir
- doexe $dir/common/*
- if [[ -d $dir/$debarch ]]; then
- doexe $dir/$debarch/*
- fi
- done
-
- if use amd64 || use x86; then
- exeinto /usr/libexec/os-probes/mounted
- doexe os-probes/mounted/powerpc/20macosx
- fi
-
- dodoc README TODO debian/changelog
-}
-
-pkg_postinst() {
- elog "If you intend for os-prober to detect versions of Windows
installed on"
- elog "NTFS-formatted partitions, your system must be capable of reading
the"
- elog "NTFS filesystem. One way to do this is by installing
sys-fs/ntfs3g"
-}
diff --git a/sys-boot/os-prober/os-prober-1.57-r1.ebuild
b/sys-boot/os-prober/os-prober-1.57-r1.ebuild
deleted file mode 100644
index 4a0b4a7..000
-
[gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/
commit: 8d93d4a2f2ef8b9010402b8742d3cdb58968b9b4
Author: Manuel Rüger gentoo org>
AuthorDate: Mon Aug 31 22:53:54 2015 +
Commit: Manuel Rüger gentoo org>
CommitDate: Mon Aug 31 22:53:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d93d4a2
sys-boot/os-prober: Version bump
Package-Manager: portage-2.2.20.1
sys-boot/os-prober/Manifest | 1 +
sys-boot/os-prober/os-prober-1.66.ebuild | 79
2 files changed, 80 insertions(+)
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index a4a0a46..8f23d4a 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -2,3 +2,4 @@ DIST os-prober_1.53.tar.gz 26132 SHA256
58c47274b8e531fdc8b525fa5903885b92dbc3ee
DIST os-prober_1.57.tar.gz 26717 SHA256
d63c6cbb825a7e411aac5e4805edc6db2fbf77a59282b71c10bd29723b8d860c SHA512
b5c2af89e3a69688d3585ea52fd57e48fe85844a9ad5372735f57b9a780027e2f96cc86b1307be7e24b9e141ecea3d4c26316c0cc043eb7a97d24ee46bb07665
WHIRLPOOL
918015a67a3b6530788c093e866cfaa0ae0cd717f869677270b6c6f401d3c891378312f58c9e5f3ec9c22b566f09c33eeb3b0e71839b8a0ca47f530f900c974c
DIST os-prober_1.62.tar.gz 28592 SHA256
5f25decfef22318c4c705594c9c2049e8d1e662fc8817a4a8e5b114cd26ee1c1 SHA512
6d888de867b5420767491ba66e3ebc0796320bfea5c7efc9a1eabf9bb8290b25e5292fc9b22ffc24101a9faf0e846c85fb1ba73fa1ec44a2c0c0c198c89ea49a
WHIRLPOOL
e98b54c769fa9a199b1f64b37ccca801499ed3e6e0dbe1189a63220cbbfdca1b1e8411a8d4b4cb6a15b48a83cde39c887288d2f40c3b69d276ddfdaf4e178b96
DIST os-prober_1.65.tar.xz 24712 SHA256
c4a7661a52edae722f7e6bacb3f107cf7086cbe768275fadf5398d04360bfc84 SHA512
64dd9042a26dc859d9186bb48545d85b1a369d00a93b5045c420eac0c4b672ab32cb6028eada5f1cc21c8ab9386c35b8eedb79bc7975faf7b0a7b2841b284f53
WHIRLPOOL
397a92312b018fa08b2e838bc6b85fa4d55502dfb8e8725c79f4a0ae397e3bd258a7bb302f74b2293cd85f4ddabf4cba75ff2b4b57fa9904094c3a50e1ace36e
+DIST os-prober_1.66.tar.xz 24904 SHA256
ab66eab63223d651cb6f9221ddffc958521b13edee4996c4fd87f08cb1955057 SHA512
6aaa2787be9ea522ae71b8c65fc04bb05af233c81e2a8cd0c27b79d6f8c697c5585b5f5fce91c67eab3bbc782e29087fb22db2626609702ab272a398e59ce333
WHIRLPOOL
12d058e78ddd168938b0160b8a2348b497d24c17b99a30a34edcd3e663e8c57eded8d85d02d97c85ad936aadce123387c85dd9c3f0510bf200a9fbf632fd95bf
diff --git a/sys-boot/os-prober/os-prober-1.66.ebuild
b/sys-boot/os-prober/os-prober-1.66.ebuild
new file mode 100644
index 000..9e98b17
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.66.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="http://packages.debian.org/source/sid/os-prober";
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+ # use default GNU rules
+ rm Makefile || die 'rm Makefile failed'
+ # Fix references to grub-mount
+ sed -i -e 's:grub-mount:grub2-mount:g' \
+ common.sh \
+ linux-boot-probes/common/50mounted-tests \
+ os-probes/common/50mounted-tests
+}
+
+src_compile() {
+ tc-export CC
+ emake newns
+}
+
+src_install() {
+ dobin os-prober linux-boot-prober
+
+ # Note: as no shared libraries are installed, /usr/lib is correct
+ exeinto /usr/lib/os-prober
+ doexe newns
+
+ insinto /usr/share/os-prober
+ doins common.sh
+
+ keepdir /var/lib/os-prober
+
+ local debarch=${ARCH%-*} dir
+
+ case ${debarch} in
+ amd64) debarch=x86 ;;
+ ppc|ppc64) debarch=powerpc ;;
+ esac
+
+ for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
+ exeinto /usr/lib/$dir
+ doexe $dir/common/*
+ if [[ -d $dir/$debarch ]]; then
+ doexe $dir/$debarch/*
+ fi
+ if [[ -d $dir/$debarch/efi ]]; then
+ exeinto /usr/lib/$dir/efi
+ doexe $dir/$debarch/efi/*
+ fi
+ done
+
+ if use amd64 || use x86; then
+ exeinto /usr/lib/os-probes/mounted
+ doexe os-probes/mounted/powerpc/20macosx
+ fi
+
+ dodoc README TODO debian/changelog
+}
+
+pkg_postinst() {
+ elog "If you intend for os-prober to detect versions of Windows
installed on"
+ elog "NTFS-formatted partitions, your system must be capable of reading
the"
+ elog "NTFS filesystem. One way to do this is by installing
sys-fs/ntfs3g"
+}
