* [PATCH 1/2] vgabios: upgrade to 0.8a and cleanup recipe
@ 2022-04-29 12:11 Ross Burton
2022-04-29 12:11 ` [PATCH 2/2] xen: use vgabios 0.8a Ross Burton
2022-05-02 18:08 ` [meta-virtualization] [PATCH 1/2] vgabios: upgrade to 0.8a and cleanup recipe Bruce Ashfield
0 siblings, 2 replies; 3+ messages in thread
From: Ross Burton @ 2022-04-29 12:11 UTC (permalink / raw)
To: meta-virtualization; +Cc: nd
Upgrade to 0.8a.
License checksum updated as the FSF street address changed.
Apply a patch to use the correct host compiler when building biossums,
removing the need for a separate biossums-native recipe.
Don't hardcode /usr/share, use ${datadir}.
Install all found firmware (including the new Banshee BIOS in 0.8a) and
the debug files which were not installed but intended to be packaged.
Remove redundant PR and S assignments, as these are the default values.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
recipes-extended/vgabios/biossums_0.7a.bb | 37 -------------------
recipes-extended/vgabios/files/build-cc.patch | 30 +++++++++++++++
recipes-extended/vgabios/vgabios_0.7a.bb | 33 -----------------
recipes-extended/vgabios/vgabios_0.8a.bb | 25 +++++++++++++
4 files changed, 55 insertions(+), 70 deletions(-)
delete mode 100644 recipes-extended/vgabios/biossums_0.7a.bb
create mode 100644 recipes-extended/vgabios/files/build-cc.patch
delete mode 100644 recipes-extended/vgabios/vgabios_0.7a.bb
create mode 100644 recipes-extended/vgabios/vgabios_0.8a.bb
diff --git a/recipes-extended/vgabios/biossums_0.7a.bb b/recipes-extended/vgabios/biossums_0.7a.bb
deleted file mode 100644
index 95483ff..0000000
--- a/recipes-extended/vgabios/biossums_0.7a.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-DESCRIPTION = "biossums tool for building Plex86/Bochs LGPL VGABios"
-HOMEPAGE = "http://www.nongnu.org/vgabios/"
-LICENSE = "LGPL-2.1-only"
-SECTION = "firmware"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589"
-
-SRC_URI = "http://savannah.gnu.org/download/vgabios/vgabios-${PV}.tgz"
-
-SRC_URI[md5sum] = "2c0fe5c0ca08082a9293e3a7b23dc900"
-SRC_URI[sha256sum] = "9d24c33d4bfb7831e2069cf3644936a53ef3de21d467872b54ce2ea30881b865"
-
-BBCLASSEXTEND = "native"
-
-FILES:${PN} = "${bindir}/biossums"
-
-S = "${WORKDIR}/vgabios-${PV}"
-
-do_configure() {
- # Don't override the compiler or its flags:
- sed 's,^CC,DISABLED_CC,' -i Makefile
- sed 's,^CFLAGS,DISABLED_CFLAGS,' -i Makefile
- sed 's,^LDFLAGS,DISABLED_LDFLAGS,' -i Makefile
- # Supply the C flags to the compiler:
- sed 's,-o biossums,$(CFLAGS) -o biossums,' -i Makefile
-}
-
-do_compile() {
- # clean removes binaries distributed with source
- oe_runmake clean
- oe_runmake biossums
-}
-
-do_install() {
- mkdir -p "${D}${bindir}"
- install -m 0755 biossums "${D}${bindir}"
-}
diff --git a/recipes-extended/vgabios/files/build-cc.patch b/recipes-extended/vgabios/files/build-cc.patch
new file mode 100644
index 0000000..b64e5ef
--- /dev/null
+++ b/recipes-extended/vgabios/files/build-cc.patch
@@ -0,0 +1,30 @@
+Use the host compiler to build the tools we need at runtime.
+
+Upstream-Status: Pending
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+Index: Makefile
+===================================================================
+--- a/Makefile (revision 298)
++++ b/Makefile (working copy)
+@@ -5,6 +5,7 @@
+ SHELL = /bin/sh
+
+ CC = gcc
++HOSTCC = gcc
+ CFLAGS = -g -O2 -Wall -Wstrict-prototypes
+ LDFLAGS =
+
+@@ -79,10 +80,10 @@
+ tar czvf ../$(RELEASE).tgz --exclude .svn -C .. $(RELEASE)/
+
+ biossums: biossums.c
+- $(CC) -o biossums biossums.c
++ $(HOSTCC) -o biossums biossums.c
+
+ vbetables-gen: vbetables-gen.c
+- $(CC) -o vbetables-gen vbetables-gen.c
++ $(HOSTCC) -o vbetables-gen vbetables-gen.c
+
+ vbetables.h: vbetables-gen
+ ./vbetables-gen > $@
diff --git a/recipes-extended/vgabios/vgabios_0.7a.bb b/recipes-extended/vgabios/vgabios_0.7a.bb
deleted file mode 100644
index f443aed..0000000
--- a/recipes-extended/vgabios/vgabios_0.7a.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION = "Plex86/Bochs LGPL VGABios"
-HOMEPAGE = "http://www.nongnu.org/vgabios/"
-LICENSE = "LGPL-2.1-only"
-SECTION = "firmware"
-
-DEPENDS = "dev86-native biossums-native"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589"
-
-SRC_URI = "http://savannah.gnu.org/download/vgabios/${BPN}-${PV}.tgz"
-
-SRC_URI[md5sum] = "2c0fe5c0ca08082a9293e3a7b23dc900"
-SRC_URI[sha256sum] = "9d24c33d4bfb7831e2069cf3644936a53ef3de21d467872b54ce2ea30881b865"
-
-PR = "r0"
-
-FILES:${PN} = "/usr/share/firmware/${PN}-${PV}*.bin"
-FILES:${PN}-dbg = "/usr/share/firmware/${PN}-${PV}*.debug.bin"
-
-S = "${WORKDIR}/${PN}-${PV}"
-
-do_configure() {
- # Override to use the native-built biossums tool:
- sed 's,./biossums,biossums,' -i Makefile
- sed 's,$(CC) -o biossums biossums.c,touch biossums,' -i Makefile
-}
-
-do_install() {
- install -d ${D}/usr/share/firmware
- install -m 0644 VGABIOS-lgpl-latest.bin ${D}/usr/share/firmware/${PN}-${PV}.bin
- install -m 0644 VGABIOS-lgpl-latest.cirrus.bin ${D}/usr/share/firmware/${PN}-${PV}.cirrus.bin
-}
-
diff --git a/recipes-extended/vgabios/vgabios_0.8a.bb b/recipes-extended/vgabios/vgabios_0.8a.bb
new file mode 100644
index 0000000..044bb4e
--- /dev/null
+++ b/recipes-extended/vgabios/vgabios_0.8a.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Plex86/Bochs LGPL VGABios"
+HOMEPAGE = "http://www.nongnu.org/vgabios/"
+LICENSE = "LGPL-2.1-only"
+SECTION = "firmware"
+
+DEPENDS = "dev86-native"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=fae731a3adbc92fd8bb1730d1f2455bc"
+
+SRC_URI = "http://savannah.gnu.org/download/vgabios/${BP}.tgz \
+ file://build-cc.patch"
+SRC_URI[sha256sum] = "481042240ef0f1c918780c92a6bb42ad4d3f5d989b29502fa7ee7faf13a041b9"
+
+EXTRA_OEMAKE = "HOSTCC="${BUILD_CC}""
+
+do_install() {
+ install -d ${D}${datadir}/firmware
+ for file in VGABIOS*.bin; do
+ target=$(echo $file | sed s/VGABIOS-lgpl-latest/${BP}/)
+ install -m0644 $file ${D}${datadir}/firmware/$target
+ done
+}
+
+FILES:${PN} = "${datadir}/firmware/${BP}*.bin"
+FILES:${PN}-dbg = "${datadir}/firmware/${BP}*.debug.bin"
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] xen: use vgabios 0.8a
2022-04-29 12:11 [PATCH 1/2] vgabios: upgrade to 0.8a and cleanup recipe Ross Burton
@ 2022-04-29 12:11 ` Ross Burton
2022-05-02 18:08 ` [meta-virtualization] [PATCH 1/2] vgabios: upgrade to 0.8a and cleanup recipe Bruce Ashfield
1 sibling, 0 replies; 3+ messages in thread
From: Ross Burton @ 2022-04-29 12:11 UTC (permalink / raw)
To: meta-virtualization; +Cc: nd
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
recipes-extended/xen/xen.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
index 8b86de5..bb7bdb8 100644
--- a/recipes-extended/xen/xen.inc
+++ b/recipes-extended/xen/xen.inc
@@ -135,8 +135,8 @@ EXTRA_OECONF += " \
${@bb.utils.contains('XEN_TARGET_ARCH', 'x86_64', '--enable-pvshim', '--disable-pvshim', d)} \
"
-EXTRA_OEMAKE += "STDVGA_ROM=${STAGING_DIR_HOST}/usr/share/firmware/vgabios-0.7a.bin"
-EXTRA_OEMAKE += "CIRRUSVGA_ROM=${STAGING_DIR_HOST}/usr/share/firmware/vgabios-0.7a.cirrus.bin"
+EXTRA_OEMAKE += "STDVGA_ROM=${STAGING_DIR_HOST}/usr/share/firmware/vgabios-0.8a.bin"
+EXTRA_OEMAKE += "CIRRUSVGA_ROM=${STAGING_DIR_HOST}/usr/share/firmware/vgabios-0.8a.cirrus.bin"
EXTRA_OEMAKE += "SEABIOS_ROM=${STAGING_DIR_HOST}/usr/share/firmware/bios.bin"
EXTRA_OEMAKE += "ETHERBOOT_ROMS=${STAGING_DIR_HOST}/usr/share/firmware/rtl8139.rom"
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [meta-virtualization] [PATCH 1/2] vgabios: upgrade to 0.8a and cleanup recipe
2022-04-29 12:11 [PATCH 1/2] vgabios: upgrade to 0.8a and cleanup recipe Ross Burton
2022-04-29 12:11 ` [PATCH 2/2] xen: use vgabios 0.8a Ross Burton
@ 2022-05-02 18:08 ` Bruce Ashfield
1 sibling, 0 replies; 3+ messages in thread
From: Bruce Ashfield @ 2022-05-02 18:08 UTC (permalink / raw)
To: Ross Burton; +Cc: meta-virtualization, nd
both patches are merged.
Bruce
In message: [meta-virtualization] [PATCH 1/2] vgabios: upgrade to 0.8a and cleanup recipe
on 29/04/2022 Ross Burton wrote:
> Upgrade to 0.8a.
>
> License checksum updated as the FSF street address changed.
>
> Apply a patch to use the correct host compiler when building biossums,
> removing the need for a separate biossums-native recipe.
>
> Don't hardcode /usr/share, use ${datadir}.
>
> Install all found firmware (including the new Banshee BIOS in 0.8a) and
> the debug files which were not installed but intended to be packaged.
>
> Remove redundant PR and S assignments, as these are the default values.
>
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
> recipes-extended/vgabios/biossums_0.7a.bb | 37 -------------------
> recipes-extended/vgabios/files/build-cc.patch | 30 +++++++++++++++
> recipes-extended/vgabios/vgabios_0.7a.bb | 33 -----------------
> recipes-extended/vgabios/vgabios_0.8a.bb | 25 +++++++++++++
> 4 files changed, 55 insertions(+), 70 deletions(-)
> delete mode 100644 recipes-extended/vgabios/biossums_0.7a.bb
> create mode 100644 recipes-extended/vgabios/files/build-cc.patch
> delete mode 100644 recipes-extended/vgabios/vgabios_0.7a.bb
> create mode 100644 recipes-extended/vgabios/vgabios_0.8a.bb
>
> diff --git a/recipes-extended/vgabios/biossums_0.7a.bb b/recipes-extended/vgabios/biossums_0.7a.bb
> deleted file mode 100644
> index 95483ff..0000000
> --- a/recipes-extended/vgabios/biossums_0.7a.bb
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -DESCRIPTION = "biossums tool for building Plex86/Bochs LGPL VGABios"
> -HOMEPAGE = "http://www.nongnu.org/vgabios/"
> -LICENSE = "LGPL-2.1-only"
> -SECTION = "firmware"
> -
> -LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589"
> -
> -SRC_URI = "http://savannah.gnu.org/download/vgabios/vgabios-${PV}.tgz"
> -
> -SRC_URI[md5sum] = "2c0fe5c0ca08082a9293e3a7b23dc900"
> -SRC_URI[sha256sum] = "9d24c33d4bfb7831e2069cf3644936a53ef3de21d467872b54ce2ea30881b865"
> -
> -BBCLASSEXTEND = "native"
> -
> -FILES:${PN} = "${bindir}/biossums"
> -
> -S = "${WORKDIR}/vgabios-${PV}"
> -
> -do_configure() {
> - # Don't override the compiler or its flags:
> - sed 's,^CC,DISABLED_CC,' -i Makefile
> - sed 's,^CFLAGS,DISABLED_CFLAGS,' -i Makefile
> - sed 's,^LDFLAGS,DISABLED_LDFLAGS,' -i Makefile
> - # Supply the C flags to the compiler:
> - sed 's,-o biossums,$(CFLAGS) -o biossums,' -i Makefile
> -}
> -
> -do_compile() {
> - # clean removes binaries distributed with source
> - oe_runmake clean
> - oe_runmake biossums
> -}
> -
> -do_install() {
> - mkdir -p "${D}${bindir}"
> - install -m 0755 biossums "${D}${bindir}"
> -}
> diff --git a/recipes-extended/vgabios/files/build-cc.patch b/recipes-extended/vgabios/files/build-cc.patch
> new file mode 100644
> index 0000000..b64e5ef
> --- /dev/null
> +++ b/recipes-extended/vgabios/files/build-cc.patch
> @@ -0,0 +1,30 @@
> +Use the host compiler to build the tools we need at runtime.
> +
> +Upstream-Status: Pending
> +Signed-off-by: Ross Burton <ross.burton@arm.com>
> +
> +Index: Makefile
> +===================================================================
> +--- a/Makefile (revision 298)
> ++++ b/Makefile (working copy)
> +@@ -5,6 +5,7 @@
> + SHELL = /bin/sh
> +
> + CC = gcc
> ++HOSTCC = gcc
> + CFLAGS = -g -O2 -Wall -Wstrict-prototypes
> + LDFLAGS =
> +
> +@@ -79,10 +80,10 @@
> + tar czvf ../$(RELEASE).tgz --exclude .svn -C .. $(RELEASE)/
> +
> + biossums: biossums.c
> +- $(CC) -o biossums biossums.c
> ++ $(HOSTCC) -o biossums biossums.c
> +
> + vbetables-gen: vbetables-gen.c
> +- $(CC) -o vbetables-gen vbetables-gen.c
> ++ $(HOSTCC) -o vbetables-gen vbetables-gen.c
> +
> + vbetables.h: vbetables-gen
> + ./vbetables-gen > $@
> diff --git a/recipes-extended/vgabios/vgabios_0.7a.bb b/recipes-extended/vgabios/vgabios_0.7a.bb
> deleted file mode 100644
> index f443aed..0000000
> --- a/recipes-extended/vgabios/vgabios_0.7a.bb
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -DESCRIPTION = "Plex86/Bochs LGPL VGABios"
> -HOMEPAGE = "http://www.nongnu.org/vgabios/"
> -LICENSE = "LGPL-2.1-only"
> -SECTION = "firmware"
> -
> -DEPENDS = "dev86-native biossums-native"
> -
> -LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589"
> -
> -SRC_URI = "http://savannah.gnu.org/download/vgabios/${BPN}-${PV}.tgz"
> -
> -SRC_URI[md5sum] = "2c0fe5c0ca08082a9293e3a7b23dc900"
> -SRC_URI[sha256sum] = "9d24c33d4bfb7831e2069cf3644936a53ef3de21d467872b54ce2ea30881b865"
> -
> -PR = "r0"
> -
> -FILES:${PN} = "/usr/share/firmware/${PN}-${PV}*.bin"
> -FILES:${PN}-dbg = "/usr/share/firmware/${PN}-${PV}*.debug.bin"
> -
> -S = "${WORKDIR}/${PN}-${PV}"
> -
> -do_configure() {
> - # Override to use the native-built biossums tool:
> - sed 's,./biossums,biossums,' -i Makefile
> - sed 's,$(CC) -o biossums biossums.c,touch biossums,' -i Makefile
> -}
> -
> -do_install() {
> - install -d ${D}/usr/share/firmware
> - install -m 0644 VGABIOS-lgpl-latest.bin ${D}/usr/share/firmware/${PN}-${PV}.bin
> - install -m 0644 VGABIOS-lgpl-latest.cirrus.bin ${D}/usr/share/firmware/${PN}-${PV}.cirrus.bin
> -}
> -
> diff --git a/recipes-extended/vgabios/vgabios_0.8a.bb b/recipes-extended/vgabios/vgabios_0.8a.bb
> new file mode 100644
> index 0000000..044bb4e
> --- /dev/null
> +++ b/recipes-extended/vgabios/vgabios_0.8a.bb
> @@ -0,0 +1,25 @@
> +DESCRIPTION = "Plex86/Bochs LGPL VGABios"
> +HOMEPAGE = "http://www.nongnu.org/vgabios/"
> +LICENSE = "LGPL-2.1-only"
> +SECTION = "firmware"
> +
> +DEPENDS = "dev86-native"
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=fae731a3adbc92fd8bb1730d1f2455bc"
> +
> +SRC_URI = "http://savannah.gnu.org/download/vgabios/${BP}.tgz \
> + file://build-cc.patch"
> +SRC_URI[sha256sum] = "481042240ef0f1c918780c92a6bb42ad4d3f5d989b29502fa7ee7faf13a041b9"
> +
> +EXTRA_OEMAKE = "HOSTCC="${BUILD_CC}""
> +
> +do_install() {
> + install -d ${D}${datadir}/firmware
> + for file in VGABIOS*.bin; do
> + target=$(echo $file | sed s/VGABIOS-lgpl-latest/${BP}/)
> + install -m0644 $file ${D}${datadir}/firmware/$target
> + done
> +}
> +
> +FILES:${PN} = "${datadir}/firmware/${BP}*.bin"
> +FILES:${PN}-dbg = "${datadir}/firmware/${BP}*.debug.bin"
> --
> 2.25.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#7230): https://lists.yoctoproject.org/g/meta-virtualization/message/7230
> Mute This Topic: https://lists.yoctoproject.org/mt/90774353/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-05-02 18:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-29 12:11 [PATCH 1/2] vgabios: upgrade to 0.8a and cleanup recipe Ross Burton
2022-04-29 12:11 ` [PATCH 2/2] xen: use vgabios 0.8a Ross Burton
2022-05-02 18:08 ` [meta-virtualization] [PATCH 1/2] vgabios: upgrade to 0.8a and cleanup recipe Bruce Ashfield
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.