[PATCH 1/4] xen: drop patch that upstream says is wrong

[PATCH 1/4] xen: drop patch that upstream says is wrong

[Doug Goldstein]

Per upstream its not correct to always force -mfpmath=387 to work around
the -mno-sse flags. Instead strip out -mfpmath=sse that Yocto injects
for certain BSPs.
---
 ...xen-x86-Fix-up-rules-when-forcing-mno-sse.patch | 28 ----------------------
 recipes-extended/xen/xen.inc                       |  5 ++++
 recipes-extended/xen/xen_4.5.0.bb                  |  1 -
 3 files changed, 5 insertions(+), 29 deletions(-)
 delete mode 100644 recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch

diff --git a/recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch b/recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch
deleted file mode 100644
index 4c3e297..0000000
--- a/recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Nathan Rossi <nathan.rossi@xilinx.com>
-Subject: [PATCH] xen/x86: Fix up rules when forcing -mno-sse
-
-* When forcing -mno-sse specify -mfpmath=387 to avoid the fallback
-  warning
-
-Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
-Upstream-Status: Not-Submitted
----
- xen/arch/x86/Rules.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
-index 6775cb5..03848f7 100644
---- a/xen/arch/x86/Rules.mk
-+++ b/xen/arch/x86/Rules.mk
-@@ -42,7 +42,7 @@ x86 := y
- x86_32 := n
- x86_64 := y
- 
--CFLAGS += -mno-red-zone -mno-sse -fpic
-+CFLAGS += -mno-red-zone -mno-sse -fpic -mfpmath=387
- CFLAGS += -fno-asynchronous-unwind-tables
- # -fvisibility=hidden reduces -fpic cost, if it's available
- ifneq ($(call cc-option,$(CC),-fvisibility=hidden,n),n)
--- 
-2.1.1
-
diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
index 432bf4d..c7a2347 100644
--- a/recipes-extended/xen/xen.inc
+++ b/recipes-extended/xen/xen.inc
@@ -12,6 +12,11 @@ inherit autotools-brokensep gettext setuptools update-rc.d systemd
 
 require xen-arch.inc
 
+# Xen uses hardcodes the use of -mno-sse which conflicts -mfpmath=sse
+# The issue arises from certain Yocto machine BSPs injecting -mfpmath=sse
+# into the package's CFLAGS so we need to strip that
+TUNE_CCARGS := "${@oe_filter_out('-mfpmath=sse', '${TUNE_CCARGS}', d)}"
+
 PACKAGECONFIG ??= " \
     sdl \
     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
diff --git a/recipes-extended/xen/xen_4.5.0.bb b/recipes-extended/xen/xen_4.5.0.bb
index 6c17b90..a5f03f3 100644
--- a/recipes-extended/xen/xen_4.5.0.bb
+++ b/recipes-extended/xen/xen_4.5.0.bb
@@ -2,7 +2,6 @@ require xen.inc
 
 SRC_URI = " \
     http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \
-    file://xen-x86-Fix-up-rules-when-forcing-mno-sse.patch \
     "
 
 SRC_URI[md5sum] = "9bac43d2419d05a647064d9253bb03fa"
-- 
2.1.4

[PATCH 2/4] xen: drop incorrectly broken out package

[Doug Goldstein]

The xen-mfndump utility was broken out into xen-xen-mfndump which is
clearly a typo for xen-mfndump but the xen.inc file which is also used
for 4.5.0 places this binary into xen-misc so remove these lines and let
it go into xen-misc.
---
 recipes-extended/xen/xen_git.bb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/recipes-extended/xen/xen_git.bb b/recipes-extended/xen/xen_git.bb
index f333157..88145a3 100644
--- a/recipes-extended/xen/xen_git.bb
+++ b/recipes-extended/xen/xen_git.bb
@@ -11,8 +11,3 @@ SRC_URI = " \
     "
 
 DEFAULT_PREFERENCE = "-1"
-
-PACKAGES += "${PN}-xen-mfndump"
-
-FILES_${PN}-xen-mfndump = "${sbindir}/xen-mfndump"
-
-- 
2.1.4

[PATCH 3/4] xen: add missing dependency

[Doug Goldstein]

The xen-fsimage package contains shared libraries which depend on the
shared libraries from libext2fs so there needs to be a RDEPEND set.
---
 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 c7a2347..20f8abe 100644
--- a/recipes-extended/xen/xen.inc
+++ b/recipes-extended/xen/xen.inc
@@ -91,6 +91,10 @@ RRECOMMENDS_${PN}-base = " \
     ${PN}-xenpaging \
     "
 
