public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/musl:master commit in: sys-boot/efibootmgr/files/, sys-boot/efibootmgr/
@ 2015-09-24 16:46 Anthony G. Basile
  0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2015-09-24 16:46 UTC (permalink / raw
  To: gentoo-commits

commit:     1ab2ef162343210b1804db164332b1a60a80d060
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 24 16:51:05 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Sep 24 16:51:05 2015 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=1ab2ef16

sys-boot/eibootmgr: in tree version works, bug #543838.

 sys-boot/efibootmgr/Manifest                       |  4 ---
 sys-boot/efibootmgr/efibootmgr-0.11.0-r99.ebuild   | 37 ----------------------
 .../files/efibootmgr-use-linux-pci-header.patch    | 17 ----------
 sys-boot/efibootmgr/metadata.xml                   | 20 ------------
 4 files changed, 78 deletions(-)

diff --git a/sys-boot/efibootmgr/Manifest b/sys-boot/efibootmgr/Manifest
deleted file mode 100644
index 26e3627..0000000
--- a/sys-boot/efibootmgr/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX efibootmgr-use-linux-pci-header.patch 417 SHA256 5c9cc92b268e7ef45dbfdb1ce1ecf31b29d1703a289b618cc3851a4ab0c79299 SHA512 c4e5861896bb59d90992852e6a8df01cd804540e31751cf576ec0cf51e9a023c6341f826f85efc3e363c5bbc4bd201e1bdb9547ef7ac10d4119f02744519e974 WHIRLPOOL 840e09af90b3dc1f96bc50200bf1c4cc7b249b50c1c90676c284b86d9787050c4064f0a4b80eaa205840c4dabc302c569744ceef3d51c561febd4370c609925b
-DIST efibootmgr-0.11.0.tar.bz2 53636 SHA256 f27ce3d7588512017bceb2d2a29aef110499a662a21550afa1158f9950f976d1 SHA512 65866239ae3e2f0142f48e57b16c2a2f4b736e6c7942e595492d82c628633826cfe1a68dd850b8d3090b1a0bd1bbf1906ea882e377a593d1866d686b984cac19 WHIRLPOOL 411cca8fcc26620d2c2a9d15f39e4bafc430efa2789cfe875b411522c641e6754295a640bf03876fd45c8c7c2880f81779bebd95485459316ed846210d7bb533
-EBUILD efibootmgr-0.11.0-r99.ebuild 954 SHA256 90968115e07ad2e950b9b823d5a4cbc7ee9cf3482b57475d4c83c4535cf8eaff SHA512 5cd8b9492730b1384496de09b800681e6150883882f1d75d3d530a5ea54c1e2761e4151e3b70e877d8803e0016a4374dfeaa8e1df2a98911bcaa1f4b5b7c3e8b WHIRLPOOL c00d7f50e4a3049e36a15057a80d80a4bdbf2a742eed41b1ddac7e8ef7459909ba64e04d345d75a0ffb9921ed2a8c5c4d3c5599c6e02d46a37efd0d1f51a20a3
-MISC metadata.xml 721 SHA256 2cd408b3fef01dddc0b14853a4eb8175dae030fe21a7a326279531bd1071c227 SHA512 c6e9a85ede378f46ac22c5cbfb6e8bb7753e1202ddbfc7fbeda07a6e2aea5894e0de85a9bc2c485ae16d3af2ee707f1dcdb8e94d60dbd7e5d2e74cbc1d938664 WHIRLPOOL d454adeddf3a181d5fbc6738102832237e98fc2ec9c0ee3a4bc94dea2f3b5be1167699e46eaa5dbfa5049f16e29d3b2e760f26fe67e33bad20b2377e2d5deb65

diff --git a/sys-boot/efibootmgr/efibootmgr-0.11.0-r99.ebuild b/sys-boot/efibootmgr/efibootmgr-0.11.0-r99.ebuild
deleted file mode 100644
index 6f043a7..0000000
--- a/sys-boot/efibootmgr/efibootmgr-0.11.0-r99.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/efibootmgr/efibootmgr-0.11.0.ebuild,v 1.4 2015/02/28 13:25:47 ago Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="User-space application to modify the EFI boot manager"
-HOMEPAGE="https://github.com/vathpela/efibootmgr"
-SRC_URI="https://github.com/vathpela/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 x86"
-IUSE=""
-
-RDEPEND="sys-apps/pciutils
-	sys-libs/efivar"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/efibootmgr-use-linux-pci-header.patch"
-	sed -i -e s/-Werror// Makefile || die
-}
-
-src_configure() {
-	tc-export CC
-	export EXTRA_CFLAGS=${CFLAGS}
-}
-
-src_install() {
-	# build system uses perl, so just do it ourselves
-	dosbin src/efibootmgr/efibootmgr
-	doman src/man/man8/efibootmgr.8
-	dodoc AUTHORS README doc/ChangeLog doc/TODO
-}

