commit: 2195898d5f9ed4cd445758c7616c0d46ce03a947 Author: Sergey Galkin <sergey.gals <AT> gmail <DOT> com> AuthorDate: Sat Jan 8 05:28:10 2022 +0000 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> CommitDate: Tue Jan 11 17:53:58 2022 +0000 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 <sergey.gals <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/23694 Signed-off-by: Ben Kohler <bkohler <AT> 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 000000000000..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 000000000000..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} == 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" + 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 + 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 +}