+RDEPENDS_${PN}-fsimage = " \
+    libext2fs \
+    "
+
 RDEPENDS_${PN}-misc = " \
     perl \
     python \
-- 
2.1.4

[PATCH 4/4] xen: add new files to packages

[Doug Goldstein]

These files are now installed post 4.5.0 and as such they need to be
placed into appropriate packages.
---
 recipes-extended/xen/xen.inc | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
index 20f8abe..7f9ff96 100644
--- a/recipes-extended/xen/xen.inc
+++ b/recipes-extended/xen/xen.inc
@@ -209,6 +209,7 @@ PACKAGES = "\
 
 FILES_${PN}-dbg += "\
     ${libdir}/.debug \
+    ${libdir}/debug/* \
     ${libdir}/xen/bin/.debug \
     ${libdir}/python2.7/site-packages/.debug \
     ${libdir}/python2.7/site-packages/xen/lowlevel/.debug \
@@ -259,7 +260,10 @@ FILES_${PN}-libxenguest = "${libdir}/libxenguest.so.*"
 FILES_${PN}-libxenguest-dev = "${libdir}/libxenguest.so"
 
 FILES_${PN}-libxenlight = "${libdir}/libxenlight.so.*"
-FILES_${PN}-libxenlight-dev = "${libdir}/libxenlight.so"
+FILES_${PN}-libxenlight-dev = " \
+    ${libdir}/libxenlight.so \
+    /usr/share/pkgconfig/xenlight.pc \
+    "
 
 FILES_${PN}-libxenvchan = "${libdir}/libxenvchan.so.*"
 FILES_${PN}-libxenvchan-dev = "${libdir}/libxenvchan.so"
@@ -268,7 +272,10 @@ FILES_${PN}-libxenctrl = "${libdir}/libxenctrl.so.*"
 FILES_${PN}-libxenctrl-dev = "${libdir}/libxenctrl.so"
 
 FILES_${PN}-libxlutil = "${libdir}/libxlutil.so.*"
-FILES_${PN}-libxlutil-dev = "${libdir}/libxlutil.so"
+FILES_${PN}-libxlutil-dev = " \
+    ${libdir}/libxlutil.so \
+    /usr/share/pkgconfig/xlutil.pc \
+    "
 
 FILES_${PN}-libvhd = "${libdir}/libvhd.so.*"
 FILES_${PN}-libvhd-dev = "${libdir}/libvhd.so"
@@ -367,6 +374,8 @@ FILES_${PN}-misc = "\
     ${sbindir}/xenlockprof \
     ${sbindir}/xen-lowmemd \
     ${sbindir}/xen-mfndump \
+    ${libdir}/xen/bin/verify-stream-v2 \
+    ${libdir}/xen/bin/convert-legacy-stream \
     "
 
 FILES_${PN}-pygrub = "\
@@ -492,6 +501,7 @@ FILES_${PN}-scripts-block = " \
     ${sysconfdir}/xen/scripts/block-iscsi \
     ${sysconfdir}/xen/scripts/block-nbd \
     ${sysconfdir}/xen/scripts/block-drbd-probe \
+    ${sysconfdir}/xen/scripts/block-tap \
     ${sysconfdir}/xen/scripts/vscsi \
     "
 
@@ -565,6 +575,9 @@ FILES_${PN}-xentrace = "\
     ${bindir}/xentrace_format \
     ${bindir}/xentrace_setsize \
     ${libdir}/xen/bin/xenctx \
+    ${bindir}/xenalyze \
+    ${sbindir}/xentrace \
+    ${sbindir}/xentrace_setsize \
     "
 
 FILES_${PN}-xen-watchdog = "\
-- 
2.1.4

Re: [PATCH 1/4] xen: drop patch that upstream says is wrong

[Nathan Rossi]

