Skip to contentSkip to conversation

seabios: uprev to 1.9.0

PATCH In review Chris Patterson 3 participants 8 messages Dec 22, 2015 – Jan 1, 2016

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/5 seabios: uprev to 1.9.0

SeaBIOS 1.7.5 fails to compile on newer gcc, so update it! :)

Also removing PR while I'm here.

---
 recipes-extended/seabios/seabios_1.7.5.bb |   45 -----------------------------
 recipes-extended/seabios/seabios_1.9.0.bb |   43 +++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 45 deletions(-)
 delete mode 100644 recipes-extended/seabios/seabios_1.7.5.bb
 create mode 100644 recipes-extended/seabios/seabios_1.9.0.bb
recipes-extended/seabios/seabios_1.7.5.bb deleted +0 -45
deleted file mode 100644
index d57e250..0000000
@@ -1,45 +0,0 @@
-DESCRIPTION = "SeaBIOS"
-HOMEPAGE = "http://www.coreboot.org/SeaBIOS"
-LICENSE = "LGPLv3"
-SECTION = "firmware"
-
-SRC_URI = " \
-    http://code.coreboot.org/p/seabios/downloads/get/${PN}-${PV}.tar.gz \
-    file://hostcc.patch \
-    file://defconfig \
-    "
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504         \
-                    file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6  \
-                    "
-
-SRC_URI[md5sum] = "3f1e17485ca327b245ae5938d9aa02d9"
-SRC_URI[sha256sum] = "858d9eda4ad91efa1c45a5a401d560ef9ca8dd172f03b0a106f06661c252dc51"
-
-PR = "r0"
-
-FILES_${PN} = "/usr/share/firmware"
-
-DEPENDS = "util-linux-native file-native bison-native flex-native gettext-native iasl-native python-native"
-
-TUNE_CCARGS = ""
-EXTRA_OEMAKE += "HOSTCC='${BUILD_CC}'"
-EXTRA_OEMAKE += "CROSS_PREFIX=${TARGET_PREFIX}"
-
-do_configure() {
-    install -m 0644 "${WORKDIR}/defconfig" .config
-    oe_runmake oldconfig
-}
-
-do_compile() {
-    unset CPP
-    unset CPPFLAGS
-    oe_runmake
-}
-
-do_install() {
-    oe_runmake
-    install -d ${D}/usr/share/firmware
-    install -m 0644 out/bios.bin ${D}/usr/share/firmware/
-}
-
recipes-extended/seabios/seabios_1.9.0.bb new file +43 -0

43 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#1 lore raw

PATCH v2 2/5 xen: empty out rdepends for xen-dev to lose QA warning

It appears that it defaults to rdepend on xen, causing a QA error:
WARNING: QA Issue: xen-dev rdepends on xen,
but it isn't a build dependency? [build-deps]

---
 recipes-extended/xen/xen.inc |    2 ++
 1 file changed, 2 insertions(+)
recipes-extended/xen/xen.inc +2 -0
index 00f1823..d1f5a1b 100644
@@ -78,6 +78,8 @@ RDEPENDS_${PN}-base = "\
     ${PN}-xl \
     "
 
+RDEPENDS_${PN}-dev = ""
+
 RRECOMMENDS_${PN}-base = " \
     ${PN}-libblktap \
     ${PN}-flask \
Signature · 1 line
1.7.10.4
#2 lore raw

Re: [PATCH v2 2/5] xen: empty out rdepends for xen-dev to lose QA warning

I've merged the entire v2 series.

Bruce

Quoted 31 lines · Chris Patterson

It appears that it defaults to rdepend on xen, causing a QA error:
WARNING: QA Issue: xen-dev rdepends on xen,
but it isn't a build dependency? [build-deps]

---
 recipes-extended/xen/xen.inc |    2 ++
 1 file changed, 2 insertions(+)
recipes-extended/xen/xen.inc +2 -1
index 00f1823..d1f5a1b 100644
@@ -78,6 +78,8 @@ RDEPENDS_${PN}-base = "\
     ${PN}-xl \
     "
 
