Hello community,

here is the log from the commit of package xen for openSUSE:Factory checked in 
at 2018-07-10 16:13:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xen (Old)
 and      /work/SRC/openSUSE:Factory/.xen.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "xen"

Tue Jul 10 16:13:22 2018 rev:251 rq:621168 version:4.10.1_08

Changes:
--------
--- /work/SRC/openSUSE:Factory/xen/xen.changes  2018-07-02 23:30:44.733450521 
+0200
+++ /work/SRC/openSUSE:Factory/.xen.new/xen.changes     2018-07-10 
16:13:26.385722044 +0200
@@ -1,0 +2,8 @@
+Wed Jul  4 15:46:01 UTC 2018 - tr...@suse.de
+
+- Submit upstream patch libacpi: fixes for iasl >= 20180427
+  git commit 858dbaaeda33b05c1ac80aea0ba9a03924e09005
+A xen_fix_build_with_acpica_20180427_and_new_packages.patch
+  This is needed for acpica package to get updated in our build service
+
+-------------------------------------------------------------------

New:
----
  xen_fix_build_with_acpica_20180427_and_new_packages.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xen.spec ++++++
--- /var/tmp/diff_new_pack.QvyWhs/_old  2018-07-10 16:13:28.417718878 +0200
+++ /var/tmp/diff_new_pack.QvyWhs/_new  2018-07-10 16:13:28.417718878 +0200
@@ -195,6 +195,7 @@
 Patch32:        5afc13ae-8-x86-explicitly-set-Xen-default-SPEC_CTRL.patch
 Patch33:        
5afc13ae-9-x86-cpuid-improve-guest-policies-for-speculative.patch
 Patch34:        5afc13ae-A-x86-introduce-spec-ctrl-cmdline-opt.patch
+Patch35:        xen_fix_build_with_acpica_20180427_and_new_packages.patch
 # XPTI speedup
 Patch51:        5aec7393-1-x86-xpti-avoid-copy.patch
 Patch52:        5aec7393-2-x86-xpti-write-cr3.patch
@@ -465,6 +466,7 @@
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
+%patch35 -p1
 %patch51 -p1
 %patch52 -p1
 %patch53 -p1

++++++ xen_fix_build_with_acpica_20180427_and_new_packages.patch ++++++
From: Roger Pau Monné <roger....@citrix.com>
Subject: libacpi: fixes for iasl >= 20180427
References: fix builds with latest acpica package
Patch-Mainline: 4.11.0-rc4^0
Git-commit: 858dbaaeda33b05c1ac80aea0ba9a03924e09005
Git-repo: git://xenbits.xen.org/xen.git

New versions of iasl have introduced improved C file generation, as
reported in the changelog:

iASL: Enhanced the -tc option (which creates an AML hex file in C,
suitable for import into a firmware project):
  1) Create a unique name for the table, to simplify use of multiple
SSDTs.
  2) Add a protection #ifdef in the file, similar to a .h header file.

The net effect of that on generated files is:

-unsigned char AmlCode[] =
+#ifndef __SSDT_S4_HEX__
+#define __SSDT_S4_HEX__
+
+unsigned char ssdt_s4_aml_code[] =

The above example is from ssdt_s4.asl.

Fix the build with newer versions of iasl by stripping the '_aml_code'
suffix from the variable name on generated files.

Signed-off-by: Roger Pau Monné <roger....@citrix.com>
Reviewed-by: Wei Liu <wei.l...@citrix.com>
Acked-by: Andrew Cooper <andrew.coop...@citrix.com>
Release-acked-by: Juergen Gross <jgr...@suse.com>

Signed-off-by: Thomas Renninger <tr...@suse.com>

diff --git a/tools/libacpi/Makefile b/tools/libacpi/Makefile
index a47a658..c17f392 100644
--- a/tools/libacpi/Makefile
+++ b/tools/libacpi/Makefile
@@ -43,7 +43,7 @@ all: $(C_SRC) $(H_SRC)
 
 $(H_SRC): $(ACPI_BUILD_DIR)/%.h: %.asl iasl
        iasl -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $<
-       sed -e 's/AmlCode/$*/g' $(ACPI_BUILD_DIR)/$*.hex >$@
+       sed -e 's/AmlCode/$*/g' -e 's/_aml_code//g' $(ACPI_BUILD_DIR)/$*.hex >$@
        rm -f $(addprefix $(ACPI_BUILD_DIR)/, $*.aml $*.hex)
  
 $(MK_DSDT): mk_dsdt.c
@@ -76,7 +76,7 @@ $(ACPI_BUILD_DIR)/dsdt_anycpu_arm.asl: $(MK_DSDT)
 
 $(C_SRC): $(ACPI_BUILD_DIR)/%.c: iasl $(ACPI_BUILD_DIR)/%.asl
        iasl -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc 
$(ACPI_BUILD_DIR)/$*.asl
-       sed -e 's/AmlCode/$*/g' $(ACPI_BUILD_DIR)/$*.hex > $@.$(TMP_SUFFIX)
+       sed -e 's/AmlCode/$*/g' -e 's/_aml_code//g' $(ACPI_BUILD_DIR)/$*.hex > 
$@.$(TMP_SUFFIX)
        echo "int $*_len=sizeof($*);" >> $@.$(TMP_SUFFIX)
        mv -f $@.$(TMP_SUFFIX) $@
        rm -f $(addprefix $(ACPI_BUILD_DIR)/, $*.aml $*.hex)

Reply via email to