[arch-commits] Commit in seabios/trunk (10 files)
Tobias Powalowski
tpowa at nymeria.archlinux.org
Tue Jun 17 15:39:07 UTC 2014
Date: Tuesday, June 17, 2014 @ 17:39:07
Author: tpowa
Revision: 215251
upgpkg: seabios 1.7.5-2
#40590 make seabios complete and remove conflicting files from qemu package
Added:
seabios/trunk/config.coreboot
seabios/trunk/config.csm
seabios/trunk/config.seabios-128k
seabios/trunk/config.seabios-256k
seabios/trunk/config.vga.cirrus
seabios/trunk/config.vga.isavga
seabios/trunk/config.vga.qxl
seabios/trunk/config.vga.stdvga
seabios/trunk/config.vga.vmware
Modified:
seabios/trunk/PKGBUILD
---------------------+
PKGBUILD | 60 +++++++++++++++++++++++++++++++++++++++++++++-----
config.coreboot | 2 +
config.csm | 2 +
config.seabios-128k | 7 +++++
config.seabios-256k | 3 ++
config.vga.cirrus | 3 ++
config.vga.isavga | 3 ++
config.vga.qxl | 6 +++++
config.vga.stdvga | 3 ++
config.vga.vmware | 6 +++++
10 files changed, 89 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-06-17 12:06:26 UTC (rev 215250)
+++ PKGBUILD 2014-06-17 15:39:07 UTC (rev 215251)
@@ -3,7 +3,7 @@
pkgname=seabios
pkgver=1.7.5
-pkgrel=1
+pkgrel=2
pkgdesc="A 16-bit x86 bios"
arch=('any')
url="http://www.coreboot.org/SeaBIOS"
@@ -10,19 +10,67 @@
license=('GPL3' 'LGPL3')
makedepends=('iasl' 'python2' 'inetutils')
options=('!makeflags' '!strip')
-source=(http://code.coreboot.org/p/seabios/downloads/get/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('1ee607f720b848fa7a968741151991b645979f7e')
+source=(http://code.coreboot.org/p/seabios/downloads/get/${pkgname}-${pkgver}.tar.gz
+ config.coreboot
+ config.seabios-128k
+ config.seabios-256k
+ config.vga.isavga
+ config.vga.stdvga
+ config.csm
+ config.vga.cirrus
+ config.vga.qxl
+ config.vga.vmware)
+sha1sums=('1ee607f720b848fa7a968741151991b645979f7e'
+ '5f2adb09c9006def1719b8cbd4792f14a7c7f7c9'
+ 'ca47a5bcab73dca8e6ff0d9c51f3f63fd2d2fd98'
+ '05b912a291994226049103cbe6754976cc03532d'
+ 'd56482f6ee0bf9633c551b10e99e24c74d9ece1e'
+ '54d4edf6eccf30883aedca348b9d2f125502fcdb'
+ '590739c1d5dc6cb63bdf311ee1cfbcde6c0ccc0f'
+ '84a44c04e74a09affae0d1a6e50800d10997108f'
+ '5a1316a0081f91acc300f57372de18fa9c67415e'
+ '5b017b16aec445df873618aaebd154aa97107148')
+# build routine from fedora
+build_bios() {
+ make clean distclean
+ cp $1 .config
+ make oldnoconfig V=1
+
+ make V=1 $4
+
+ cp out/$2 binaries/$3
+}
+
prepare() {
cd ${pkgname}-${pkgver}
+ rm -rf binaries
sed -i 's/python/python2/g' Makefile
+ mkdir binaries
}
build() {
- make -C ${pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
+ # seabios
+ 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
+ # seavgabios
+ for config in ${srcdir}/{config.vga.isavga,config.vga.stdvga,config.vga.cirrus,config.vga.qxl,config.vga.vmware}; do
+ name=${config#*config.vga.}
+ build_bios ${config} vgabios.bin vgabios-${name}.bin out/vgabios.bin
+ done
}
package() {
- install -Dm644 ${pkgname}-${pkgver}/out/bios.bin "${pkgdir}/usr/share/qemu/bios.bin"
- install -Dm644 ${pkgname}-${pkgver}/out/src/fw/*.aml "${pkgdir}/usr/share/qemu/"
+ cd ${pkgname}-${pkgver}
+ install -Dm644 binaries/bios.bin "${pkgdir}/usr/share/qemu/bios.bin"
+ install -Dm644 binaries/bios-256k.bin "${pkgdir}/usr/share/qemu/bios-256k.bin"
+ install -Dm644 binaries/bios-csm.bin "${pkgdir}/usr/share/qemu/bios-csm.bin"
+ install -Dm644 binaries/bios-coreboot.bin "${pkgdir}/usr/share/qemu/bios-coreboot.bin"
+ install -Dm644 binaries/*.aml "${pkgdir}/usr/share/qemu"
+ install -Dm644 binaries/vgabios*.bin "${pkgdir}/usr/share/qemu"
}
+
Added: config.coreboot
===================================================================
--- config.coreboot (rev 0)
+++ config.coreboot 2014-06-17 15:39:07 UTC (rev 215251)
@@ -0,0 +1,2 @@
+CONFIG_QEMU_HARDWARE=y
+CONFIG_COREBOOT=y
Added: config.csm
===================================================================
--- config.csm (rev 0)
+++ config.csm 2014-06-17 15:39:07 UTC (rev 215251)
@@ -0,0 +1,2 @@
+CONFIG_QEMU_HARDWARE=y
+CONFIG_CSM=y
Added: config.seabios-128k
===================================================================
--- config.seabios-128k (rev 0)
+++ config.seabios-128k 2014-06-17 15:39:07 UTC (rev 215251)
@@ -0,0 +1,7 @@
+# for qemu machine types 1.7 + older
+# need to turn off features (xhci) to make it fit into 128k
+CONFIG_QEMU=y
+CONFIG_ROM_SIZE=128
+CONFIG_XEN=n
+CONFIG_USB_XHCI=n
+CONFIG_USB_UAS=n
Added: config.seabios-256k
===================================================================
--- config.seabios-256k (rev 0)
+++ config.seabios-256k 2014-06-17 15:39:07 UTC (rev 215251)
@@ -0,0 +1,3 @@
+# for qemu machine types 2.0 + newer
+CONFIG_QEMU=y
+CONFIG_ROM_SIZE=256
Added: config.vga.cirrus
===================================================================
--- config.vga.cirrus (rev 0)
+++ config.vga.cirrus 2014-06-17 15:39:07 UTC (rev 215251)
@@ -0,0 +1,3 @@
+CONFIG_BUILD_VGABIOS=y
+CONFIG_VGA_CIRRUS=y
+CONFIG_VGA_PCI=y
Added: config.vga.isavga
===================================================================
--- config.vga.isavga (rev 0)
+++ config.vga.isavga 2014-06-17 15:39:07 UTC (rev 215251)
@@ -0,0 +1,3 @@
+CONFIG_BUILD_VGABIOS=y
+CONFIG_VGA_BOCHS=y
+CONFIG_VGA_PCI=n
Added: config.vga.qxl
===================================================================
--- config.vga.qxl (rev 0)
+++ config.vga.qxl 2014-06-17 15:39:07 UTC (rev 215251)
@@ -0,0 +1,6 @@
+CONFIG_BUILD_VGABIOS=y
+CONFIG_VGA_BOCHS=y
+CONFIG_VGA_PCI=y
+CONFIG_OVERRIDE_PCI_ID=y
+CONFIG_VGA_VID=0x1b36
+CONFIG_VGA_DID=0x0100
Added: config.vga.stdvga
===================================================================
--- config.vga.stdvga (rev 0)
+++ config.vga.stdvga 2014-06-17 15:39:07 UTC (rev 215251)
@@ -0,0 +1,3 @@
+CONFIG_BUILD_VGABIOS=y
+CONFIG_VGA_BOCHS=y
+CONFIG_VGA_PCI=y
Added: config.vga.vmware
===================================================================
--- config.vga.vmware (rev 0)
+++ config.vga.vmware 2014-06-17 15:39:07 UTC (rev 215251)
@@ -0,0 +1,6 @@
+CONFIG_BUILD_VGABIOS=y
+CONFIG_VGA_BOCHS=y
+CONFIG_VGA_PCI=y
+CONFIG_OVERRIDE_PCI_ID=y
+CONFIG_VGA_VID=0x15ad
+CONFIG_VGA_DID=0x0405
More information about the arch-commits
mailing list