+RDEPENDS_${PN}-dev = ""
+
 RRECOMMENDS_${PN}-base = " \
     ${PN}-libblktap \
     ${PN}-flask \
--

1.7.10.4

--
_______________________________________________
meta-virtualization mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-virtualization

Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"
#3 lore raw

PATCH v2 3/5 xen: add support for files added with Xen 4.6

In reply to Chris Patterson

From: Doug Goldstein <[email protected]>

Xen 4.6 dropped udev support and has instead switched to their own 'devd' daemon run by the xl command. There is a SysV init script provided with it but no systemd service file.

---
 recipes-extended/xen/xen.inc |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
recipes-extended/xen/xen.inc +11 -1
index d1f5a1b..1ac033f 100644
@@ -87,6 +87,10 @@ RRECOMMENDS_${PN}-base = " \
     ${PN}-xenpaging \
     "
 
+RDEPENDS_${PN}-devd = " \
+    ${PN}-xl \
+    "
+
 RDEPENDS_${PN}-fsimage = " \
     libext2fs \
     "
@@ -328,6 +332,10 @@ FILES_${PN}-console = "\
     ${sbindir}/xenconsoled \
     "
 
+FILES_${PN}-devd = "\
+    ${sysconfdir}/init.d/xendriverdomain \
+    "
+
 FILES_${PN}-flask = "\
     ${sbindir}/flask-get-bool \
     ${sbindir}/flask-getenforce \
@@ -648,7 +656,7 @@ FILES_${PN}-xendomains += "\
     "
 
 # configure init.d scripts
-INITSCRIPT_PACKAGES = "${PN}-xend ${PN}-xencommons ${PN}-xen-watchdog ${PN}-xendomains"
+INITSCRIPT_PACKAGES = "${PN}-xend ${PN}-xencommons ${PN}-xen-watchdog ${PN}-xendomains ${PN}-devd"
 INITSCRIPT_NAME_${PN}-xencommons = "xencommons"
 INITSCRIPT_PARAMS_${PN}-xencommons = "defaults 80"
 INITSCRIPT_NAME_${PN}-xen-watchdog = "xen-watchdog"
@@ -657,6 +665,8 @@ INITSCRIPT_NAME_${PN}-xend = "xend"
 INITSCRIPT_PARAMS_${PN}-xend = "defaults 82"
 INITSCRIPT_NAME_${PN}-xendomains = "xendomains"
 INITSCRIPT_PARAMS_${PN}-xendomains = "defaults 83"
+INITSCRIPT_NAME_${PN}-devd = "xendriverdomain"
+INITSCRIPT_PARAMS_${PN}-devd = "defaults 82"
 
 # systemd packages
 SYSTEMD_PACKAGES = "${PN}-xen-watchdog ${PN}-xencommons ${PN}-xendomains"
Signature · 1 line
1.7.10.4
#4 lore raw

PATCH v2 4/5 xen: drop unnecessary variable modifications

In reply to Chris Patterson

From: Doug Goldstein <[email protected]>

These variable modifications are necessary so that Yocto can supply --sysroot. The other variables are unmodified so there's no reason to modify them.

---
 recipes-extended/xen/xen_4.5.0.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-extended/xen/xen_4.5.0.bb +1 -1
