[meta-virtualization (krogoth)][PATCH 1/5] xen: switch to updated download URL

[meta-virtualization (krogoth)][PATCH 1/5] xen: switch to updated download URL

[Doug Goldstein]

The Xen Project has changed the officially supported download URL to use
xenproject.org. This changes to the officially supported URLs.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
---
 recipes-extended/xen/xen_4.6.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-extended/xen/xen_4.6.1.bb b/recipes-extended/xen/xen_4.6.1.bb
index 0adf8ad..c3ba3c8 100644
--- a/recipes-extended/xen/xen_4.6.1.bb
+++ b/recipes-extended/xen/xen_4.6.1.bb
@@ -1,7 +1,7 @@
 require xen.inc
 
 SRC_URI = " \
-    http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \
+    https://downloads.xenproject.org/release/xen/${PV}/xen-${PV}.tar.gz \
     "
 
 SRC_URI[md5sum] = "df2d854c3c90ffeefaf71e7f868fb326"
-- 
2.10.2

[meta-virtualization (krogoth)][PATCH 2/5] xen: sync packages and fixes from master

[Doug Goldstein]

Sync the latest list of packages and installed files from master along
with a handful of compilation bug fixes.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
---
 recipes-extended/xen/xen.inc | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
index de8c168..429a05a 100644
--- a/recipes-extended/xen/xen.inc
+++ b/recipes-extended/xen/xen.inc
@@ -151,6 +151,7 @@ PACKAGES = "\
     ${PN}-base \
     ${PN}-blktap \
     ${PN}-console \
+    ${PN}-cpuid \
     ${PN}-dbg \
     ${PN}-dev \
     ${PN}-devd \
@@ -196,6 +197,7 @@ PACKAGES = "\
     ${PN}-libxenvchan-dev \
     ${PN}-libxlutil \
     ${PN}-libxlutil-dev \
+    ${PN}-livepatch \
     ${PN}-misc \
     ${PN}-pygrub \
     ${PN}-python \
@@ -369,6 +371,10 @@ FILES_${PN}-console = "\
     ${sbindir}/xenconsoled \
     "
 
+FILES_${PN}-cpuid = "\
+    ${bindir}/xen-cpuid \
+    "
+
 FILES_${PN}-devd = "\
     ${sysconfdir}/init.d/xendriverdomain \
     "
@@ -399,6 +405,10 @@ FILES_${PN}-kdd = "\
     ${sbindir}/kdd \
     "
 
+FILES_${PN}-livepatch += " \
+    ${sbindir}/xen-livepatch \
+    "
+
 FILES_${PN}-misc = "\
     ${bindir}/xencons \
     ${bindir}/xencov_split \
@@ -527,6 +537,7 @@ FILES_${PN}-remus = "\
     "
 
 FILES_${PN}-scripts-network = " \
+    ${sysconfdir}/xen/scripts/colo-proxy-setup \
     ${sysconfdir}/xen/scripts/network-bridge \
     ${sysconfdir}/xen/scripts/network-nat \
     ${sysconfdir}/xen/scripts/network-route \
@@ -544,6 +555,7 @@ FILES_${PN}-scripts-block = " \
     ${sysconfdir}/xen/scripts/blktap \
     ${sysconfdir}/xen/scripts/block \
     ${sysconfdir}/xen/scripts/block-common.sh \
+    ${sysconfdir}/xen/scripts/block-dummy \
     ${sysconfdir}/xen/scripts/block-enbd \
     ${sysconfdir}/xen/scripts/block-iscsi \
     ${sysconfdir}/xen/scripts/block-nbd \
@@ -667,6 +679,7 @@ FILES_${PN}-xm = "\
 FILES_${PN}-xencommons += "\
     ${sysconfdir}/default/xencommons \
     ${sysconfdir}/init.d/xencommons \