diff --git a/sys-boot/efibootmgr/files/efibootmgr-use-linux-pci-header.patch b/sys-boot/efibootmgr/files/efibootmgr-use-linux-pci-header.patch
deleted file mode 100644
index 7fa44f0..0000000
--- a/sys-boot/efibootmgr/files/efibootmgr-use-linux-pci-header.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Use pci.h from linux... sys/pci.h is glibc specific.
-
---- src/lib/scsi_ioctls.c.orig	2014-12-28 10:43:35.513305649 +0100
-+++ src/lib/scsi_ioctls.c	2014-12-28 10:43:45.024306074 +0100
-@@ -19,11 +19,11 @@
-  */
- 
- #include <stdio.h>
--#include <sys/pci.h>
- #include <stdint.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
-+#include <linux/pci.h>
- #include <linux/nvme.h>
- #include "scsi_ioctls.h"
- 

diff --git a/sys-boot/efibootmgr/metadata.xml b/sys-boot/efibootmgr/metadata.xml
deleted file mode 100644
index 1f9a68b..0000000
--- a/sys-boot/efibootmgr/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>proxy-maintainers</herd>
-	<maintainer>
-		<email>yannick.schaeffer@epfl.ch</email>
-		<name>Yannick Schaeffer</name>
-		<description>Mantainer. Assign bugs to him</description>
-	</maintainer>
-	<maintainer>
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
-	<longdescription>
-		This is efibootmgr, a Linux user-space application to modify the Intel
-		Extensible Firmware Interface (EFI) Boot Manager.  This application
-		can create and destroy boot entries, change the boot order, change
-		the next running boot option, and more.
-	</longdescription>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] 2+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-boot/efibootmgr/files/, sys-boot/efibootmgr/
@ 2017-03-19  0:43 Aric Belsito
  0 siblings, 0 replies; 2+ messages in thread
