From 2265ad8fcef94e89ecbb9d5c317ee84aadc3607c Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Thu, 2 Dec 2021 13:16:56 +0100 Subject: [PATCH] sys-firmware/seabios: update to 1.14.0 --- .../sys-firmware/seabios/Manifest | 7 +- .../files/seabios-1.14.0-binutils-2.36.patch | 9 + .../seabios/files/seabios/config.seabios-128k | 6 +- .../sys-firmware/seabios/metadata.xml | 2 +- ...1.0-r1.ebuild => seabios-1.12.0-r1.ebuild} | 12 +- .../seabios/seabios-1.12.0.ebuild | 8 +- ...1.10.2.ebuild => seabios-1.14.0-r1.ebuild} | 84 +++++--- .../seabios/seabios-1.14.0-r2.ebuild | 183 ++++++++++++++++++ ...os-1.11.0.ebuild => seabios-1.14.0.ebuild} | 67 +++++-- 9 files changed, 317 insertions(+), 61 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-firmware/seabios/files/seabios-1.14.0-binutils-2.36.patch rename sdk_container/src/third_party/portage-stable/sys-firmware/seabios/{seabios-1.11.0-r1.ebuild => seabios-1.12.0-r1.ebuild} (94%) rename sdk_container/src/third_party/portage-stable/sys-firmware/seabios/{seabios-1.10.2.ebuild => seabios-1.14.0-r1.ebuild} (60%) create mode 100644 sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.14.0-r2.ebuild rename sdk_container/src/third_party/portage-stable/sys-firmware/seabios/{seabios-1.11.0.ebuild => seabios-1.14.0.ebuild} (66%) diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/Manifest b/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/Manifest index 8c598e824f..1f37057de6 100644 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/Manifest @@ -1,6 +1,5 @@ -DIST seabios-1.10.2-bin.tar.xz 121172 BLAKE2B 9d4ff624b638773e59bbf6674fb8630bd815d75af1a81db4de7f9740c37485330e6d054448f2301a97455ff0d3190d988ce0348eac78bd978982b6ce5146e4f6 SHA512 a46ce389b8b0fe7182a3dc2954fab7e0ef27ac65823e3785c247ccf77c37eaa746d94f74a4a29a221aa16ab508cf07ec8d399aa612d5c0184b48bce24c663b69 -DIST seabios-1.10.2.tar.gz 589283 BLAKE2B 08fdbecf7fb06629db472adb05a780249dbf0e0a44d04dcced5480d631c133f74ecd04b04486db3bb817b8e119e783c4b09c3ade15b9a6cc956537e9f7204514 SHA512 ea8396fe247a3bd16b43ab775cf8e23f139673b94e83f450cadb094cc8117ca7e9ef518162d965209d5ab091c96f70ec5cc8ec8d15b638e06c4c8f7a0e1609dc -DIST seabios-1.11.0-bin.tar.xz 158552 BLAKE2B 44c42b9eea70a090ad51296949fe79e5360b569bae791fe84f447061f8dbcdb6b601501e2cc1607b62308f3118087386d15ba32c8495202f62f9f9a1e3cf27c3 SHA512 03a1523dc99dbf6e353e7844a4f12020d88bf8d5cbfd187007663ab1b02447b02694f27ee93aa46a18a5ab161f13b1ffe62f2d0f678cd86975a3d53295a6eb1e -DIST seabios-1.11.0.tar.gz 607746 BLAKE2B 9f688be6b8f7c0fcbd72b59ac649a9c763fdd9e2971a4d85636c9972efc0ad42082a1622a8c41156ad1e2063907349c2e02cff9aeb444844dc445b5f7d6062bb SHA512 cae79c720bfbba3321777bbc6d5bde432fe56e2ba8f1be8acfebbde0bd453a58e889f5fa24db6055dca0a3a56d35b907761723ea35ef248c5f812129d0a27b77 DIST seabios-1.12.0-bin.tar.xz 162492 BLAKE2B 9a5a349226ed7efbed328493dc057e232203b251677a23f1f09c133743ff0ca6b05270c9d27460be1d8897888fe23ff7bdfa122023fa8ddb23af03d5b9b6f8dd SHA512 f7a0395d621245093bb9a278d95ecc3d4e8d23f620058cd4fddaf885c8b86256f6258f3fd8173c1d24c03306f44d180e768bf8005ee123bc4b699b9f0ca371be DIST seabios-1.12.0.tar.gz 613542 BLAKE2B f145c2db716996bfa9e5c014086ccfaa8ae96ebc158f34303b122b7bf209408c567665d8691364df8d8e886f63e0e72a3f3cd319dfa86ef581023201b5d94e53 SHA512 e52c5363e5bb37b5286e55545aa06bd126218f9d0e3a06ac2e189de68fe3de3256c11ca1bb13357a9c384d7e3af6284083ff3aa587688b5de04ef11b97bdfa27 +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 diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/files/seabios-1.14.0-binutils-2.36.patch b/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/files/seabios-1.14.0-binutils-2.36.patch new file mode 100644 index 0000000000..0453d203d4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/files/seabios/config.seabios-128k b/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/files/seabios/config.seabios-128k index 93203af0de..50dd75d5f3 100644 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/files/seabios/config.seabios-128k +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/files/seabios/config.seabios-128k @@ -1,5 +1,5 @@ # for qemu machine types 1.7 + older -# need to turn off features (xhci,uas) to make it fit into 128k +# need to turn off features (xhci,uas,achi,nvme,acpi_parse) to make it fit into 128k CONFIG_QEMU=y CONFIG_ROM_SIZE=128 CONFIG_BOOTSPLASH=n @@ -10,3 +10,7 @@ CONFIG_USB_UAS=n CONFIG_SDCARD=n CONFIG_TCGBIOS=n CONFIG_MPT_SCSI=n +CONFIG_ACPI_PARSE=n +CONFIG_NVME=n +CONFIG_AHCI=n +CONFIG_THREADS=n diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/metadata.xml index 4235b1b9f4..f9cd49bf83 100644 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/metadata.xml @@ -1,5 +1,5 @@ - + tamiko@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.11.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.12.0-r1.ebuild similarity index 94% rename from sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.11.0-r1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.12.0-r1.ebuild index 794dcb1afd..03b9cd8cd7 100644 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.11.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.12.0-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{7..9} ) -inherit eutils toolchain-funcs python-any-r1 +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: @@ -20,8 +20,8 @@ else # Binary versions taken from fedora: # http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/ - # seabios-bin-1.10.2-1.fc27.noarch.rpm - # seavgabios-bin-1.10.2-1.fc27.noarch.rpm + # seabios-bin-1.12.1-2.fc31.noarch.rpm + # seavgabios-bin-1.12.1-2.fc31.noarch.rpm SRC_URI=" !binary? ( https://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )" diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.12.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.12.0.ebuild index 80dc73a3d8..375070e32d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.12.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.12.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{7..9} ) -inherit eutils toolchain-funcs python-any-r1 +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: @@ -16,7 +16,7 @@ if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then EGIT_REPO_URI="git://git.seabios.org/seabios.git" inherit git-r3 else - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86" # Binary versions taken from fedora: # http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/ diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.10.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.14.0-r1.ebuild similarity index 60% rename from sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.10.2.ebuild rename to sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.14.0-r1.ebuild index 11231f42e3..f97b51857b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.10.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.14.0-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{7..9} ) -inherit eutils toolchain-funcs python-any-r1 +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: @@ -16,14 +16,10 @@ if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then EGIT_REPO_URI="git://git.seabios.org/seabios.git" inherit git-r3 else - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" - # Binary versions taken from fedora: - # http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/ - # seabios-bin-1.10.2-1.fc27.noarch.rpm - # seavgabios-bin-1.10.2-1.fc27.noarch.rpm SRC_URI=" - !binary? ( https://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz ) + !binary? ( https://www.seabios.org/downloads/${P}.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )" fi @@ -34,20 +30,36 @@ LICENSE="LGPL-3 GPL-3" SLOT="0" IUSE="+binary debug +seavgabios" -REQUIRED_USE="debug? ( !binary ) - !amd64? ( !x86? ( binary ) )" +REQUIRED_USE="debug? ( !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} ) + ${SOURCE_DEPEND} )" RDEPEND="" +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() { if ! use binary; then ewarn "You have decided to compile your own SeaBIOS. This is not" @@ -58,6 +70,14 @@ pkg_pretend() { 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}[-binary], 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 fi } @@ -72,6 +92,17 @@ src_unpack() { mkdir -p "${S}" } +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 +} + src_configure() { use binary && return @@ -86,12 +117,15 @@ src_configure() { _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}}" \ "$@" @@ -100,12 +134,13 @@ _emake() { src_compile() { use binary && return - for t in 128k 256k ; do - cp "${FILESDIR}/seabios/config.seabios-${t}" .config || die - _emake oldnoconfig - _emake out/bios.bin - mv out/bios.bin ../bios-${t}.bin || die - done + 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=( @@ -117,20 +152,17 @@ src_compile() { vmware ) for t in "${targets[@]}" ; do - emake clean distclean + _emake clean distclean cp "${FILESDIR}/seavgabios/config.vga-${t}" .config || die _emake oldnoconfig - _emake out/vgabios.bin + CHOST="${TARGET_CHOST}" _emake out/vgabios.bin cp out/vgabios.bin ../vgabios-${t}.bin || die done fi } src_install() { - insinto /usr/share/seabios - use binary && doins ../bios.bin - use !binary && newins ../bios-128k.bin bios.bin doins ../bios-256k.bin if use seavgabios ; then diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.14.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.14.0-r2.ebuild new file mode 100644 index 0000000000..37b8af0969 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.14.0-r2.ebuild @@ -0,0 +1,183 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{7..9} ) + +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} + +# To generate binary tarball you can run the following from fork tree: +# cd .../seabios-1.14.0-r2/image/usr/share +# $ tar cJf seabios-1.14.0-r2-bin.tar.xz *.bin + +if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then + EGIT_REPO_URI="git://git.seabios.org/seabios.git" + inherit git-r3 +else + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86" + + SRC_URI=" + !binary? ( https://www.seabios.org/downloads/${P}.tar.gz ) + binary? ( https://dev.gentoo.org/~sam/distfiles/${P}-r2-bin.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 )" + +SOURCE_DEPEND=" + >=sys-power/iasl-20060912 + ${PYTHON_DEPS}" +DEPEND=" + !binary? ( + ${SOURCE_DEPEND} + )" +RDEPEND="" + +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() { + 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." + if [[ -z "$(choose_target_chost)" ]]; then + elog + eerror "Before you can compile ${PN}[-binary], 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 + 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() { + 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 +} + +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 \ + 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() { + use binary && return + + local TARGET_CHOST=$(choose_target_chost) + + cp "${FILESDIR}/seabios/config.seabios-128k" .config || die + _emake oldnoconfig + CHOST="${TARGET_CHOST}" _emake iasl + CHOST="${TARGET_CHOST}" _emake out/bios.bin + mv out/bios.bin ../bios.bin || die + + 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.bin + doins ../bios-256k.bin + + if use seavgabios ; then + insinto /usr/share/seavgabios + doins ../vgabios*.bin + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.11.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.14.0.ebuild similarity index 66% rename from sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.11.0.ebuild rename to sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.14.0.ebuild index 43e3d9d88e..0c4005c94f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.11.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/seabios/seabios-1.14.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{7..9} ) -inherit eutils toolchain-funcs python-any-r1 +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: @@ -16,14 +16,10 @@ if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then EGIT_REPO_URI="git://git.seabios.org/seabios.git" inherit git-r3 else - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86" - # Binary versions taken from fedora: - # http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/ - # seabios-bin-1.10.2-1.fc27.noarch.rpm - # seavgabios-bin-1.10.2-1.fc27.noarch.rpm SRC_URI=" - !binary? ( https://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz ) + !binary? ( https://www.seabios.org/downloads/${P}.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )" fi @@ -34,20 +30,36 @@ LICENSE="LGPL-3 GPL-3" SLOT="0" IUSE="+binary debug +seavgabios" -REQUIRED_USE="debug? ( !binary ) - !amd64? ( !x86? ( binary ) )" +REQUIRED_USE="debug? ( !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} ) + ${SOURCE_DEPEND} )" RDEPEND="" +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() { if ! use binary; then ewarn "You have decided to compile your own SeaBIOS. This is not" @@ -58,6 +70,14 @@ pkg_pretend() { 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}[-binary], 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 fi } @@ -72,6 +92,13 @@ src_unpack() { mkdir -p "${S}" } +src_prepare() { + default + + # Ensure precompiled iasl files are never used + find "${WORKDIR}" -name '*.hex' -delete || die +} + src_configure() { use binary && return @@ -89,6 +116,7 @@ _emake() { CC="$(tc-getCC)" \ LD="$(tc-getLD)" \ AR="$(tc-getAR)" \ + AS="$(tc-getAS)" \ OBJCOPY="$(tc-getOBJCOPY)" \ RANLIB="$(tc-getRANLIB)" \ OBJDUMP="$(tc-getOBJDUMP)" \ @@ -100,9 +128,12 @@ _emake() { src_compile() { use binary && return + local TARGET_CHOST=$(choose_target_chost) + cp "${FILESDIR}/seabios/config.seabios-256k" .config || die _emake oldnoconfig - _emake out/bios.bin + CHOST="${TARGET_CHOST}" _emake iasl + CHOST="${TARGET_CHOST}" _emake out/bios.bin mv out/bios.bin ../bios-256k.bin || die if use seavgabios ; then @@ -118,16 +149,14 @@ src_compile() { emake clean distclean cp "${FILESDIR}/seavgabios/config.vga-${t}" .config || die _emake oldnoconfig - _emake out/vgabios.bin + CHOST="${TARGET_CHOST}" _emake out/vgabios.bin cp out/vgabios.bin ../vgabios-${t}.bin || die done fi } src_install() { - insinto /usr/share/seabios - use binary && doins ../bios.bin doins ../bios-256k.bin if use seavgabios ; then