+    ${sysconfdir}/xen/scripts/launch-xenstore \
     ${systemd_unitdir}/modules-load.d/xen.conf \
     ${systemd_unitdir}/system/proc-xen.mount \
     ${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service \
@@ -744,9 +757,11 @@ export XEN_OS = "Linux"
 
 # this is used for the header (#!${bindir}/python) of the install python scripts
 export PYTHONPATH="${bindir}/python"
+export ac_cv_path_PYTHONPATH="${bindir}/python"
 
-# seabios forcefully sets HOSTCC to CC - fixup to allow it to build native conf executable
+# xen and seabios require HOSTCC and HOSTCXX set to cross-compile
 export HOSTCC="${BUILD_CC}"
+export HOSTCXX="${BUILD_CXX}"
 
 # make xen requires CROSS_COMPILE set by hand as it does not abide by ./configure
 export CROSS_COMPILE="${TARGET_PREFIX}"
@@ -837,6 +852,9 @@ do_configure() {
 }
 
 do_compile() {
+    # workaround for build bug when CFLAGS is exported
+    # https://www.mail-archive.com/xen-devel@lists.xen.org/msg67822.html
+    unset CFLAGS
     oe_runmake
 }
 
-- 
2.10.2

[meta-virtualization (krogoth)][PATCH 3/5] xen: add gnu-efi to DEPENDS

[Doug Goldstein]

Allow Xen to build the EFI loader by including the required dependency.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
---
 recipes-extended/xen/xen.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
index 429a05a..0d156dc 100644
--- a/recipes-extended/xen/xen.inc
+++ b/recipes-extended/xen/xen.inc
@@ -52,6 +52,7 @@ DEPENDS = " \
     xz \
     yajl \
     zlib \
+	gnu-efi \
     "
 
 # inherit setuptools adds python to RDEPENDS, override it
-- 
2.10.2

[meta-virtualization (krogoth)][PATCH 4/5] xen: make it easy to override hypervisor config

[Doug Goldstein]

The hypervisor is now configured with Kconfig like busybox and the
kernel. This makes Xen behave like the busybox recipe by taking a
defconfig if the user has one provided with a bbappend.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
---
 recipes-extended/xen/xen.inc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
index 0d156dc..38922dc 100644
--- a/recipes-extended/xen/xen.inc
+++ b/recipes-extended/xen/xen.inc
@@ -841,6 +841,9 @@ do_stubs() {
 
 addtask stubs after do_configure before do_compile
 
+# Allow all hypervisor settings in a defconfig
+EXTRA_OEMAKE += "XEN_CONFIG_EXPERT=y"
+
 do_configure() {
 
     #./configure --enable-xsmpolicy does not set XSM_ENABLE must be done manually
@@ -848,6 +851,11 @@ do_configure() {
         echo "XSM_ENABLE := y" > ${S}/.config
     fi
 
+    if [ -f "${WORKDIR}/defconfig" ]; then
+        cp "${WORKDIR}/defconfig" "${B}/xen/.config" || \
+        bbfatal "Unable to copy defconfig to .config"
+    fi
+
     # do configure
     oe_runconf
 }
-- 
2.10.2

[meta-virtualization (krogoth)][PATCH 5/5] xen: ensure we build release builds

[Doug Goldstein]

Don't build with asserts on. This is the default for release tarballs
but if someone bbappends patches in we should ensure they don't shoot
themselves.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
---
 recipes-extended/xen/xen.inc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
index 38922dc..d9490fe 100644
--- a/recipes-extended/xen/xen.inc
+++ b/recipes-extended/xen/xen.inc
@@ -843,6 +843,10 @@ addtask stubs after do_configure before do_compile
 
 # Allow all hypervisor settings in a defconfig
 EXTRA_OEMAKE += "XEN_CONFIG_EXPERT=y"
+# Build release versions always. Technically since we track release
+# tarballs this always happens but occasionally people pull in patches
+# from staging that reverts this
+EXTRA_OEMAKE += "debug=n"
 
 do_configure() {
 
-- 
2.10.2

Re: [meta-virtualization (krogoth)][PATCH 3/5] xen: add gnu-efi to DEPENDS

[Doug Goldstein]

[-- Attachment #1.1: Type: text/plain, Size: 748 bytes --]

On 1/2/17 10:47 PM, Doug Goldstein wrote:
> Allow Xen to build the EFI loader by including the required dependency.
> 
> Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
> ---
>  recipes-extended/xen/xen.inc | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
> index 429a05a..0d156dc 100644
> --- a/recipes-extended/xen/xen.inc
> +++ b/recipes-extended/xen/xen.inc
> @@ -52,6 +52,7 @@ DEPENDS = " \
>      xz \
>      yajl \
>      zlib \
> +	gnu-efi \
>      "
>  
>  # inherit setuptools adds python to RDEPENDS, override it
> 

I screwed up the whitespace. I can resend.

This patch should also be applied to morty and master.

-- 
Doug Goldstein


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 978 bytes --]

Re: [meta-virtualization (krogoth)][PATCH 4/5] xen: make it easy to override hypervisor config

[Doug Goldstein]

[-- Attachment #1.1: Type: text/plain, Size: 1306 bytes --]

On 1/2/17 10:47 PM, Doug Goldstein wrote:
> The hypervisor is now configured with Kconfig like busybox and the
> kernel. This makes Xen behave like the busybox recipe by taking a
> defconfig if the user has one provided with a bbappend.
> 
> Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
> ---
>  recipes-extended/xen/xen.inc | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
> index 0d156dc..38922dc 100644
> --- a/recipes-extended/xen/xen.inc
> +++ b/recipes-extended/xen/xen.inc
> @@ -841,6 +841,9 @@ do_stubs() {
>  
>  addtask stubs after do_configure before do_compile
>  
> +# Allow all hypervisor settings in a defconfig
> +EXTRA_OEMAKE += "XEN_CONFIG_EXPERT=y"
> +
>  do_configure() {
>  
>      #./configure --enable-xsmpolicy does not set XSM_ENABLE must be done manually
> @@ -848,6 +851,11 @@ do_configure() {
>          echo "XSM_ENABLE := y" > ${S}/.config
>      fi
>  
> +    if [ -f "${WORKDIR}/defconfig" ]; then
> +        cp "${WORKDIR}/defconfig" "${B}/xen/.config" || \
> +        bbfatal "Unable to copy defconfig to .config"
> +    fi
> +
>      # do configure
>      oe_runconf
>  }
> 

This should also be applied to morty and master.

-- 
Doug Goldstein


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 978 bytes --]

Re: [meta-virtualization (krogoth)][PATCH 5/5] xen: ensure we build release builds

[Doug Goldstein]

[-- Attachment #1.1: Type: text/plain, Size: 1040 bytes --]

On 1/2/17 10:47 PM, Doug Goldstein wrote:
> Don't build with asserts on. This is the default for release tarballs
> but if someone bbappends patches in we should ensure they don't shoot
> themselves.
> 
> Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
> ---
>  recipes-extended/xen/xen.inc | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
> index 38922dc..d9490fe 100644
> --- a/recipes-extended/xen/xen.inc
> +++ b/recipes-extended/xen/xen.inc
> @@ -843,6 +843,10 @@ addtask stubs after do_configure before do_compile
>  
>  # Allow all hypervisor settings in a defconfig
>  EXTRA_OEMAKE += "XEN_CONFIG_EXPERT=y"
> +# Build release versions always. Technically since we track release
> +# tarballs this always happens but occasionally people pull in patches
> +# from staging that reverts this
> +EXTRA_OEMAKE += "debug=n"
>  
>  do_configure() {
>  
> 

This patch should also be applied to morty and master.

-- 
Doug Goldstein


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 978 bytes --]

[PATCH 3/5] xen: add gnu-efi to DEPENDS

[Doug Goldstein]

Allow Xen to build the EFI loader by including the required dependency.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
---
 recipes-extended/xen/xen.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
index 429a05a..c9ed73f 100644
--- a/recipes-extended/xen/xen.inc
+++ b/recipes-extended/xen/xen.inc
@@ -52,6 +52,7 @@ DEPENDS = " \
     xz \
     yajl \
     zlib \
+    gnu-efi \
     "
 
 # inherit setuptools adds python to RDEPENDS, override it
-- 
2.10.2

Re: [meta-virtualization (krogoth)][PATCH 1/5] xen: switch to updated download URL

[Bruce Ashfield]

[-- Attachment #1: Type: text/plain, Size: 1304 bytes --]

You didn't follow up to patch 1 and 2, I assume these are for the same
branches
as patches 3 -> 5 ?

Bruce

On Mon, Jan 2, 2017 at 11:47 PM, Doug Goldstein <cardoe@cardoe.com> wrote:

> The Xen Project has changed the officially supported download URL to use
> xenproject.org. This changes to the officially supported URLs.
>
> Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
> ---
>  recipes-extended/xen/xen_4.6.1.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/recipes-extended/xen/xen_4.6.1.bb b/recipes-extended/xen/
> xen_4.6.1.bb
> index 0adf8ad..c3ba3c8 100644
> --- a/recipes-extended/xen/xen_4.6.1.bb
> +++ b/recipes-extended/xen/xen_4.6.1.bb
> @@ -1,7 +1,7 @@
>  require xen.inc
>
>  SRC_URI = " \
> -    http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \
> +    https://downloads.xenproject.org/release/xen/${PV}/xen-${PV}.tar.gz \
>      "
>
>  SRC_URI[md5sum] = "df2d854c3c90ffeefaf71e7f868fb326"
> --
> 2.10.2
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization
>



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"

[-- Attachment #2: Type: text/html, Size: 2794 bytes --]

Re: [meta-virtualization (krogoth)][PATCH 1/5] xen: switch to updated download URL

[Doug Goldstein]

[-- Attachment #1.1: Type: text/plain, Size: 331 bytes --]

On 1/3/17 9:31 AM, Bruce Ashfield wrote:
> You didn't follow up to patch 1 and 2, I assume these are for the same
> branches
> as patches 3 -> 5 ?
> 
> Bruce

No. Actually 1 and 2 are only for krogoth. Sorry for all the confusion.
I realize I should have sent this differently for better clarity.

-- 
Doug Goldstein


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 978 bytes --]

Re: [meta-virtualization (krogoth)][PATCH 1/5] xen: switch to updated download URL

[Bruce Ashfield]

[-- Attachment #1: Type: text/plain, Size: 636 bytes --]

On Tue, Jan 3, 2017 at 11:23 AM, Doug Goldstein <cardoe@cardoe.com> wrote:

> On 1/3/17 9:31 AM, Bruce Ashfield wrote:
> > You didn't follow up to patch 1 and 2, I assume these are for the same
> > branches
> > as patches 3 -> 5 ?
> >
> > Bruce
>
> No. Actually 1 and 2 are only for krogoth. Sorry for all the confusion.
> I realize I should have sent this differently for better clarity.
>

hah. Now that you said that, I see the krogoth in the subject. Post holiday
brain! :D

Bruce


>
> --
> Doug Goldstein
>
>


-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"

[-- Attachment #2: Type: text/html, Size: 1329 bytes --]

Re: [meta-virtualization (krogoth)][PATCH 1/5] xen: switch to updated download URL

[Bruce Ashfield]

[-- Attachment #1: Type: text/plain, Size: 981 bytes --]

All the xen patches should now be merged. Let me know if I managed to muck
up the branches.

cheers,

Bruce

On Tue, Jan 3, 2017 at 11:56 AM, Bruce Ashfield <bruce.ashfield@gmail.com>
wrote:

>
>
> On Tue, Jan 3, 2017 at 11:23 AM, Doug Goldstein <cardoe@cardoe.com> wrote:
>
>> On 1/3/17 9:31 AM, Bruce Ashfield wrote:
>> > You didn't follow up to patch 1 and 2, I assume these are for the same
>> > branches
>> > as patches 3 -> 5 ?
>> >
>> > Bruce
>>
>> No. Actually 1 and 2 are only for krogoth. Sorry for all the confusion.
>> I realize I should have sent this differently for better clarity.
>>
>
> hah. Now that you said that, I see the krogoth in the subject. Post
> holiday brain! :D
>
> Bruce
>
>
>>
>> --
>> Doug Goldstein
>>
>>
>
>
> --
> "Thou shalt not follow the NULL pointer, for chaos and madness await thee
> at its end"
>



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"

[-- Attachment #2: Type: text/html, Size: 2207 bytes --]

Re: [meta-virtualization (krogoth)][PATCH 1/5] xen: switch to updated download URL

[Doug Goldstein]

[-- Attachment #1.1: Type: text/plain, Size: 198 bytes --]

On 1/4/17 9:34 PM, Bruce Ashfield wrote:
> All the xen patches should now be merged. Let me know if I managed to
> muck up the branches.
> 

Looks good Bruce. Thanks!

-- 
Doug Goldstein


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 978 bytes --]