From: Aric Belsito @ 2017-03-19  0:43 UTC (permalink / raw
  To: gentoo-commits

commit:     e1c5a2ffef4ff63b0ad20eeda9f0300603753fae
Author:     Rasmus Thomsen <rasmus.thomsen <AT> live <DOT> de>
AuthorDate: Sun Mar 19 00:11:14 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sun Mar 19 00:18:52 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=e1c5a2ff

Remove -fshort-wchar from make.default

 sys-boot/efibootmgr/Manifest             |  4 ++++
 sys-boot/efibootmgr/efibootmgr-14.ebuild | 29 +++++++++++++++++++++++++++++
 sys-boot/efibootmgr/files/musl.patch     | 13 +++++++++++++
 sys-boot/efibootmgr/metadata.xml         | 17 +++++++++++++++++
 4 files changed, 63 insertions(+)

diff --git a/sys-boot/efibootmgr/Manifest b/sys-boot/efibootmgr/Manifest
new file mode 100644
index 0000000..b0e4bf1
--- /dev/null
+++ b/sys-boot/efibootmgr/Manifest
@@ -0,0 +1,4 @@
+AUX musl.patch 472 SHA256 4710704529f140c66b3ebcbfd9613c6471ea27f4eefaaff05427102ef1cabf58 SHA512 08e06251f62f4723b22a447019e7fe0012282876d80511fbebe459fa6adea3ebdfeb322c2e0243d4cdf7a98506ef094a4c0f0142da634a654496e820d697a889 WHIRLPOOL c977cf2c0a517e497ccd3f6eb572dc364d1cfb92d5c899d7fb808ca55fa6b3c30ce458ae5f0422d900ae9ac1c8b4406934b827dce79f5f93aa691e85a1d77b46
+DIST efibootmgr-14.tar.bz2 34972 SHA256 377ec16484414b80afd1b8a586153d7ef55ccf048638080101d49b7c77f37ad8 SHA512 97935f8752440ce236162e174ea3404e907ebddc5877d597a97813da76ad580689fc2e97044885fc860a12a473af7183242b6120e78e53243d35e569fb002baf WHIRLPOOL e5a6860130d9b12274cfe74a962a277989e9961cc8fb70372e8ac0831f79561e30fad0222154c957ed525cf930b912a1d731caff7ef5b2b0987c7cf8f28c4383
+EBUILD efibootmgr-14.ebuild 636 SHA256 4afa6529c6aadcb7cdf342b7ae29afdefe9ede3bc3a40ba8b16621b7147947ae SHA512 2c02ee35fe751757f2cfea135ea8db9076232b2261f95bffc2e1932343cb40933f34f09ae3c7f932a43edf4f7fcdadaec5d233c07c7eb425f8b0ca48bc097c2d WHIRLPOOL a47caa2e4f01c3c040b113cd29f3d44f73401e44ef4b44eda860ca53558c4f7d9b51aaa1f670d01f8be4cf147df69fca8914528b667fab503e40fb2ee73a4fee
+MISC metadata.xml 626 SHA256 44a2b529eab0c2cec715823ecc54948cb93fafb692ac97dd7c8b8bcb4f3170bd SHA512 d52646244bf9c0d10d8c5b986e110944905fc8f898c0330f65cd6c734e6d8cfabf72854cef362f411d3d63fed3f5e22207a7b94d1ea8076e566d8eff228bb33b WHIRLPOOL 56109722d4478b9980f2077a05b9f74f451646a7df62f5c32c9d6ed9de3ccf34c19f670b1c87e1f57573d2231caebdaae86fa3bc91901622d6aa098a8edeb957

diff --git a/sys-boot/efibootmgr/efibootmgr-14.ebuild b/sys-boot/efibootmgr/efibootmgr-14.ebuild
new file mode 100644
index 0000000..ae40316
--- /dev/null
+++ b/sys-boot/efibootmgr/efibootmgr-14.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="User-space application to modify the EFI boot manager"
+HOMEPAGE="https://github.com/rhinstaller/efibootmgr"
+SRC_URI="https://github.com/rhinstaller/efibootmgr/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ia64 x86"
+IUSE=""
+
+RDEPEND="sys-apps/pciutils
+	>=sys-libs/efivar-25:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -i -e s/-Werror// Make.defaults || die
+	epatch ${FILESDIR}/musl.patch
+}
+
+src_configure() {
+	tc-export CC
+}

diff --git a/sys-boot/efibootmgr/files/musl.patch b/sys-boot/efibootmgr/files/musl.patch
new file mode 100644
index 0000000..b952763
--- /dev/null
+++ b/sys-boot/efibootmgr/files/musl.patch
@@ -0,0 +1,13 @@
+diff --git a/Make.defaults b/Make.defaults
+index c7b734a..7f2f657 100644
+--- a/Make.defaults
++++ b/Make.defaults
+@@ -26,7 +26,7 @@ clang_cflags =
+ gcc_cflags =
+ cflags	= $(CFLAGS) $(SUBDIR_CFLAGS) \
+ 	 -Wall -Wextra -Wsign-compare -Wstrict-aliasing \
+-	-std=gnu11 -fshort-wchar -fPIC \
++	-std=gnu11 -fPIC \
+ 	-D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLOCALEDIR=\"$(localedir)\" \
+ 	-DEFIBOOTMGR_VERSION="\"$(VERSION)\"" \
+ 	$(if $(findstring clang,$(CC)),$(clang_cflags),) \

diff --git a/sys-boot/efibootmgr/metadata.xml b/sys-boot/efibootmgr/metadata.xml
new file mode 100644
index 0000000..2202a4d
--- /dev/null
+++ b/sys-boot/efibootmgr/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+	<longdescription>
+		This is efibootmgr, a Linux user-space application to modify the Intel
+		Extensible Firmware Interface (EFI) Boot Manager.  This application
+		can create and destroy boot entries, change the boot order, change
+		the next running boot option, and more.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">rhinstaller/efibootmgr</remote-id>
+	</upstream>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-19  0:43 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-24 16:46 [gentoo-commits] proj/musl:master commit in: sys-boot/efibootmgr/files/, sys-boot/efibootmgr/ Anthony G. Basile
  -- strict thread matches above, loose matches on Subject: below --
2017-03-19  0:43 Aric Belsito

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox