From 236e75597883501f8700d9ba1a5c8276f578a17f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 22 May 2024 00:06:25 +0100 Subject: gentoo auto-resync : 22:05:2024 - 00:06:25 --- sys-boot/os-prober/Manifest | 2 + .../os-prober-1.81-boot-detected-twice-v3.patch | 57 ++++++++++++ sys-boot/os-prober/os-prober-1.81-r3.ebuild | 103 +++++++++++++++++++++ 3 files changed, 162 insertions(+) create mode 100644 sys-boot/os-prober/files/os-prober-1.81-boot-detected-twice-v3.patch create mode 100644 sys-boot/os-prober/os-prober-1.81-r3.ebuild (limited to 'sys-boot/os-prober') diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest index 4c9ca9e67680..687d3575e10c 100644 --- a/sys-boot/os-prober/Manifest +++ b/sys-boot/os-prober/Manifest @@ -5,12 +5,14 @@ AUX os-prober-1.79-mdraid-detection.patch 848 BLAKE2B 11ec43662f174d7f12f09b9b46 AUX os-prober-1.79-mounted-boot-partition-fix.patch 555 BLAKE2B 9b98506f986ceb509271a8a1ce0cc357fb25402ec1059d16411c79e96c727ef40182b5d9f362f16ae4ddab95a45155380cc5742ad1f15ac2cd39fdf273fc9a90 SHA512 fa66356859001d15823c3dbe8143e905e25ee937c236c787965b2a9a50493b55006e0fc9190b076fe106f942ea6074ef7556a443a237d0108b6b936106186061 AUX os-prober-1.79-use-fstab-name.patch 1101 BLAKE2B 37353efa899fd72e68d297325218be5a81abc2eee50bda5607e87c0eb799924fff0f510b4f13c681213e5e4be864a62fec9d5c98e539a61e9cd4036315eeabc5 SHA512 25236c935559398a4c37cdec04c358787f6178a016a6d0d4780c7dcd9eb7e18f308f4a89a1ddbb37d6c7dd17d334d879961029afb4463cef5e9029eab58fdc5c AUX os-prober-1.81-boot-detected-twice-v2.patch 1704 BLAKE2B 541a69bee8a147fc854c1fc9ec65f36dd25ff22a795da0b71b9d4a7b9432016875a8f33e62fbc6ad6a72803ad4b3b973cc141e31fcc0facecf1d163a9443c697 SHA512 5306db3ca7c40cf8aac4195f2a6f6363f462e1465ad6e00d36f6bbc2f665f983f33a62c4e52200eb0143df4bf0bec4b471694c8b5f326cd594f12826a99a77dc +AUX os-prober-1.81-boot-detected-twice-v3.patch 1705 BLAKE2B ca6b91a507f344ca2374b0bd9dd7b95e8cb472662f2391b035adc118754ae1fa24afad08da5026f1764df66966efc7ff4b3e8d6aa6ca9d00286dc033436135fa SHA512 15ed626cbc1138876c1cedd84d5fc2c846f0d10720f723a6236811e0efb5acd1e57e98bfd3b9a992392c5df3b798dea8efa547a359b66355795c9c42930b1b36 AUX os-prober-1.81-boot-detected-twice.patch 1616 BLAKE2B 9c5b30195733468e4160783cd2d11b61f5c75e07efe10113d71ca4c714a5ba6573de271b5ec34e080b4ca82b09eef60f42352c47dbc5f553419cf80687ed6c96 SHA512 0e7a403d6d2d820fb9567ec54f965b036657b6f96916417955098a5fa8ac5893372896ffd868967fb7cb0df6708fc4987fbcc0e307579598f3f6980c9ddd4e49 DIST os-prober_1.80.tar.xz 27400 BLAKE2B 56883c7d3f4c5dde2904cffc77fdf6a2c1caf230f9e84197e8d976e446815838448bb42afd18d4c9526efac9907db3d2e77c6f54889011d2d03d284a44ff4cbd SHA512 51b4fefb784d5ecf34f5148157ef233e2979c4a679a54600144be473bb6ccaf263c9121701a1ecc7523c7e3bfc439a4e3a92a5eb92431ead99cbe666b0f0e6f5 DIST os-prober_1.81.tar.xz 27448 BLAKE2B 0159870612d265c5e610e093a8839129aa9dc111a6f3abee65a6044b4c997ba65a69f70deca246bde53c1cf5314812312178e82c0893093d9f23ced3b0176f9d SHA512 ffb0e618f9e58a7a8e4a265d253bad4e168c220697216684acb38dbfa20680e552eb7c5f3d2186cd750c61a8929bf152527aa85c39318ed8b025a4ffffadde50 EBUILD os-prober-1.80.ebuild 2458 BLAKE2B 813912653a741bf02a87c1922f01a294c93928b413f1d9e9d669e8e2996d7de606734a40e36a1b322c92e72ef1bfaacb68ceb20b75beed0bd41bc80b3856e60b SHA512 cb98b863f1098efcbe9dfd69d3facd732367e5571cbeb4eeb58e453e3e5086ff1d4534e94668535f80673c22ceef7351c065c3477206facd2df929eb1296b9b4 EBUILD os-prober-1.81-r1.ebuild 2512 BLAKE2B b9bbb96326a6554602ae82d2d75aef68d5163b737259de1acdc998c4db4f48b1aa774b8390428b70f8f0882303520ba698a0ddec7bb8ef45157384b06be441c4 SHA512 71ead3ed65967614fbcd44716a9c8d29b4c8514e8e9a6cc9cdc43ef8d82288eb88af57d35487eaa88a62775a91a384f4b0b86223ea4a744ba837ae821c712ed4 EBUILD os-prober-1.81-r2.ebuild 2513 BLAKE2B fdbddc23dd43aedaa0c941cbe4e538997e660738d0fe36b396604a153514f5cc615769f950179d99c3fa8725b1312261ef8caabb687799837600b7d037fd48b7 SHA512 af09fb84b12ea1891319674271f5cfeb50ea7621bec34416c9dca7d6b89bab00bbb169f0ebed78d4fe46c905e29e424f5d33c8105d3f75e4d3c20458cb26656a +EBUILD os-prober-1.81-r3.ebuild 2515 BLAKE2B ac182374793dda1a7a0c9993cfbac19090396c9aa01aa4e1bd55e7430ed6e22e1b88fc7ddd57230c3508036ca0a6b595c883bd95744380530fceaa6ef5a50796 SHA512 03aaa6e21927ed7b0d2167c09fdf6458f1736e11b751900e9d03688aba36c5fd67d7ac348352cad22581209888424c38a08cad981b40f70af1bcfdd04c92708e EBUILD os-prober-1.81.ebuild 2458 BLAKE2B 813912653a741bf02a87c1922f01a294c93928b413f1d9e9d669e8e2996d7de606734a40e36a1b322c92e72ef1bfaacb68ceb20b75beed0bd41bc80b3856e60b SHA512 cb98b863f1098efcbe9dfd69d3facd732367e5571cbeb4eeb58e453e3e5086ff1d4534e94668535f80673c22ceef7351c065c3477206facd2df929eb1296b9b4 EBUILD os-prober-9999.ebuild 2460 BLAKE2B cc570bf47b84f1fa39d4873d5ef9fc5bc391eef35e588a695b23f96767e19efc174e835d21a7df4a9459cfcd19e6492b6ffe0962dc4465e37e418319d3622167 SHA512 518a0cb0f0fa09e4966b23969b9d6eeb2a404e913c3fb449dd6ceb62dc2afb4d61f5d1e55f4be81d11c3fc0dcb7a10eea0f5ccca05a2b39ca77c1d08eccb2e58 MISC metadata.xml 384 BLAKE2B 98bf64680e61d1c0f0c9cbd73ce11be5a98fc7014517d263be8808064b1ab5b7ef200c243c472c3dedfad24176851007d9f4b03399e0970fd351f086b13d355c SHA512 dd391671666f17ce8e45093ff42c898c4bb0c685df9bb631c56089379d0825a15364656dedf4eec13c7652cfdbeb9c4f40f7bae0a8360cadd9b2cff136189bc3 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 000000000000..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 000000000000..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} == 9999 ]]; 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 +} -- cgit v1.2.3