diff options
| -rw-r--r-- | main/seabios/APKBUILD | 68 | ||||
| -rw-r--r-- | main/seabios/fix-pie.patch | 12 |
2 files changed, 16 insertions, 64 deletions
diff --git a/main/seabios/APKBUILD b/main/seabios/APKBUILD index 9626e44085..79e47e5038 100644 --- a/main/seabios/APKBUILD +++ b/main/seabios/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=seabios -pkgver=1.9.2 -pkgrel=2 +pkgver=1.10.2 +pkgrel=0 pkgdesc="Open-source legacy BIOS implementation" url="http://www.coreboot.org/SeaBIOS" arch="x86 x86_64" @@ -9,11 +9,8 @@ license="LGPLv3" depends="$pkgname-bin=$pkgver-r$pkgrel seavgabios-bin=$pkgver-r$pkgrel" depends_dev="" makedepends="$depends_dev python2 iasl" -install="" subpackages="$pkgname-bin:_seabios seavgabios-bin:_seavgabios" source="http://code.coreboot.org/p/seabios/downloads/get/seabios-$pkgver.tar.gz - fix-pie.patch - config.coreboot config.csm config.seabios-128k @@ -33,25 +30,21 @@ _build_bios() { make clean distclean cp "$1" .config echo "CONFIG_DEBUG_LEVEL=${_debug_level}" >> .config - make oldnoconfig || return 1 - make $4 || return 1 + make oldnoconfig + make $4 cp out/"$2" binaries/"$3" } build() { cd "$builddir" - mkdir binaries || return 1 + mkdir binaries # seabois - _build_bios "$srcdir"/config.csm Csm16.bin bios-csm.bin \ - || return 1 - _build_bios "$srcdir"/config.coreboot bios.bin.elf bios-coreboot.bin \ - || return 1 - _build_bios "$srcdir"/config.seabios-128k bios.bin bios.bin \ - || return 1 - _build_bios "$srcdir"/config.seabios-256k bios.bin bios-256k.bin \ - || return 1 + _build_bios "$srcdir"/config.csm Csm16.bin bios-csm.bin + _build_bios "$srcdir"/config.coreboot bios.bin.elf bios-coreboot.bin + _build_bios "$srcdir"/config.seabios-128k bios.bin bios.bin + _build_bios "$srcdir"/config.seabios-256k bios.bin bios-256k.bin - cp out/src/fw/*dsdt*.aml binaries/ || return 1 + cp out/src/fw/*dsdt*.aml binaries/ for i in $source; do case $i in @@ -59,7 +52,7 @@ build() { _build_bios "$srcdir"/$i \ vgabios.bin \ vgabios-${i##*.}.bin \ - out/vgabios.bin || return 1 + out/vgabios.bin ;; esac done @@ -72,12 +65,10 @@ package() { for i in binaries/*; do case ${i#*/} in bios*|*.aml) \ - install -m 0644 "$i" "$pkgdir"/usr/share/seabios/ \ - || return 1 + install -m 0644 "$i" "$pkgdir"/usr/share/seabios/ ;; vga*) - install -m 0644 "$i" "$pkgdir"/usr/share/seavgabios/ \ - || return 1 + install -m 0644 "$i" "$pkgdir"/usr/share/seavgabios/ ;; esac done @@ -85,44 +76,17 @@ package() { _seabios() { pkgdesc="Seabios for x86" - depends= mkdir -p "$subpkgdir"/usr/share/ - mv "$pkgdir"/usr/share/seabios "$subpkgdir"/usr/share/ || return 1 + mv "$pkgdir"/usr/share/seabios "$subpkgdir"/usr/share/ } _seavgabios() { pkgdesc="Seavgabios for x86" - depends= mkdir -p "$subpkgdir"/usr/share/ - mv "$pkgdir"/usr/share/seavgabios "$subpkgdir"/usr/share/ || return 1 + mv "$pkgdir"/usr/share/seavgabios "$subpkgdir"/usr/share/ } -md5sums="32201f54c5fb478914d0bb2449b18454 seabios-1.9.2.tar.gz -7e18d418e3e10a4a8c6ab5ae4f205c80 fix-pie.patch -e2e4c8e2bbc9e6250bccb7754e714534 config.coreboot -446b2e19edbd1db3bb30f550ce705838 config.csm -8e2ab836b50e93804098a7dd19023802 config.seabios-128k -3170da5d37660b9bf5792103b3796f26 config.seabios-256k -0958ef6ea9a61af57ad8132400f66386 config.vga.cirrus -4c9895f9c5fe7a2d45bd570afa9a05ee config.vga.isavga -8c3d5ebdd98f736143ccd4456f79e125 config.vga.qxl -19dcddeb5aa9e8fbdf6975205e867c8e config.vga.stdvga -7ea773f6b9bf5bdaaac2699403f185b3 config.vga.virtio -c2d2b8d0f7b9024f9d157f8db100fec3 config.vga.vmware" -sha256sums="f01d459b0e50996fdfa021eea5010776c26f739adba73957af519233165ebbe5 seabios-1.9.2.tar.gz -0961d04d80c160fcfe1eb6c051cec8ca1d2c47013cae7a1120a674ac757a0082 fix-pie.patch -562c285883d803b415fc5836367ae919ab34a6d09001a84970f464887a03fe2c config.coreboot -a046a73392f449f106de918a82c51c99225212d9d253b9011475d0eaa41e6180 config.csm -5e4dbe993d4fd7cf4895e55fda55c65dcf4c86cdfe853e5df05c2c59624490a7 config.seabios-128k -8b14f70d5cf5e9fbe3b81a051149bb6d89e1786bae7fb6e6ed78bbe699a30834 config.seabios-256k -888ad874052d301981a8cc6fa4bc72b1edd14ba937e7de113f71ce3fd2f8c253 config.vga.cirrus -5826ec704d4e4bb57089e0cbb72e7e5ccd31b7192d81084665cd4faeecb60b04 config.vga.isavga -26e43ea5e98615d11573b2619f3fb3c1933d5f810e6a2c44218d99465cc3ae77 config.vga.qxl -ca7367ae57665fa01e0ebb741ba5823d646f4b65a9a87657ea163cc9f362a8a8 config.vga.stdvga -afa7d59e1c18ed770cf0e83e3d5dc70866f75fdde83064fbea6e115f79504066 config.vga.virtio -1bd31f16dd43fb25aa92f9816cbfaae4a19a8faf29ff52bd02429fbaafb78f57 config.vga.vmware" -sha512sums="ffd2db044e4ca42b3de4cea9bc8092840ac8b641169b0a6151b40a732f6f8cfd84a18716f086c36619debb911b95b3bd7f7a7dbdc79cd6b01aaa8ea2a9737325 seabios-1.9.2.tar.gz -bd25bfe842d9eb12052ecbed9f908e0991b743aafaea51a41c5fbf6a9e1ff85aef655fdef2d512a74bfc7dc1af3d7d19b6b6310265db46c27b27f26662602a7f fix-pie.patch +sha512sums="ea8396fe247a3bd16b43ab775cf8e23f139673b94e83f450cadb094cc8117ca7e9ef518162d965209d5ab091c96f70ec5cc8ec8d15b638e06c4c8f7a0e1609dc seabios-1.10.2.tar.gz dc77f693e2426a8a9b084f22d607d9bf6dfd0776cb86373a55d6e02f154f546b6fd616bb981783e914be51eb843311652a90b111fb573e32b3a8207d66aea218 config.coreboot a2238723fbbb96184bb52b018633701aeb929bfae43f50659258dee854acaf4f1bdf2c201c65fb46d2712372d11ab345eac1c41068f82d6dcbef91ef9d1d39cd config.csm fd9e323e2249cb5334ebe5f5e0badc3868edf254c9f8221f99cf1dcb9ef35b738739bc972185013743d1b3629e0f03fd309cee08f005fd280180652e5445550d config.seabios-128k diff --git a/main/seabios/fix-pie.patch b/main/seabios/fix-pie.patch deleted file mode 100644 index cb8b676ca4..0000000000 --- a/main/seabios/fix-pie.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru seabios-1.9.2/Makefile seabios-1.9.2.fix/Makefile ---- seabios-1.9.2/Makefile 2016-03-07 16:19:08.000000000 +0200 -+++ seabios-1.9.2.fix/Makefile 2016-11-02 17:50:07.418748334 +0200 -@@ -62,7 +62,7 @@ - -minline-all-stringops -fomit-frame-pointer \ - -freg-struct-return -ffreestanding -fno-delete-null-pointer-checks \ - -ffunction-sections -fdata-sections -fno-common -fno-merge-constants --COMMONCFLAGS += $(call cc-option,$(CC),-nopie,) -+COMMONCFLAGS += $(call cc-option,$(CC),-no-pie -fno-pic,) - 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,) |