On Tue, Aug 25, 2015 at 6:26 AM, Doug Goldstein <cardoe@cardoe.com> wrote:
> Per upstream its not correct to always force -mfpmath=387 to work around
> the -mno-sse flags. Instead strip out -mfpmath=sse that Yocto injects
> for certain BSPs.
> ---
>  ...xen-x86-Fix-up-rules-when-forcing-mno-sse.patch | 28 ----------------------
>  recipes-extended/xen/xen.inc                       |  5 ++++
>  recipes-extended/xen/xen_4.5.0.bb                  |  1 -
>  3 files changed, 5 insertions(+), 29 deletions(-)
>  delete mode 100644 recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch
>
> diff --git a/recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch b/recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch
> deleted file mode 100644
> index 4c3e297..0000000
> --- a/recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -From: Nathan Rossi <nathan.rossi@xilinx.com>
> -Subject: [PATCH] xen/x86: Fix up rules when forcing -mno-sse
> -
> -* When forcing -mno-sse specify -mfpmath=387 to avoid the fallback
> -  warning
> -
> -Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
> -Upstream-Status: Not-Submitted
> ----
> - xen/arch/x86/Rules.mk | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
> -index 6775cb5..03848f7 100644
> ---- a/xen/arch/x86/Rules.mk
> -+++ b/xen/arch/x86/Rules.mk
> -@@ -42,7 +42,7 @@ x86 := y
> - x86_32 := n
> - x86_64 := y
> -
> --CFLAGS += -mno-red-zone -mno-sse -fpic
> -+CFLAGS += -mno-red-zone -mno-sse -fpic -mfpmath=387
> - CFLAGS += -fno-asynchronous-unwind-tables
> - # -fvisibility=hidden reduces -fpic cost, if it's available
> - ifneq ($(call cc-option,$(CC),-fvisibility=hidden,n),n)
> ---
> -2.1.1
> -
> diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
> index 432bf4d..c7a2347 100644
> --- a/recipes-extended/xen/xen.inc
> +++ b/recipes-extended/xen/xen.inc
> @@ -12,6 +12,11 @@ inherit autotools-brokensep gettext setuptools update-rc.d systemd
>
>  require xen-arch.inc
>
> +# Xen uses hardcodes the use of -mno-sse which conflicts -mfpmath=sse
> +# The issue arises from certain Yocto machine BSPs injecting -mfpmath=sse
> +# into the package's CFLAGS so we need to strip that
> +TUNE_CCARGS := "${@oe_filter_out('-mfpmath=sse', '${TUNE_CCARGS}', d)}"

Just curious, filtering out that flag will also affect the building of
for example the target user-space tools no? is that problematic or do
other SSE related flags (for those BSPs) cause the use of this fpmath
setting regardless?

Regards,
Nathan

> +
>  PACKAGECONFIG ??= " \
>      sdl \
>      ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
> diff --git a/recipes-extended/xen/xen_4.5.0.bb b/recipes-extended/xen/xen_4.5.0.bb
> index 6c17b90..a5f03f3 100644
> --- a/recipes-extended/xen/xen_4.5.0.bb
> +++ b/recipes-extended/xen/xen_4.5.0.bb
> @@ -2,7 +2,6 @@ require xen.inc
>
>  SRC_URI = " \
>      http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \
> -    file://xen-x86-Fix-up-rules-when-forcing-mno-sse.patch \
>      "
>
>  SRC_URI[md5sum] = "9bac43d2419d05a647064d9253bb03fa"
> --
> 2.1.4
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization

Re: [PATCH 1/4] xen: drop patch that upstream says is wrong

[Doug Goldstein]

On Tue, Aug 25, 2015 at 1:44 AM, Nathan Rossi <nathan@nathanrossi.com> wrote:
> On Tue, Aug 25, 2015 at 6:26 AM, Doug Goldstein <cardoe@cardoe.com> wrote:
>> Per upstream its not correct to always force -mfpmath=387 to work around
>> the -mno-sse flags. Instead strip out -mfpmath=sse that Yocto injects
>> for certain BSPs.
>> ---
>>  ...xen-x86-Fix-up-rules-when-forcing-mno-sse.patch | 28 ----------------------
>>  recipes-extended/xen/xen.inc                       |  5 ++++
>>  recipes-extended/xen/xen_4.5.0.bb                  |  1 -
>>  3 files changed, 5 insertions(+), 29 deletions(-)
>>  delete mode 100644 recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch
>>
>> diff --git a/recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch b/recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch
>> deleted file mode 100644
>> index 4c3e297..0000000
>> --- a/recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch
>> +++ /dev/null
>> @@ -1,28 +0,0 @@
>> -From: Nathan Rossi <nathan.rossi@xilinx.com>
>> -Subject: [PATCH] xen/x86: Fix up rules when forcing -mno-sse
>> -
>> -* When forcing -mno-sse specify -mfpmath=387 to avoid the fallback
>> -  warning
>> -
>> -Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
>> -Upstream-Status: Not-Submitted
>> ----
>> - xen/arch/x86/Rules.mk | 2 +-
>> - 1 file changed, 1 insertion(+), 1 deletion(-)
>> -
>> -diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
>> -index 6775cb5..03848f7 100644
>> ---- a/xen/arch/x86/Rules.mk
>> -+++ b/xen/arch/x86/Rules.mk
>> -@@ -42,7 +42,7 @@ x86 := y
>> - x86_32 := n
>> - x86_64 := y
>> -
>> --CFLAGS += -mno-red-zone -mno-sse -fpic
>> -+CFLAGS += -mno-red-zone -mno-sse -fpic -mfpmath=387
>> - CFLAGS += -fno-asynchronous-unwind-tables
>> - # -fvisibility=hidden reduces -fpic cost, if it's available
>> - ifneq ($(call cc-option,$(CC),-fvisibility=hidden,n),n)
>> ---
>> -2.1.1
>> -
>> diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
>> index 432bf4d..c7a2347 100644
>> --- a/recipes-extended/xen/xen.inc
>> +++ b/recipes-extended/xen/xen.inc
>> @@ -12,6 +12,11 @@ inherit autotools-brokensep gettext setuptools update-rc.d systemd
>>
>>  require xen-arch.inc
>>
>> +# Xen uses hardcodes the use of -mno-sse which conflicts -mfpmath=sse
>> +# The issue arises from certain Yocto machine BSPs injecting -mfpmath=sse
>> +# into the package's CFLAGS so we need to strip that
>> +TUNE_CCARGS := "${@oe_filter_out('-mfpmath=sse', '${TUNE_CCARGS}', d)}"
>
> Just curious, filtering out that flag will also affect the building of
> for example the target user-space tools no? is that problematic or do
> other SSE related flags (for those BSPs) cause the use of this fpmath
> setting regardless?
>
> Regards,
> Nathan