index 6c17b90..7f791cc 100644
@@ -29,7 +29,7 @@ EXTRA_OEMAKE += "ETHERBOOT_ROMS=${STAGING_DIR_HOST}/usr/share/firmware/rtl8139.r
 
 do_configure_prepend() {
     # fixup AS/CC/CCP/etc variable within StdGNU.mk
-    for i in AS LD CC CPP AR RANLIB NM STRIP OBJCOPY OBJDUMP; do
+    for i in LD CC CPP CXX; do
         sed -i "s/^\($i\s\s*\).*=/\1?=/" ${S}/config/StdGNU.mk
     done
     # fixup environment passing in some makefiles
Signature · 1 line
1.7.10.4
#5 lore raw

PATCH v2 5/5 xen: uprev to 4.6.0

In reply to Chris Patterson

- Update LICENSE checksum.
- Drop udev package that has been removed
(replaced with xl devd / xendriverdomain)

---
 recipes-extended/xen/xen.inc      |   13 +---------
 recipes-extended/xen/xen_4.5.0.bb |   50 -------------------------------------
 recipes-extended/xen/xen_4.6.0.bb |   50 +++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 62 deletions(-)
 delete mode 100644 recipes-extended/xen/xen_4.5.0.bb
 create mode 100644 recipes-extended/xen/xen_4.6.0.bb
recipes-extended/xen/xen.inc +1 -12
index 1ac033f..74a67de 100644
@@ -3,7 +3,7 @@ HOMEPAGE = "http://xen.org"
 LICENSE = "GPLv2"
 SECTION = "console/tools"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=e0f0f3ac55608719a82394cc353928df"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a6260c12cd5de27e80d89ae18e48d20a"
 
 COMPATIBLE_HOST = '(x86_64.*).*-linux|aarch64.*-linux'
 
@@ -69,7 +69,6 @@ RDEPENDS_${PN}-base = "\
     ${PN}-fsimage \
     ${PN}-scripts-block \
     ${PN}-scripts-network \
-    ${PN}-udev \
     ${PN}-xen-watchdog \
     ${PN}-xencommons \
     ${PN}-xendomains \
@@ -105,7 +104,6 @@ RDEPENDS_${PN}-remus = "python"
 RDEPENDS_${PN}-scripts-block = "\
     bash \
     ${PN}-scripts-common \
-    ${PN}-udev \
     ${PN}-volatiles \
     "
 
@@ -115,12 +113,9 @@ RDEPENDS_${PN}-scripts-network = "\
     bash \
     bridge-utils \
     ${PN}-scripts-common \
-    ${PN}-udev \
     ${PN}-volatiles \
     "
 
-RDEPENDS_${PN}-udev = "udev"
-
 RDEPENDS_${PN}-xencommons = "\
     bash \
     ${PN}-console \
@@ -188,7 +183,6 @@ PACKAGES = "\
     ${PN}-scripts-common \
     ${PN}-scripts-network \
     ${PN}-staticdev \
-    ${PN}-udev \
     ${PN}-volatiles \
     ${PN}-xcutils \
     ${PN}-xencommons \
@@ -522,11 +516,6 @@ FILES_${PN}-scripts-common = " \
     ${sysconfdir}/xen/scripts/xen-script-common.sh \
     "
 
-FILES_${PN}-udev = "\
-    ${sysconfdir}/udev/rules.d/xen-backend.rules \
-    ${sysconfdir}/udev/rules.d/xend.rules \
-    "
-
 FILES_${PN}-volatiles = "\
     ${sysconfdir}/default/volatiles/99_xen \
     ${sysconfdir}/tmpfiles.d/xen.conf \
recipes-extended/xen/xen_4.5.0.bb deleted +0 -50

50 lines not on this page · raw message

recipes-extended/xen/xen_4.6.0.bb new file +50 -0

50 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#6 lore raw
In reply to Chris Patterson
Quoted 103 lines · Chris Patterson

SeaBIOS 1.7.5 fails to compile on newer gcc, so update it! :)

Also removing PR while I'm here.

---
 recipes-extended/seabios/seabios_1.7.5.bb |   45 -----------------------------
 recipes-extended/seabios/seabios_1.9.0.bb |   43 +++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 45 deletions(-)
 delete mode 100644 recipes-extended/seabios/seabios_1.7.5.bb
 create mode 100644 recipes-extended/seabios/seabios_1.9.0.bb
