| 1 |
commit: 07190a22ce006a2504945df01b88f68f07f6dd78 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 30 12:47:41 2022 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 30 12:48:25 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07190a22 |
| 7 |
|
| 8 |
app-admin/coreboot-utils-4.18-r2: install manpages, fix superiotool |
| 9 |
|
| 10 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 11 |
|
| 12 |
...s-4.18-r1.ebuild => coreboot-utils-4.18-r2.ebuild} | 7 ++++--- |
| 13 |
.../files/coreboot-utils-4.18-musl.patch | 19 +++++++------------ |
| 14 |
2 files changed, 11 insertions(+), 15 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-admin/coreboot-utils/coreboot-utils-4.18-r1.ebuild b/app-admin/coreboot-utils/coreboot-utils-4.18-r2.ebuild |
| 17 |
similarity index 83% |
| 18 |
rename from app-admin/coreboot-utils/coreboot-utils-4.18-r1.ebuild |
| 19 |
rename to app-admin/coreboot-utils/coreboot-utils-4.18-r2.ebuild |
| 20 |
index f50dd5d15b0a..0f0e5b47fd02 100644 |
| 21 |
--- a/app-admin/coreboot-utils/coreboot-utils-4.18-r1.ebuild |
| 22 |
+++ b/app-admin/coreboot-utils/coreboot-utils-4.18-r2.ebuild |
| 23 |
@@ -24,6 +24,7 @@ PATCHES=( |
| 24 |
"${FILESDIR}"/${PN}-4.18-flags.patch |
| 25 |
) |
| 26 |
|
| 27 |
+# selection from README.md that seem useful outside coreboot |
| 28 |
coreboot_utils=( |
| 29 |
#cbfstool has textrels and is not really necessary outside coreboot |
| 30 |
cbmem |
| 31 |
@@ -48,8 +49,6 @@ src_prepare() { |
| 32 |
} |
| 33 |
|
| 34 |
src_compile() { |
| 35 |
- # selection from README.md that seem useful outside coreboot |
| 36 |
- |
| 37 |
tc-export CC |
| 38 |
export HOSTCFLAGS="${CFLAGS}" |
| 39 |
for tool in ${coreboot_utils[*]} ; do |
| 40 |
@@ -61,7 +60,9 @@ src_compile() { |
| 41 |
src_install() { |
| 42 |
exeinto /usr/sbin |
| 43 |
for tool in ${coreboot_utils[*]} ; do |
| 44 |
- [[ -e util/${tool}/${tool} ]] && doexe util/${tool}/${tool} |
| 45 |
+ [[ -e util/${tool}/${tool} ]] && doexe util/${tool}/${tool} |
| 46 |
[[ -e util/${tool}/${tool}.py ]] && doexe util/${tool}/${tool}.py |
| 47 |
+ [[ -e util/${tool}/${tool}.8 ]] && doman util/${tool}/${tool}.8 |
| 48 |
+ [[ -d util/${tool}/man ]] && doman util/${tool}/man/*.[12345678] |
| 49 |
done |
| 50 |
} |
| 51 |
|
| 52 |
diff --git a/app-admin/coreboot-utils/files/coreboot-utils-4.18-musl.patch b/app-admin/coreboot-utils/files/coreboot-utils-4.18-musl.patch |
| 53 |
index 435977ac9c0b..a92936f008cd 100644 |
| 54 |
--- a/app-admin/coreboot-utils/files/coreboot-utils-4.18-musl.patch |
| 55 |
+++ b/app-admin/coreboot-utils/files/coreboot-utils-4.18-musl.patch |
| 56 |
@@ -34,22 +34,17 @@ diff --git a/util/superiotool/superiotool.c b/util/superiotool/superiotool.c |
| 57 |
index ed18c13e62..fa2c6ce35d 100644 |
| 58 |
--- a/util/superiotool/superiotool.c |
| 59 |
+++ b/util/superiotool/superiotool.c |
| 60 |
-@@ -320,6 +320,7 @@ int main(int argc, char *argv[]) |
| 61 |
- } |
| 62 |
- } |
| 63 |
- |
| 64 |
-+#if 0 |
| 65 |
- #if defined(__FreeBSD__) |
| 66 |
+@@ -324,8 +324,8 @@ |
| 67 |
if ((io_fd = open("/dev/io", O_RDWR)) < 0) { |
| 68 |
perror("/dev/io"); |
| 69 |
-@@ -330,6 +331,7 @@ int main(int argc, char *argv[]) |
| 70 |
+ #else |
| 71 |
+- if (iopl(3) < 0) { |
| 72 |
+- perror("iopl"); |
| 73 |
++ if (ioperm(0, 6000, 1) < 0) { |
| 74 |
++ perror("ioperm"); |
| 75 |
+ #endif |
| 76 |
printf("Superiotool must be run as root.\n"); |
| 77 |
exit(1); |
| 78 |
- } |
| 79 |
-+#endif |
| 80 |
- |
| 81 |
- print_version(); |
| 82 |
- |
| 83 |
diff --git a/util/superiotool/superiotool.h b/util/superiotool/superiotool.h |
| 84 |
index a621ae5274..d5f44fece4 100644 |
| 85 |
--- a/util/superiotool/superiotool.h |
Archives