Yes you are correct. The existing patch was more targeted. However
while the tools are built a lot of them aren't used.
meta-virtualization pulls in its own QEMU and firmware blobs. The
default in this case is -mfpmath=sse,387 so it won't really affect
anything. But you are probably right this patch should be dropped and
the existing path should be used. I'll approach this from the Xen side
again.

--
Doug


>
>> +
>>  PACKAGECONFIG ??= " \
>>      sdl \
>>      ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
>> diff --git a/recipes-extended/xen/xen_4.5.0.bb b/recipes-extended/xen/xen_4.5.0.bb
>> index 6c17b90..a5f03f3 100644
>> --- a/recipes-extended/xen/xen_4.5.0.bb
>> +++ b/recipes-extended/xen/xen_4.5.0.bb
>> @@ -2,7 +2,6 @@ require xen.inc
>>
>>  SRC_URI = " \
>>      http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \
>> -    file://xen-x86-Fix-up-rules-when-forcing-mno-sse.patch \
>>      "
>>
>>  SRC_URI[md5sum] = "9bac43d2419d05a647064d9253bb03fa"
>> --
>> 2.1.4
>>



-- 
Doug Goldstein

Re: [PATCH 1/4] xen: drop patch that upstream says is wrong

[Nathan Rossi]

On Thu, Aug 27, 2015 at 8:18 AM, Doug Goldstein <cardoe@cardoe.com> wrote:
> On Tue, Aug 25, 2015 at 1:44 AM, Nathan Rossi <nathan@nathanrossi.com> wrote:
>> On Tue, Aug 25, 2015 at 6:26 AM, Doug Goldstein <cardoe@cardoe.com> wrote:
>>> Per upstream its not correct to always force -mfpmath=387 to work around
>>> the -mno-sse flags. Instead strip out -mfpmath=sse that Yocto injects
>>> for certain BSPs.
>>> ---
>>>  ...xen-x86-Fix-up-rules-when-forcing-mno-sse.patch | 28 ----------------------
>>>  recipes-extended/xen/xen.inc                       |  5 ++++
>>>  recipes-extended/xen/xen_4.5.0.bb                  |  1 -
>>>  3 files changed, 5 insertions(+), 29 deletions(-)
>>>  delete mode 100644 recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch
>>>
>>> diff --git a/recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch b/recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch
>>> deleted file mode 100644
>>> index 4c3e297..0000000
>>> --- a/recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch
>>> +++ /dev/null
>>> @@ -1,28 +0,0 @@
>>> -From: Nathan Rossi <nathan.rossi@xilinx.com>
>>> -Subject: [PATCH] xen/x86: Fix up rules when forcing -mno-sse
>>> -
>>> -* When forcing -mno-sse specify -mfpmath=387 to avoid the fallback
>>> -  warning
>>> -
>>> -Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
>>> -Upstream-Status: Not-Submitted
>>> ----
>>> - xen/arch/x86/Rules.mk | 2 +-
>>> - 1 file changed, 1 insertion(+), 1 deletion(-)
>>> -
>>> -diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
>>> -index 6775cb5..03848f7 100644
>>> ---- a/xen/arch/x86/Rules.mk
>>> -+++ b/xen/arch/x86/Rules.mk
>>> -@@ -42,7 +42,7 @@ x86 := y
>>> - x86_32 := n
>>> - x86_64 := y
>>> -
>>> --CFLAGS += -mno-red-zone -mno-sse -fpic
>>> -+CFLAGS += -mno-red-zone -mno-sse -fpic -mfpmath=387
>>> - CFLAGS += -fno-asynchronous-unwind-tables
>>> - # -fvisibility=hidden reduces -fpic cost, if it's available
>>> - ifneq ($(call cc-option,$(CC),-fvisibility=hidden,n),n)
>>> ---
>>> -2.1.1
>>> -
>>> diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
>>> index 432bf4d..c7a2347 100644
>>> --- a/recipes-extended/xen/xen.inc
>>> +++ b/recipes-extended/xen/xen.inc
>>> @@ -12,6 +12,11 @@ inherit autotools-brokensep gettext setuptools update-rc.d systemd
>>>
>>>  require xen-arch.inc
>>>
>>> +# Xen uses hardcodes the use of -mno-sse which conflicts -mfpmath=sse
>>> +# The issue arises from certain Yocto machine BSPs injecting -mfpmath=sse
>>> +# into the package's CFLAGS so we need to strip that
>>> +TUNE_CCARGS := "${@oe_filter_out('-mfpmath=sse', '${TUNE_CCARGS}', d)}"
>>
>> Just curious, filtering out that flag will also affect the building of
>> for example the target user-space tools no? is that problematic or do
>> other SSE related flags (for those BSPs) cause the use of this fpmath
>> setting regardless?
>>
>> Regards,
>> Nathan
>
> Yes you are correct. The existing patch was more targeted. However
> while the tools are built a lot of them aren't used.
> meta-virtualization pulls in its own QEMU and firmware blobs. The
> default in this case is -mfpmath=sse,387 so it won't really affect
> anything. But you are probably right this patch should be dropped and
> the existing path should be used. I'll approach this from the Xen side
> again.

Another way to handle this if there is no consensus from the Xen side
is to setup the recipe to build different make targets separately.
Essentially doing the runmake for the hypervisor with CFLAGS setup
filtered and then building the other targets without modifying the
CFLAGS.

Regards,
Nathan

>
> --
> Doug
>
>
>>
>>> +
>>>  PACKAGECONFIG ??= " \
>>>      sdl \
>>>      ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
>>> diff --git a/recipes-extended/xen/xen_4.5.0.bb b/recipes-extended/xen/xen_4.5.0.bb
>>> index 6c17b90..a5f03f3 100644
>>> --- a/recipes-extended/xen/xen_4.5.0.bb
>>> +++ b/recipes-extended/xen/xen_4.5.0.bb
>>> @@ -2,7 +2,6 @@ require xen.inc
>>>
>>>  SRC_URI = " \
>>>      http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \
>>> -    file://xen-x86-Fix-up-rules-when-forcing-mno-sse.patch \
>>>      "
>>>
>>>  SRC_URI[md5sum] = "9bac43d2419d05a647064d9253bb03fa"
>>> --
>>> 2.1.4
>>>
>
>
>
> --
> Doug Goldstein

Re: [PATCH 1/4] xen: drop patch that upstream says is wrong

[Doug Goldstein]

On Thu, Aug 27, 2015 at 3:05 AM, Nathan Rossi <nathan@nathanrossi.com> wrote:
> On Thu, Aug 27, 2015 at 8:18 AM, Doug Goldstein <cardoe@cardoe.com> wrote:
>> On Tue, Aug 25, 2015 at 1:44 AM, Nathan Rossi <nathan@nathanrossi.com> wrote:
>>> On Tue, Aug 25, 2015 at 6:26 AM, Doug Goldstein <cardoe@cardoe.com> wrote:
>>>> Per upstream its not correct to always force -mfpmath=387 to work around
>>>> the -mno-sse flags. Instead strip out -mfpmath=sse that Yocto injects
>>>> for certain BSPs.
>>>> ---
>>>>  ...xen-x86-Fix-up-rules-when-forcing-mno-sse.patch | 28 ----------------------
>>>>  recipes-extended/xen/xen.inc                       |  5 ++++
>>>>  recipes-extended/xen/xen_4.5.0.bb                  |  1 -
>>>>  3 files changed, 5 insertions(+), 29 deletions(-)
>>>>  delete mode 100644 recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch
>>>>
>>>> diff --git a/recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch b/recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch
>>>> deleted file mode 100644
>>>> index 4c3e297..0000000
>>>> --- a/recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch
>>>> +++ /dev/null
>>>> @@ -1,28 +0,0 @@
>>>> -From: Nathan Rossi <nathan.rossi@xilinx.com>
>>>> -Subject: [PATCH] xen/x86: Fix up rules when forcing -mno-sse
>>>> -
>>>> -* When forcing -mno-sse specify -mfpmath=387 to avoid the fallback
>>>> -  warning
>>>> -
>>>> -Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
>>>> -Upstream-Status: Not-Submitted
>>>> ----
>>>> - xen/arch/x86/Rules.mk | 2 +-
>>>> - 1 file changed, 1 insertion(+), 1 deletion(-)
>>>> -
>>>> -diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
>>>> -index 6775cb5..03848f7 100644
>>>> ---- a/xen/arch/x86/Rules.mk
>>>> -+++ b/xen/arch/x86/Rules.mk
>>>> -@@ -42,7 +42,7 @@ x86 := y
>>>> - x86_32 := n
>>>> - x86_64 := y
>>>> -
>>>> --CFLAGS += -mno-red-zone -mno-sse -fpic
>>>> -+CFLAGS += -mno-red-zone -mno-sse -fpic -mfpmath=387
>>>> - CFLAGS += -fno-asynchronous-unwind-tables
>>>> - # -fvisibility=hidden reduces -fpic cost, if it's available
>>>> - ifneq ($(call cc-option,$(CC),-fvisibility=hidden,n),n)
>>>> ---
>>>> -2.1.1
>>>> -
>>>> diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
>>>> index 432bf4d..c7a2347 100644
>>>> --- a/recipes-extended/xen/xen.inc
>>>> +++ b/recipes-extended/xen/xen.inc
>>>> @@ -12,6 +12,11 @@ inherit autotools-brokensep gettext setuptools update-rc.d systemd
>>>>
>>>>  require xen-arch.inc
>>>>
>>>> +# Xen uses hardcodes the use of -mno-sse which conflicts -mfpmath=sse
>>>> +# The issue arises from certain Yocto machine BSPs injecting -mfpmath=sse
>>>> +# into the package's CFLAGS so we need to strip that
>>>> +TUNE_CCARGS := "${@oe_filter_out('-mfpmath=sse', '${TUNE_CCARGS}', d)}"
>>>
>>> Just curious, filtering out that flag will also affect the building of
>>> for example the target user-space tools no? is that problematic or do
>>> other SSE related flags (for those BSPs) cause the use of this fpmath
>>> setting regardless?
>>>
>>> Regards,
>>> Nathan
>>
>> Yes you are correct. The existing patch was more targeted. However
>> while the tools are built a lot of them aren't used.
>> meta-virtualization pulls in its own QEMU and firmware blobs. The
>> default in this case is -mfpmath=sse,387 so it won't really affect
>> anything. But you are probably right this patch should be dropped and
>> the existing path should be used. I'll approach this from the Xen side
>> again.
>
> Another way to handle this if there is no consensus from the Xen side
> is to setup the recipe to build different make targets separately.
> Essentially doing the runmake for the hypervisor with CFLAGS setup
> filtered and then building the other targets without modifying the
> CFLAGS.
>
> Regards,
> Nathan
>

That could work. I don't know how to do that in Yocto yet
unfortunately. I do know the targets:

make dist-xen -> compiles the hypervisor
make dist-tools -> compiles the tools (libxl, qemu, etc)
make install-xen -> depends on dist-xen and installs it to ${D}
make install-tools -> depends on dist-tools but unfortunately always
recompiles some items and installs to ${D}

Any chance you you point me in the right direction or what doc would
educate me on how to split up the make call?

--
Doug


>>
>> --
>> Doug
>>
>>
>>>
>>>> +
>>>>  PACKAGECONFIG ??= " \
>>>>      sdl \
>>>>      ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
>>>> diff --git a/recipes-extended/xen/xen_4.5.0.bb b/recipes-extended/xen/xen_4.5.0.bb
>>>> index 6c17b90..a5f03f3 100644
>>>> --- a/recipes-extended/xen/xen_4.5.0.bb
>>>> +++ b/recipes-extended/xen/xen_4.5.0.bb
>>>> @@ -2,7 +2,6 @@ require xen.inc
>>>>
>>>>  SRC_URI = " \
>>>>      http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \
>>>> -    file://xen-x86-Fix-up-rules-when-forcing-mno-sse.patch \
>>>>      "
>>>>
>>>>  SRC_URI[md5sum] = "9bac43d2419d05a647064d9253bb03fa"
>>>> --
>>>> 2.1.4
>>>>
>>
>>
>>
>> --
>> Doug Goldstein



-- 
Doug Goldstein

Re: [PATCH 1/4] xen: drop patch that upstream says is wrong

[Nathan Rossi]

On Fri, Aug 28, 2015 at 1:24 PM, Doug Goldstein <cardoe@cardoe.com> wrote:
> On Thu, Aug 27, 2015 at 3:05 AM, Nathan Rossi <nathan@nathanrossi.com> wrote:
>> On Thu, Aug 27, 2015 at 8:18 AM, Doug Goldstein <cardoe@cardoe.com> wrote:
>>> On Tue, Aug 25, 2015 at 1:44 AM, Nathan Rossi <nathan@nathanrossi.com> wrote:
>>>> On Tue, Aug 25, 2015 at 6:26 AM, Doug Goldstein <cardoe@cardoe.com> wrote:
>>>>> Per upstream its not correct to always force -mfpmath=387 to work around
>>>>> the -mno-sse flags. Instead strip out -mfpmath=sse that Yocto injects
>>>>> for certain BSPs.
>>>>> ---
>>>>>  ...xen-x86-Fix-up-rules-when-forcing-mno-sse.patch | 28 ----------------------
>>>>>  recipes-extended/xen/xen.inc                       |  5 ++++
>>>>>  recipes-extended/xen/xen_4.5.0.bb                  |  1 -
>>>>>  3 files changed, 5 insertions(+), 29 deletions(-)
>>>>>  delete mode 100644 recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch
>>>>>
>>>>> diff --git a/recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch b/recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch
>>>>> deleted file mode 100644
>>>>> index 4c3e297..0000000
>>>>> --- a/recipes-extended/xen/files/xen-x86-Fix-up-rules-when-forcing-mno-sse.patch
>>>>> +++ /dev/null
>>>>> @@ -1,28 +0,0 @@
>>>>> -From: Nathan Rossi <nathan.rossi@xilinx.com>
>>>>> -Subject: [PATCH] xen/x86: Fix up rules when forcing -mno-sse
>>>>> -
>>>>> -* When forcing -mno-sse specify -mfpmath=387 to avoid the fallback
>>>>> -  warning
>>>>> -
>>>>> -Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
>>>>> -Upstream-Status: Not-Submitted
>>>>> ----
>>>>> - xen/arch/x86/Rules.mk | 2 +-
>>>>> - 1 file changed, 1 insertion(+), 1 deletion(-)
>>>>> -
>>>>> -diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
>>>>> -index 6775cb5..03848f7 100644
>>>>> ---- a/xen/arch/x86/Rules.mk
>>>>> -+++ b/xen/arch/x86/Rules.mk
>>>>> -@@ -42,7 +42,7 @@ x86 := y
>>>>> - x86_32 := n
>>>>> - x86_64 := y
>>>>> -
>>>>> --CFLAGS += -mno-red-zone -mno-sse -fpic
>>>>> -+CFLAGS += -mno-red-zone -mno-sse -fpic -mfpmath=387
>>>>> - CFLAGS += -fno-asynchronous-unwind-tables
>>>>> - # -fvisibility=hidden reduces -fpic cost, if it's available
>>>>> - ifneq ($(call cc-option,$(CC),-fvisibility=hidden,n),n)
>>>>> ---
>>>>> -2.1.1
>>>>> -
>>>>> diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
>>>>> index 432bf4d..c7a2347 100644
>>>>> --- a/recipes-extended/xen/xen.inc
>>>>> +++ b/recipes-extended/xen/xen.inc
>>>>> @@ -12,6 +12,11 @@ inherit autotools-brokensep gettext setuptools update-rc.d systemd
>>>>>
>>>>>  require xen-arch.inc
>>>>>
>>>>> +# Xen uses hardcodes the use of -mno-sse which conflicts -mfpmath=sse
>>>>> +# The issue arises from certain Yocto machine BSPs injecting -mfpmath=sse
>>>>> +# into the package's CFLAGS so we need to strip that
>>>>> +TUNE_CCARGS := "${@oe_filter_out('-mfpmath=sse', '${TUNE_CCARGS}', d)}"
>>>>
>>>> Just curious, filtering out that flag will also affect the building of
>>>> for example the target user-space tools no? is that problematic or do
>>>> other SSE related flags (for those BSPs) cause the use of this fpmath
>>>> setting regardless?
>>>>
>>>> Regards,
>>>> Nathan
>>>
>>> Yes you are correct. The existing patch was more targeted. However
>>> while the tools are built a lot of them aren't used.
>>> meta-virtualization pulls in its own QEMU and firmware blobs. The
>>> default in this case is -mfpmath=sse,387 so it won't really affect
>>> anything. But you are probably right this patch should be dropped and
>>> the existing path should be used. I'll approach this from the Xen side
>>> again.
>>
>> Another way to handle this if there is no consensus from the Xen side
>> is to setup the recipe to build different make targets separately.
>> Essentially doing the runmake for the hypervisor with CFLAGS setup
>> filtered and then building the other targets without modifying the
>> CFLAGS.
>>
>> Regards,
>> Nathan
>>
>
> That could work. I don't know how to do that in Yocto yet
> unfortunately. I do know the targets:
>
> make dist-xen -> compiles the hypervisor
> make dist-tools -> compiles the tools (libxl, qemu, etc)
> make install-xen -> depends on dist-xen and installs it to ${D}
> make install-tools -> depends on dist-tools but unfortunately always
> recompiles some items and installs to ${D}
>
> Any chance you you point me in the right direction or what doc would
> educate me on how to split up the make call?

There are a few in oe-core that have split compile/install make steps.
Search for "oe_runmake" and you will see any that manually override
the running of make for compile/install. But as an example
u-boot-mkimage does two make steps for compilation.

https://github.com/openembedded/openembedded-core/blob/3143920c541b55b543b9dcc12b18af4e0e4b7ae1/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.07.bb#L21

Regards,
Nathan

>
> --
> Doug
>
>
>>>
>>> --
>>> Doug
>>>
>>>
>>>>
>>>>> +
>>>>>  PACKAGECONFIG ??= " \
>>>>>      sdl \
>>>>>      ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
>>>>> diff --git a/recipes-extended/xen/xen_4.5.0.bb b/recipes-extended/xen/xen_4.5.0.bb
>>>>> index 6c17b90..a5f03f3 100644
>>>>> --- a/recipes-extended/xen/xen_4.5.0.bb
>>>>> +++ b/recipes-extended/xen/xen_4.5.0.bb
>>>>> @@ -2,7 +2,6 @@ require xen.inc
>>>>>
>>>>>  SRC_URI = " \
>>>>>      http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \
>>>>> -    file://xen-x86-Fix-up-rules-when-forcing-mno-sse.patch \
>>>>>      "
>>>>>
>>>>>  SRC_URI[md5sum] = "9bac43d2419d05a647064d9253bb03fa"
>>>>> --
>>>>> 2.1.4
>>>>>
>>>
>>>
>>>
>>> --
>>> Doug Goldstein
>
>
>
> --
> Doug Goldstein

Re: [PATCH 2/4] xen: drop incorrectly broken out package

[Bruce Ashfield]

I've merged patches 2/3/4 of the series, and dropped patch #1 as discussed
on the list.

Cheers,

Bruce

On Mon, Aug 24, 2015 at 4:26 PM, Doug Goldstein <cardoe@cardoe.com> wrote:
> The xen-mfndump utility was broken out into xen-xen-mfndump which is
> clearly a typo for xen-mfndump but the xen.inc file which is also used
> for 4.5.0 places this binary into xen-misc so remove these lines and let
> it go into xen-misc.
> ---
>  recipes-extended/xen/xen_git.bb | 5 -----
>  1 file changed, 5 deletions(-)
>
> diff --git a/recipes-extended/xen/xen_git.bb b/recipes-extended/xen/xen_git.bb
> index f333157..88145a3 100644
> --- a/recipes-extended/xen/xen_git.bb
> +++ b/recipes-extended/xen/xen_git.bb
> @@ -11,8 +11,3 @@ SRC_URI = " \
>      "
>
>  DEFAULT_PREFERENCE = "-1"
> -
> -PACKAGES += "${PN}-xen-mfndump"
> -
> -FILES_${PN}-xen-mfndump = "${sbindir}/xen-mfndump"
> -
> --
> 2.1.4
>
> --
> _______________________________________________
> 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"

Re: [PATCH 2/4] xen: drop incorrectly broken out package

[Doug Goldstein]

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

On 8/31/15 8:08 AM, Bruce Ashfield wrote:
> I've merged patches 2/3/4 of the series, and dropped patch #1 as discussed
> on the list.
> 
> Cheers,
> 
> Bruce

Thank you. I'll re-submit soon along with more updates to let xen_git.bb
build Xen 4.6.0_rc2 (current master as of this email).


-- 
Doug Goldstein


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