recipes-extended/seabios/seabios_1.7.5.bb deleted +0 -45
deleted file mode 100644
index d57e250..0000000
@@ -1,45 +0,0 @@
-DESCRIPTION = "SeaBIOS"
-HOMEPAGE = "http://www.coreboot.org/SeaBIOS"
-LICENSE = "LGPLv3"
-SECTION = "firmware"
-
-SRC_URI = " \
-    http://code.coreboot.org/p/seabios/downloads/get/${PN}-${PV}.tar.gz \
-    file://hostcc.patch \
-    file://defconfig \
-    "
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504         \
-                    file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6  \
-                    "
-
-SRC_URI[md5sum] = "3f1e17485ca327b245ae5938d9aa02d9"
-SRC_URI[sha256sum] = "858d9eda4ad91efa1c45a5a401d560ef9ca8dd172f03b0a106f06661c252dc51"
-
-PR = "r0"
-
-FILES_${PN} = "/usr/share/firmware"
-
-DEPENDS = "util-linux-native file-native bison-native flex-native gettext-native iasl-native python-native"
-
-TUNE_CCARGS = ""
-EXTRA_OEMAKE += "HOSTCC='${BUILD_CC}'"
-EXTRA_OEMAKE += "CROSS_PREFIX=${TARGET_PREFIX}"
-
-do_configure() {
-    install -m 0644 "${WORKDIR}/defconfig" .config
-    oe_runmake oldconfig
-}
-
-do_compile() {
-    unset CPP
-    unset CPPFLAGS
-    oe_runmake
-}
-
-do_install() {
-    oe_runmake
-    install -d ${D}/usr/share/firmware
-    install -m 0644 out/bios.bin ${D}/usr/share/firmware/
-}
-
recipes-extended/seabios/seabios_1.9.0.bb new file +33 -0
new file mode 100644
index 0000000..fcdc0c5
@@ -0,0 +1,43 @@
+DESCRIPTION = "SeaBIOS"
+HOMEPAGE = "http://www.coreboot.org/SeaBIOS"
+LICENSE = "LGPLv3"
+SECTION = "firmware"
+
+SRC_URI = " \
+    http://code.coreboot.org/p/seabios/downloads/get/${PN}-${PV}.tar.gz \
+    file://hostcc.patch \
+    file://defconfig \
+    "
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504         \
+                    file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6  \
+                    "
+
+SRC_URI[md5sum] = "c3fea87e731e396bd4e7e2c478ba39d9"
+SRC_URI[sha256sum] = "88595545c6d580a7a6da1c40befc46dd74c0e4aaf808547867dd7ce8cc3b4d0e"
+
+FILES_${PN} = "/usr/share/firmware"
+
+DEPENDS = "util-linux-native file-native bison-native flex-native gettext-native iasl-native python-native"
+
+TUNE_CCARGS = ""
+EXTRA_OEMAKE += "HOSTCC='${BUILD_CC}'"
+EXTRA_OEMAKE += "CROSS_PREFIX=${TARGET_PREFIX}"
+
+do_configure() {
+    install -m 0644 "${WORKDIR}/defconfig" .config
+    oe_runmake oldconfig
+}
+
+do_compile() {
+    unset CPP

recipes-extended/seabios/seabios_1.9.0.bb line 43

Quoted 10 lines
recipes-extended/seabios/seabios_1.9.0.bb new file +10 -0
+    unset CPPFLAGS
+    oe_runmake
+}
+
+do_install() {
+    oe_runmake
+    install -d ${D}/usr/share/firmware
+    install -m 0644 out/bios.bin ${D}/usr/share/firmware/
+}
+

Only question would be did something need to change in defconfig with 1.9.0 for Xen?

Signature · 1 line
Doug Goldstein
#7 lore raw
Quoted 3 lines

Only question would be did something need to change in defconfig with 1.9.0 for Xen?

Sorry about the delay, I have been away on vacation. :)

Yes, there should be some defconfig changes. I will submit a patch shortly to remove the included defconfig and instead build using 'make defconfig' (it's the approach upstream Xen has used since 4.5, so it appears to be the ideal route).

Thanks!