* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/seabios/, sys-firmware/seabios/files/
@ 2015-09-14 18:40 Mike Frysinger
0 siblings, 0 replies; 4+ messages in thread
From: Mike Frysinger @ 2015-09-14 18:40 UTC (permalink / raw
To: gentoo-commits
commit: 2f1af814053468b3191c8cf21d12b8a8de20b7de
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 18:39:46 2015 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 18:40:13 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f1af814
sys-firmware/seabios: add upstream fix for building on hardened systems #559980
.../seabios/files/seabios-1.8.2-fstack-check.patch | 37 ++++++++++++++++++++++
sys-firmware/seabios/seabios-1.8.2.ebuild | 5 ++-
2 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/sys-firmware/seabios/files/seabios-1.8.2-fstack-check.patch b/sys-firmware/seabios/files/seabios-1.8.2-fstack-check.patch
new file mode 100644
index 0000000..d9431f9
--- /dev/null
+++ b/sys-firmware/seabios/files/seabios-1.8.2-fstack-check.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/559980
+
+From e4d2b8ce5db86bd56efdaf64b974925bd7a7b249 Mon Sep 17 00:00:00 2001
+From: Magnus Granberg <zorry@gentoo.org>
+Date: Fri, 11 Sep 2015 17:38:40 -0400
+Subject: [PATCH] build: use -fstack-check=no when available
+
+Some compilers (such as the one in hardened/Gentoo) default this
+option to on which leads to build failures:
+src/stacks.c: In function 'call16_back':
+src/stacks.c:139:5: error: 'asm' operand has impossible constraints
+ asm volatile(
+ ^
+
+URL: https://bugs.gentoo.org/559980
+Reported-by: Alon Bar-Lev <alonbl@gentoo.org>
+Signed-off-by: Magnus Granberg <zorry@gentoo.org>
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile b/Makefile
+index e287530..3a0d2e8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -63,6 +63,7 @@ COMMONCFLAGS := -I$(OUT) -Isrc -Os -MD -g \
+ COMMONCFLAGS += $(call cc-option,$(CC),-nopie,)
+ COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
+ COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector-all,)
++COMMONCFLAGS += $(call cc-option,$(CC),-fstack-check=no,)
+ COMMA := ,
+
+ CFLAGS32FLAT := $(COMMONCFLAGS) -DMODE16=0 -DMODESEGMENT=0
+--
+2.5.1
+
diff --git a/sys-firmware/seabios/seabios-1.8.2.ebuild b/sys-firmware/seabios/seabios-1.8.2.ebuild
index b2ad1f2..2c8d488 100644
--- a/sys-firmware/seabios/seabios-1.8.2.ebuild
+++ b/sys-firmware/seabios/seabios-1.8.2.ebuild
@@ -70,7 +70,10 @@ src_unpack() {
}
src_prepare() {
- use binary || epatch_user
+ use binary && return
+
+ epatch "${FILESDIR}"/${P}-fstack-check.patch #559980
+ epatch_user
}
src_configure() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/seabios/, sys-firmware/seabios/files/
@ 2017-05-03 23:09 Matthias Maier
0 siblings, 0 replies; 4+ messages in thread
From: Matthias Maier @ 2017-05-03 23:09 UTC (permalink / raw
To: gentoo-commits
commit: 75f93364a45d42fd3ed6b39faa57283786f75248
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Wed May 3 23:06:05 2017 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Wed May 3 23:07:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75f93364
sys-firmware/seabios: drop old versions
Package-Manager: Portage-2.3.5, Repoman-2.3.2
sys-firmware/seabios/Manifest | 6 -
.../seabios/files/seabios-1.8.2-fstack-check.patch | 37 ------
sys-firmware/seabios/seabios-1.7.5-r1.ebuild | 140 ---------------------
sys-firmware/seabios/seabios-1.7.5.ebuild | 107 ----------------
sys-firmware/seabios/seabios-1.8.2.ebuild | 139 --------------------
5 files changed, 429 deletions(-)
diff --git a/sys-firmware/seabios/Manifest b/sys-firmware/seabios/Manifest
index f966203f9ee..146af7a7ba0 100644
--- a/sys-firmware/seabios/Manifest
+++ b/sys-firmware/seabios/Manifest
@@ -1,11 +1,5 @@
DIST bios.bin-1.10.1.xz 63668 SHA256 39d39cfa8166d947439081dedebb8c79a159de9b8b5447afb4876416fcf17d9d SHA512 9e3ba9c7dac3f03f9c57898a993eab34f8f3fecb0ac4718f6d4d6b1a825651a255e48fb7dc29a339249f42668469946f238674cb1f8308cf9b4a3e1e82c346d3 WHIRLPOOL 1208730ef4ee8455fe1e051b3350463d458ccf734c0fdd12d06b91dd0edbb96b2e6ec7bcc5b37902a98465c73bbf327fc3c42b7f1587bae1871d4ab9a70f5e50
-DIST bios.bin-1.7.5.gz 78943 SHA256 2e83e68e6cff73ede1c2490dabad74c177d7b67f9d93a5ed5f2ef39e76dea0ea SHA512 153a4cf190843540a9a72fcb0cf34f1f9f6ff2efb4b4f700c515dea467b101a8999421b53c2f21599864e2e803ae455a4ae39c7e8be9491c4383b4bfbe734014 WHIRLPOOL 2383f5f3a91581b0ee0ff19fd429a67b7fe09db05c456b98aee01ab9008a12d265e56f81b4d60224c7be15a86da9d2288f83a1d83f621b2ff00ab3aaccb277a4
-DIST bios.bin-1.8.2.xz 67428 SHA256 b4628fdbfc39fd73e7ab0c54dfc26128b6011d34778e381c1b2d2340209be838 SHA512 2b2339c02134bcbd6e71e8d31f9907a160534a047bc91502c215d3d4c79431b962177ac43d826cc5689d71dfc0995bc8a9a5caf1a35929f308b3c2bdad720c15 WHIRLPOOL 050a7880d0da8bb8be1ce3e1262f7e5107a5a426eb31ce9629ef497305e390d348de7ed3c7595248010eb02481a2b4a9e4dca94b3a9c954c18b8a9624f46bbc6
DIST seabios-1.10.1.tar.gz 588092 SHA256 5063ddbac61ec4e61a12daa83931c37e5629b1c18502f7c00ed4e696c2a1d2cb SHA512 b2f1c2b15853b1cc949f741ae13f32fd133efb0d0917e1cdfb253f9cd0bc9bb0b42c592cdd87bc74ccbb12a4301c102ae723ccdb490ea4716e0c9dca3dd3fead WHIRLPOOL 723d4835288566bbb6a3c3b7df2486c0a7f949590404230667a4e4490317591bcdb99dd9b0933770d8c1416c25f6a8d20b153d7410787e19d8ecbd92a7312af9
DIST seabios-1.10.2-bin.tar.xz 121172 SHA256 d32e349fcd865d447856be7d7034f47f1e1d11b413d4158f747d68d03175792b SHA512 a46ce389b8b0fe7182a3dc2954fab7e0ef27ac65823e3785c247ccf77c37eaa746d94f74a4a29a221aa16ab508cf07ec8d399aa612d5c0184b48bce24c663b69 WHIRLPOOL 17eaa7ecd4a126e4b021728ab5136d4a918e1ba413a8c56416eeb7202c9d5b1c3439ef2c528e8be3f863b3a218bcb2ffded0b1a037eee0eaf1fc52cb04f228c8
DIST seabios-1.10.2.tar.gz 589283 SHA256 89c70b70fa7ab179694efb95c2c89d4f50a39381321cbed5d8302cb9b25e953d SHA512 ea8396fe247a3bd16b43ab775cf8e23f139673b94e83f450cadb094cc8117ca7e9ef518162d965209d5ab091c96f70ec5cc8ec8d15b638e06c4c8f7a0e1609dc WHIRLPOOL 1df63d9b5940d8e1b099f75ff090505088104dc0d599ba9403c5ceb2caabf0f92023ae5bebe06ee5ad95d44e22ae540b0c9d9000fa7859801044ccd999d6efce
-DIST seabios-1.7.5.tar.gz 537566 SHA256 858d9eda4ad91efa1c45a5a401d560ef9ca8dd172f03b0a106f06661c252dc51 SHA512 ecf5fb9ac44dde6e4ac00baa6c920dde51b923f23dd74e62c5a02eceaf235e57b885975c5a8bd0927e268115c72bd1143a080fdfd4eff4e168ebeaa30436280e WHIRLPOOL 5e1e99b3bd82a8607c5986fde4592c7437bec4bd78abd5873710f6c431d075436725e8d0d32e9f0dd2921c9d84b8613108b21d31c5309a73e337ead7adf35e90
-DIST seabios-1.8.2.tar.gz 538497 SHA256 f59479307fdae840de398b75aacb2333c8eba24a5964d68c77e32ca6c987ee61 SHA512 798d222d5f5725a805cde9e6000b5ce714d0551fd4a3c2642cc6e77b2bdab1a9e239939a358a23bbe0e00112f5ad70696c87d20b90655463c835541fc04e1a00 WHIRLPOOL 9cda0ad502a59dd718c543b759ac3fcf5acb4adee70c3da9bfea95ab188415acf6425827de77f45421ec3be8fd9e0c37fb486e62828217ba3e83f88d942a3f4a
-DIST seabios_1.7.5-1_all.deb 112098 SHA256 61bab13a733e8087147ae4798f0053c6d632866e332a1ee3af2265e4f57ced36 SHA512 891a26e084ccac8e9badce5a58eeadfb958af9d5ed087a99998f92153718e8231c14abfae0ed86bde870aa9e2f29fd93d5cc04515695e6f2d7b9fcaaef11bfce WHIRLPOOL d47ad79e7bd701862d059d86c7cb3b730b0303c5170ec52a481df5326cad0cd98ea78fcdb2730623b6b65289d9042f4685991eb515402543083cd8228f849959
-DIST seavgabios-1.8.2.tar.xz 20284 SHA256 d28ff071ee56f7bd88cec2482908f469d553cd8b61485a8e89989c26cb5c0e4a SHA512 16d2b54cd98aa22f7af21d8c51a4cf87d9462ec0c99bf703bf7f6c3c4e0be4cbd313b8cf0fb79cdb7b6a7f94441493a4f9669b6d44297e12f03a749befa2d845 WHIRLPOOL 9d61957ec4e3a0c5e4b999495119c6cfb4f2165d98b652b530dbee3ceb19b18a75d07902a5ee15b41b877154bb9ac19163d75c6024a40c4e94e6cf5cdf561e9d
DIST seavgabios-bin-1.10.1.tar.xz 20408 SHA256 88c310f2f1ddbbca3e00f8895706b3df718046bd729ab719c4e4bd01f502bd6d SHA512 7fe97efaf61c2d1e72c8df27b5108c80f6a51f5a7370de68720b0f71abe05ae5765dd867d127df2fa6182b5d4702a9ef7549e7170fec5071b31a6066db20c219 WHIRLPOOL 484c2f0302bf232e8065ec8cc1566731a962a2f76e01df2b7b21611b3c3ab47b04f1de192a3675130942a42c97f78e210d14ac2e36a7c36d8c28eff4e1618abc
diff --git a/sys-firmware/seabios/files/seabios-1.8.2-fstack-check.patch b/sys-firmware/seabios/files/seabios-1.8.2-fstack-check.patch
deleted file mode 100644
index d9431f994e0..00000000000
--- a/sys-firmware/seabios/files/seabios-1.8.2-fstack-check.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/559980
-
-From e4d2b8ce5db86bd56efdaf64b974925bd7a7b249 Mon Sep 17 00:00:00 2001
-From: Magnus Granberg <zorry@gentoo.org>
-Date: Fri, 11 Sep 2015 17:38:40 -0400
-Subject: [PATCH] build: use -fstack-check=no when available
-
-Some compilers (such as the one in hardened/Gentoo) default this
-option to on which leads to build failures:
-src/stacks.c: In function 'call16_back':
-src/stacks.c:139:5: error: 'asm' operand has impossible constraints
- asm volatile(
- ^
-
-URL: https://bugs.gentoo.org/559980
-Reported-by: Alon Bar-Lev <alonbl@gentoo.org>
-Signed-off-by: Magnus Granberg <zorry@gentoo.org>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile b/Makefile
-index e287530..3a0d2e8 100644
---- a/Makefile
-+++ b/Makefile
-@@ -63,6 +63,7 @@ COMMONCFLAGS := -I$(OUT) -Isrc -Os -MD -g \
- COMMONCFLAGS += $(call cc-option,$(CC),-nopie,)
- COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
- COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector-all,)
-+COMMONCFLAGS += $(call cc-option,$(CC),-fstack-check=no,)
- COMMA := ,
-
- CFLAGS32FLAT := $(COMMONCFLAGS) -DMODE16=0 -DMODESEGMENT=0
---
-2.5.1
-
diff --git a/sys-firmware/seabios/seabios-1.7.5-r1.ebuild b/sys-firmware/seabios/seabios-1.7.5-r1.ebuild
deleted file mode 100644
index 941a02fe6e5..00000000000
--- a/sys-firmware/seabios/seabios-1.7.5-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
-
-inherit eutils toolchain-funcs python-any-r1
-
-#BACKPORTS=1
-
-# SeaBIOS maintainers sometimes don't release stable tarballs or stable
-# binaries to generate the stable tarball the following is necessary:
-# git clone git://git.seabios.org/seabios.git && cd seabios
-# git archive --output seabios-${PV}.tar.gz --prefix seabios-${PV}/ rel-${PV}
-
-if [[ ${PV} = *9999* || ! -z "${EGIT_COMMIT}" ]]; then
- EGIT_REPO_URI="git://git.seabios.org/seabios.git"
- inherit git-2
-else
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
- SRC_URI="!binary? ( https://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz )
- binary? (
- https://code.coreboot.org/p/seabios/downloads/get/bios.bin-${PV}.gz
- seavgabios? (
- mirror://debian/pool/main/s/${PN}/${PN}_${PV}-1_all.deb
- )
- )
- ${BACKPORTS:+https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
-fi
-
-DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
-HOMEPAGE="https://www.seabios.org/"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-IUSE="+binary +seavgabios"
-
-REQUIRED_USE="ppc? ( binary )
- ppc64? ( binary )"
-
-DEPEND="
- !binary? (
- >=sys-power/iasl-20060912
- ${PYTHON_DEPS}
- )"
-RDEPEND=""
-
-pkg_pretend() {
- if ! use binary; then
- ewarn "You have decided to compile your own SeaBIOS. This is not"
- ewarn "supported by upstream unless you use their recommended"
- ewarn "toolchain (which you are not)."
- elog
- ewarn "If you are intending to use this build with QEMU, realize"
- ewarn "you will not receive any support if you have compiled your"
- ewarn "own SeaBIOS. Virtual machines subtly fail based on changes"
- ewarn "in SeaBIOS."
- fi
-}
-
-pkg_setup() {
- use binary || python-any-r1_pkg_setup
-}
-
-src_unpack() {
- default
- if use binary && use seavgabios ; then
- unpack ./data.tar.xz
- mv usr/share/seabios/vgabios*.bin ./ || die
- fi
-
- # This simplifies the logic between binary & source builds.
- mkdir -p "${S}"
-}
-
-src_prepare() {
- use binary && return
-
- if [[ -z "${EGIT_COMMIT}" ]]; then
- sed -e "s/VERSION=.*/VERSION=${PV}/" \
- -i Makefile || die
- else
- sed -e "s/VERSION=.*/VERSION=${PV}_pre${EGIT_COMMIT}/" \
- -i Makefile || die
- fi
-
- epatch_user
-}
-
-src_configure() {
- use binary || tc-ld-disable-gold #438058
-}
-
-_emake() {
- LANG=C \
- emake V=1 \
- CC="$(tc-getCC)" \
- LD="$(tc-getLD)" \
- AR="$(tc-getAR)" \
- OBJCOPY="$(tc-getOBJCOPY)" \
- RANLIB="$(tc-getRANLIB)" \
- OBJDUMP="$(tc-getOBJDUMP)" \
- HOST_CC="$(tc-getBUILD_CC)" \
- "$@"
-}
-
-src_compile() {
- use binary && return
-
- _emake out/bios.bin
- mv out/bios.bin ../bios.bin
-
- if use seavgabios ; then
- local config t targets=(
- cirrus
- isavga
- qxl
- stdvga
- vmware
- )
- for t in "${targets[@]}" ; do
- emake clean distclean
- cp "${FILESDIR}/seavgabios/config.vga-${t}" .config || die
- _emake oldnoconfig
- _emake out/vgabios.bin
- cp out/vgabios.bin ../vgabios-${t}.bin || die
- done
- fi
-}
-
-src_install() {
- insinto /usr/share/seabios
- newins ../bios.bin* bios.bin
-
- if use seavgabios ; then
- insinto /usr/share/seavgabios
- doins ../vgabios*.bin
- fi
-}
diff --git a/sys-firmware/seabios/seabios-1.7.5.ebuild b/sys-firmware/seabios/seabios-1.7.5.ebuild
deleted file mode 100644
index 7fb717bed20..00000000000
--- a/sys-firmware/seabios/seabios-1.7.5.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
-
-inherit eutils toolchain-funcs python-any-r1
-
-#BACKPORTS=1
-
-# SeaBIOS maintainers sometimes don't release stable tarballs or stable
-# binaries to generate the stable tarball the following is necessary:
-# git clone git://git.seabios.org/seabios.git && cd seabios
-# git archive --output seabios-${PV}.tar.gz --prefix seabios-${PV}/ rel-${PV}
-
-if [[ ${PV} = *9999* || ! -z "${EGIT_COMMIT}" ]]; then
- EGIT_REPO_URI="git://git.seabios.org/seabios.git"
- inherit git-2
-else
- KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
- SRC_URI="!binary? ( https://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz )
- binary? ( https://code.coreboot.org/p/seabios/downloads/get/bios.bin-${PV}.gz )
- ${BACKPORTS:+https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
-fi
-
-DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
-HOMEPAGE="https://www.seabios.org/"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-IUSE="+binary"
-
-REQUIRED_USE="ppc? ( binary )
- ppc64? ( binary )"
-
-DEPEND="
- !binary? (
- >=sys-power/iasl-20060912
- ${PYTHON_DEPS}
- )"
-RDEPEND=""
-
-pkg_pretend() {
- if ! use binary; then
- ewarn "You have decided to compile your own SeaBIOS. This is not"
- ewarn "supported by upstream unless you use their recommended"
- ewarn "toolchain (which you are not)."
- elog
- ewarn "If you are intending to use this build with QEMU, realize"
- ewarn "you will not receive any support if you have compiled your"
- ewarn "own SeaBIOS. Virtual machines subtly fail based on changes"
- ewarn "in SeaBIOS."
- fi
-}
-
-pkg_setup() {
- use binary || python-any-r1_pkg_setup
-}
-
-src_unpack() {
- default
-
- # This simplifies the logic between binary & source builds.
- mkdir -p "${S}"
-}
-
-src_prepare() {
- use binary && return
-
- if [[ -z "${EGIT_COMMIT}" ]]; then
- sed -e "s/VERSION=.*/VERSION=${PV}/" \
- -i Makefile || die
- else
- sed -e "s/VERSION=.*/VERSION=${PV}_pre${EGIT_COMMIT}/" \
- -i Makefile || die
- fi
-
- epatch_user
-}
-
-src_configure() {
- use binary || tc-ld-disable-gold #438058
-}
-
-src_compile() {
- if ! use binary ; then
- LANG=C emake \
- CC="$(tc-getCC)" \
- LD="$(tc-getLD)" \
- AR="$(tc-getAR)" \
- OBJCOPY="$(tc-getOBJCOPY)" \
- RANLIB="$(tc-getRANLIB)" \
- OBJDUMP="$(tc-getOBJDUMP)" \
- HOST_CC="$(tc-getBUILD_CC)" \
- out/bios.bin
- fi
-}
-
-src_install() {
- insinto /usr/share/seabios
- if ! use binary ; then
- doins out/bios.bin
- else
- newins ../bios.bin-${PV} bios.bin
- fi
-}
diff --git a/sys-firmware/seabios/seabios-1.8.2.ebuild b/sys-firmware/seabios/seabios-1.8.2.ebuild
deleted file mode 100644
index b015d787e8d..00000000000
--- a/sys-firmware/seabios/seabios-1.8.2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
-
-inherit eutils toolchain-funcs python-any-r1
-
-# SeaBIOS maintainers sometimes don't release stable tarballs or stable
-# binaries to generate the stable tarball the following is necessary:
-# git clone git://git.seabios.org/seabios.git && cd seabios
-# git archive --output seabios-${PV}.tar.gz --prefix seabios-${PV}/ rel-${PV}
-
-if [[ ${PV} = *9999* || ! -z "${EGIT_COMMIT}" ]]; then
- EGIT_REPO_URI="git://git.seabios.org/seabios.git"
- inherit git-2
-else
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
- # Upstream hasn't released a new binary. We snipe ours from Fedora for now.
- # https://code.coreboot.org/p/seabios/downloads/get/bios.bin-${PV}.gz
- SRC_URI="!binary? ( https://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz )
- binary? (
- mirror://gentoo/bios.bin-${PV}.xz
- seavgabios? ( mirror://gentoo/seavgabios-${PV}.tar.xz )
- )"
-fi
-
-DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
-HOMEPAGE="https://www.seabios.org/"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-IUSE="+binary debug +seavgabios"
-
-REQUIRED_USE="debug? ( !binary )
- !amd64? ( !x86? ( binary ) )"
-
-# The amd64/x86 check is needed to workaround #570892.
-SOURCE_DEPEND="
- >=sys-power/iasl-20060912
- ${PYTHON_DEPS}"
-DEPEND="
- !binary? (
- amd64? ( ${SOURCE_DEPEND} )
- x86? ( ${SOURCE_DEPEND} )
- )"
-RDEPEND=""
-
-pkg_pretend() {
- if ! use binary; then
- ewarn "You have decided to compile your own SeaBIOS. This is not"
- ewarn "supported by upstream unless you use their recommended"
- ewarn "toolchain (which you are not)."
- elog
- ewarn "If you are intending to use this build with QEMU, realize"
- ewarn "you will not receive any support if you have compiled your"
- ewarn "own SeaBIOS. Virtual machines subtly fail based on changes"
- ewarn "in SeaBIOS."
- fi
-}
-
-pkg_setup() {
- use binary || python-any-r1_pkg_setup
-}
-
-src_unpack() {
- default
-
- # This simplifies the logic between binary & source builds.
- mkdir -p "${S}"
-}
-
-src_prepare() {
- use binary && return
-
- epatch "${FILESDIR}"/${P}-fstack-check.patch #559980
- epatch_user
-}
-
-src_configure() {
- use binary && return
-
- tc-ld-disable-gold #438058
-
- if use debug ; then
- echo "CONFIG_DEBUG_LEVEL=8" >.config
- fi
- _emake config
-}
-
-_emake() {
- LANG=C \
- emake V=1 \
- CC="$(tc-getCC)" \
- LD="$(tc-getLD)" \
- AR="$(tc-getAR)" \
- OBJCOPY="$(tc-getOBJCOPY)" \
- RANLIB="$(tc-getRANLIB)" \
- OBJDUMP="$(tc-getOBJDUMP)" \
- HOST_CC="$(tc-getBUILD_CC)" \
- VERSION="Gentoo/${EGIT_COMMIT:-${PVR}}" \
- "$@"
-}
-
-src_compile() {
- use binary && return
-
- _emake out/bios.bin
- mv out/bios.bin ../bios.bin
-
- if use seavgabios ; then
- local config t targets=(
- cirrus
- isavga
- qxl
- stdvga
- virtio
- vmware
- )
- for t in "${targets[@]}" ; do
- emake clean distclean
- cp "${FILESDIR}/seavgabios/config.vga-${t}" .config || die
- _emake oldnoconfig
- _emake out/vgabios.bin
- cp out/vgabios.bin ../vgabios-${t}.bin || die
- done
- fi
-}
-
-src_install() {
- insinto /usr/share/seabios
- newins ../bios.bin* bios.bin
-
- if use seavgabios ; then
- insinto /usr/share/seavgabios
- doins ../vgabios*.bin
- fi
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/seabios/, sys-firmware/seabios/files/
@ 2021-04-30 22:05 Sergei Trofimovich
0 siblings, 0 replies; 4+ messages in thread
From: Sergei Trofimovich @ 2021-04-30 22:05 UTC (permalink / raw
To: gentoo-commits
commit: 349e168da5d78c75bd210ff893a7b580dfe5b4fe
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 22:05:41 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 22:05:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=349e168d
sys-firmware/seabios: tweak linker script for binutils-2.36
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-firmware/seabios/files/seabios-1.14.0-binutils-2.36.patch | 9 +++++++++
sys-firmware/seabios/seabios-1.14.0-r1.ebuild | 4 ++++
2 files changed, 13 insertions(+)
diff --git a/sys-firmware/seabios/files/seabios-1.14.0-binutils-2.36.patch b/sys-firmware/seabios/files/seabios-1.14.0-binutils-2.36.patch
new file mode 100644
index 00000000000..0453d203d4a
--- /dev/null
+++ b/sys-firmware/seabios/files/seabios-1.14.0-binutils-2.36.patch
@@ -0,0 +1,9 @@
+--- a/vgasrc/vgalayout.lds.S
++++ b/vgasrc/vgalayout.lds.S
+@@ -19,5 +19,5 @@ SECTIONS
+
+ // Discard regular data sections to force a link error if
+ // 16bit code attempts to access data not marked with VAR16.
+- /DISCARD/ : { *(.text*) *(.rodata*) *(.data*) *(.bss*) *(COMMON) }
++ /DISCARD/ : { *(.text*) *(.rodata*) *(.data*) *(.bss*) *(COMMON) *(.note.gnu.property) }
+ }
diff --git a/sys-firmware/seabios/seabios-1.14.0-r1.ebuild b/sys-firmware/seabios/seabios-1.14.0-r1.ebuild
index a8b5184144a..f97b51857b5 100644
--- a/sys-firmware/seabios/seabios-1.14.0-r1.ebuild
+++ b/sys-firmware/seabios/seabios-1.14.0-r1.ebuild
@@ -95,6 +95,10 @@ src_unpack() {
src_prepare() {
default
+ if ! use binary; then
+ eapply "${FILESDIR}"/${PN}-1.14.0-binutils-2.36.patch
+ fi
+
# Ensure precompiled iasl files are never used
find "${WORKDIR}" -name '*.hex' -delete || die
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-firmware/seabios/, sys-firmware/seabios/files/
@ 2022-09-06 22:39 John Helmert III
0 siblings, 0 replies; 4+ messages in thread
From: John Helmert III @ 2022-09-06 22:39 UTC (permalink / raw
To: gentoo-commits
commit: ef4f1f4c420f0eb075d979ecc76e85e2a4488706
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 7 01:09:35 2022 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Tue Sep 6 22:38:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef4f1f4c
sys-firmware/seabios: add 1.16.0
Drop keywords for arm, hppa, riscv, ia64, s390, sparc since iasl isn't
keyworded there yet.
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
sys-firmware/seabios/Manifest | 1 +
sys-firmware/seabios/files/README | 2 -
sys-firmware/seabios/seabios-1.16.0.ebuild | 142 +++++++++++++++++++++++++++++
3 files changed, 143 insertions(+), 2 deletions(-)
diff --git a/sys-firmware/seabios/Manifest b/sys-firmware/seabios/Manifest
index 1f37057de6a9..53fef7c53118 100644
--- a/sys-firmware/seabios/Manifest
+++ b/sys-firmware/seabios/Manifest
@@ -3,3 +3,4 @@ DIST seabios-1.12.0.tar.gz 613542 BLAKE2B f145c2db716996bfa9e5c014086ccfaa8ae96e
DIST seabios-1.14.0-bin.tar.xz 170160 BLAKE2B 1ab471ce0c6e27633ec42a66e3069496be84de713baab5de4f297821bd0da26404f7f70abc82e223ec5aa317a878889ae92b019988c72d24f77e7dcc5865f916 SHA512 7964e9bb7dff4fd6593f5d6d64efc4b1460750461b86635dbe5255d2086d619f51711d7a35e4dc20e556f705091c0950afabeddcd2e8876f05ce14f9ca73ed71
DIST seabios-1.14.0-r2-bin.tar.xz 132256 BLAKE2B 7d38949de254d6e3699d463a66c363156aa36bfe16c18bea48c55a61bdc423184175fd5427d3246a78d9c6335e61e5baa982f67e7406c5525e405b4383530d41 SHA512 5ce0e407b97e878842fbd7ad2f9e8a65f2565a5aa43d08e01cff024352780f55f8669958c58d20770db7f90e87cc52c860af831cefe3846227e7b45cd9dc33ee
DIST seabios-1.14.0.tar.gz 628985 BLAKE2B cc1126925dab1551a655680d20d06ebf28c12c386500d1ee4df9e1a99403b4c5bc6a66c2cc5ef58b4c3d6d7226f35007506a6a1855c2cf2742469dcb7aba05bb SHA512 215c42f59425f8abd062be7b11fc0e39c977cee5001a2381551b0f851ac337d0dd53c065267e6dee0e710ffd700fa635f9007b89da8dfce0f47122c984ee8146
+DIST seabios-1.16.0.tar.gz 635419 BLAKE2B b645f20bae341d56ce4fc4a7044446050d8490c6c136377f6dccf02c88100b0644bc13d210b4a517a8be6002d5671b0fba77120a2aca3a9bafbad5e88d037e40 SHA512 9daefcfb1c9edda4462a4b080c9bac552154d577ae19703a914928e43005e7a52edd86869c6507e94a7f0c61ce8b3e6f5dea38cd5146628cb138a130947c522f
diff --git a/sys-firmware/seabios/files/README b/sys-firmware/seabios/files/README
deleted file mode 100644
index a7aed6d46cf6..000000000000
--- a/sys-firmware/seabios/files/README
+++ /dev/null
@@ -1,2 +0,0 @@
-The configuration files config.vga-xxx are based on the variants found in
-the qemu/roms/ tree.
diff --git a/sys-firmware/seabios/seabios-1.16.0.ebuild b/sys-firmware/seabios/seabios-1.16.0.ebuild
new file mode 100644
index 000000000000..4ba443b19f0b
--- /dev/null
+++ b/sys-firmware/seabios/seabios-1.16.0.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit toolchain-funcs python-any-r1
+
+# SeaBIOS maintainers sometimes don't release stable tarballs or stable
+# binaries to generate the stable tarball the following is necessary:
+# git clone git://git.seabios.org/seabios.git && cd seabios
+# git archive --output seabios-${PV}.tar.gz --prefix seabios-${PV}/ rel-${PV}
+
+if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
+ EGIT_REPO_URI="git://git.seabios.org/seabios.git"
+ inherit git-r3
+else
+ SRC_URI="https://www.seabios.org/downloads/${P}.tar.gz"
+ #KEYWORDS="~alpha ~amd64 ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
+HOMEPAGE="https://www.seabios.org/"
+
+LICENSE="LGPL-3 GPL-3"
+SLOT="0"
+IUSE="debug +seavgabios"
+
+BDEPEND="
+ >=sys-power/iasl-20060912
+ ${PYTHON_DEPS}"
+RDEPEND="!sys-firmware/seabios-bin"
+
+choose_target_chost() {
+ if [[ -n "${CC}" ]]; then
+ ${CC} -dumpmachine
+ return
+ fi
+
+ if use amd64 || use x86; then
+ # Use the native compiler
+ echo "${CHOST}"
+ return
+ fi
+
+ local i
+ for i in x86_64 i686 i586 i486 i386 ; do
+ i=${i}-pc-linux-gnu
+ type -P ${i}-gcc > /dev/null && echo ${i} && return
+ done
+}
+
+pkg_pretend() {
+ ewarn "You have decided to compile your own SeaBIOS. This is not"
+ ewarn "supported by upstream unless you use their recommended"
+ ewarn "toolchain (which you are not)."
+ elog
+ ewarn "If you are intending to use this build with QEMU, realize"
+ ewarn "you will not receive any support if you have compiled your"
+ ewarn "own SeaBIOS. Virtual machines subtly fail based on changes"
+ ewarn "in SeaBIOS."
+ if [[ -z "$(choose_target_chost)" ]]; then
+ elog
+ eerror "Before you can compile ${PN}, you need to install a x86 cross-compiler"
+ eerror "Run the following commands:"
+ eerror " emerge crossdev"
+ eerror " crossdev --stable -t x86_64-pc-linux-gnu"
+ die "cross-compiler is needed"
+ fi
+}
+
+src_prepare() {
+ default
+
+ # Ensure precompiled iasl files are never used
+ find "${WORKDIR}" -name '*.hex' -delete || die
+}
+
+src_configure() {
+ tc-ld-disable-gold #438058
+
+ if use debug ; then
+ echo "CONFIG_DEBUG_LEVEL=8" >.config
+ fi
+ _emake config
+}
+
+_emake() {
+ LANG=C \
+ emake V=1 \
+ CPP="$(tc-getPROG CPP cpp)" \
+ CC="$(tc-getCC)" \
+ LD="$(tc-getLD)" \
+ AR="$(tc-getAR)" \
+ AS="$(tc-getAS)" \
+ OBJCOPY="$(tc-getOBJCOPY)" \
+ RANLIB="$(tc-getRANLIB)" \
+ OBJDUMP="$(tc-getOBJDUMP)" \
+ STRIP="$(tc-getSTRIP)" \
+ HOST_CC="$(tc-getBUILD_CC)" \
+ VERSION="Gentoo/${EGIT_COMMIT:-${PVR}}" \
+ "$@"
+}
+
+src_compile() {
+ local TARGET_CHOST=$(choose_target_chost)
+
+ cp "${FILESDIR}/seabios/config.seabios-256k" .config || die
+ _emake oldnoconfig
+ CHOST="${TARGET_CHOST}" _emake iasl
+ CHOST="${TARGET_CHOST}" _emake out/bios.bin
+ mv out/bios.bin ../bios-256k.bin || die
+
+ if use seavgabios ; then
+ local config t targets=(
+ cirrus
+ isavga
+ qxl
+ stdvga
+ virtio
+ vmware
+ )
+ for t in "${targets[@]}" ; do
+ _emake clean distclean
+ cp "${FILESDIR}/seavgabios/config.vga-${t}" .config || die
+ _emake oldnoconfig
+ CHOST="${TARGET_CHOST}" _emake out/vgabios.bin
+ cp out/vgabios.bin ../vgabios-${t}.bin || die
+ done
+ fi
+}
+
+src_install() {
+ insinto /usr/share/seabios
+ doins ../bios-256k.bin
+
+ if use seavgabios ; then
+ insinto /usr/share/seavgabios
+ doins ../vgabios*.bin
+ fi
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-09-06 22:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-14 18:40 [gentoo-commits] repo/gentoo:master commit in: sys-firmware/seabios/, sys-firmware/seabios/files/ Mike Frysinger
-- strict thread matches above, loose matches on Subject: below --
2017-05-03 23:09 Matthias Maier
2021-04-30 22:05 Sergei Trofimovich
2022-09-06 22:39 John Helmert III
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox