-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
FL-4915: update os-prober in core-kit 1.0-prime
- Loading branch information
Oleg Vinichenko
committed
Mar 21, 2018
1 parent
a175dc6
commit c51cd5e
Showing
5 changed files
with
193 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
DIST os-prober_1.71.tar.xz 25540 BLAKE2B 8b55b763fd859cc0a62f10d919a7188eeadfedcbfa45738b25f74a1d4651d0e656ecadbc84b8fd7aad97e75179b64a51e58382f2c8c0bb36acf309fea724470c SHA512 adb7b8cf54c6169510c7ce2bf40e4b659c97eecfb7c1dd149269520ef13cdc2b6587f221fcfcb95c18caf9dba8144bbba561abb158e986ab02f4e0d338317d04 | ||
DIST os-prober_1.76.tar.xz 26432 BLAKE2B edefc2be0bb51fff3cc0cd582c46a50871228b2c94312e50320e717b9f218854a0682d0b4e66b4bef6455751fcf016fa290ab03923d89acc6965bbc9efcbaafd SHA512 64800c99e0959a35edb639f50d2467453c6f6a7d7fa7a8d74141be36e0ade96ce4f874ba6376adfd663585ce9f47b99038dc00c2f722e6236344047567ed14f3 |
26 changes: 26 additions & 0 deletions
26
core-kit/1.0-prime/sys-boot/os-prober/files/os-prober-1.76-exherbo.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
From 09fefdb360b69c2de03a2f1c881db87f924d3c76 Mon Sep 17 00:00:00 2001 | ||
From: Timo Gurr <timo.gurr@gmail.com> | ||
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> | ||
<pkgmetadata> | ||
<!-- maintainer-needed --> | ||
</pkgmetadata> |
74 changes: 74 additions & 0 deletions
74
core-kit/1.0-prime/sys-boot/os-prober/os-prober-1.71.ebuild
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" | ||
} |
86 changes: 86 additions & 0 deletions
86
core-kit/1.0-prime/sys-boot/os-prober/os-prober-1.76-r1.ebuild
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
} |