v18.03_REL1.4: Updated sbsa tag/commit info and changelog

Also fixed a minor bug caught in release testing.

Signed-off-by: Sakar Arora <Sakar.Arora@arm.com>

changelog.txt

@@ -1,3 +1,9 @@
+v18.03_REL1.4
+
+* LUVOS: Moved to luv-yocto tag v2.2, which supports kernel v4.14.
+* SCT: Bug fix in ExitBootServices_Conf test.
+* SBSA: Update tag/commit information to include latest bug fixes in sbsa-acs.
+
 v18.02_REL1.3
 
 * SCT: Remove tests that are optional, like EBC interface test, EFI_LOAD_FILE2_PROTOCOL, etc.

patches/luvos.patch

@@ -1,6 +1,6 @@
-From 47d6be79584a123bf7adcf544432cb5335064c52 Mon Sep 17 00:00:00 2001
+From 1a0d99f90e4d732201aef8a67d9865115b3b331b Mon Sep 17 00:00:00 2001
 From: Sakar Arora <Sakar.Arora@arm.com>
-Date: Tue, 6 Feb 2018 14:19:21 +0530
+Date: Wed, 14 Mar 2018 17:41:28 +0530
 Subject: [PATCH] luvos
 
 ---
@@ -22,12 +22,13 @@ Subject: [PATCH] luvos
  .../kernel_efi_warnings/kernel-efi-warnings_0.1.bb |   2 -
  meta-luv/recipes-core/luv-test/luv-test.bb         |   6 +
  .../luv-test/luv-test/luv-collect-results          | 181 ++++++++++++++
+ .../recipes-core/luv-test/luv-test/luv-message     |   2 +-
  .../recipes-core/luv-test/luv-test/luv-sbsa-test   |  18 ++
  .../luv-test/luv-test/luv-test-manager             |   5 +
  .../linux/linux-yocto-efi-test_4.14.bb             |   3 +-
  meta/conf/bitbake.conf                             |   2 +-
- sbsa_setup.sh                                      |  41 +++
- 23 files changed, 959 insertions(+), 15 deletions(-)
+ sbsa_setup.sh                                      |  43 ++++
+ 24 files changed, 962 insertions(+), 16 deletions(-)
  create mode 100755 build_luvos.sh
  create mode 100644 meta-luv/recipes-bsp/sbbr/sbbr/README.md
  create mode 100644 meta-luv/recipes-bsp/sbbr/sbbr/sbbr-sct.patch
@@ -134,7 +135,7 @@ index 0000000..bc6b659
 +fi
 +exit
 diff --git a/meta-luv/classes/luv-efi.bbclass b/meta-luv/classes/luv-efi.bbclass
-index 8c1b892..66c653e 100644
+index 8c1b892..7a1807d 100644
 --- a/meta-luv/classes/luv-efi.bbclass
 +++ b/meta-luv/classes/luv-efi.bbclass
 @@ -16,6 +16,13 @@ def get_bits_depends(d):
@@ -213,7 +214,7 @@ index 8c1b892..66c653e 100644
 +          echo \"sbsa.nsh not found\"
 +          :Done
 +          FS%i:
-+          vmlinuz initrd=\initrd ${CMDLINE}" > ${DEST}${EFIDIR}/startup.nsh
++          vmlinuz initrd=\initrd ${CMDLINE} luv_netconsole=none luv_storage=none luv_tests=fwts" > ${DEST}${EFIDIR}/startup.nsh
 +}
 +
  BITS_EFI_LOADER_IMAGE = "${DEST_EFI_LOADER_IMAGE}"
@@ -687,7 +688,7 @@ index 0000000..fae365c
 +source AppPkg/Applications/sbsa-acs/tools/scripts/avsbuild.sh
 diff --git a/meta-luv/recipes-bsp/sbsa/sbsa.bb b/meta-luv/recipes-bsp/sbsa/sbsa.bb
 new file mode 100644
-index 0000000..6cb2871
+index 0000000..efabeb8
 --- /dev/null
 +++ b/meta-luv/recipes-bsp/sbsa/sbsa.bb
 @@ -0,0 +1,107 @@
@@ -715,7 +716,7 @@ index 0000000..6cb2871
 +           file://compile.sh"
 +
 +PV = "1.0+git${SRCPV}"
-+SRCREV = "5d5ba88af39fb5ed833f60a7569b2f6bc2ccf7df"
++SRCREV = "591f70565d1f88f7d6447e2e4f38885a008fbc6e"
 +
 +# GCC checksum.
 +SRC_URI[md5sum] = "24ac2e26f50f49f3043f281440b41bba"
@@ -1163,6 +1164,19 @@ index 0000000..9afbc12
 +outFile.close()
 +
 +print ("Done, test results can be found in \"%s\"" % arg_output)
+diff --git a/meta-luv/recipes-core/luv-test/luv-test/luv-message b/meta-luv/recipes-core/luv-test/luv-test/luv-message
+index 50edf1f..fa3f95a 100755
+--- a/meta-luv/recipes-core/luv-test/luv-test/luv-message
++++ b/meta-luv/recipes-core/luv-test/luv-test/luv-message
+@@ -8,7 +8,7 @@ luv_msg_write() {
+
+     if [ $# == 2 ]; then
+          sleep $2
+-         plymouth_hide "$1"
++         /bin/plymouth hide-message --text="$1"
+     fi
+
+     echo "$1" >&2
 diff --git a/meta-luv/recipes-core/luv-test/luv-test/luv-sbsa-test b/meta-luv/recipes-core/luv-test/luv-test/luv-sbsa-test
 new file mode 100644
 index 0000000..a359ddb
@@ -1239,7 +1253,7 @@ index 9696273..11d8888 100644
  MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}"
 diff --git a/sbsa_setup.sh b/sbsa_setup.sh
 new file mode 100755
-index 0000000..505cdc1
+index 0000000..1228d96
 --- /dev/null
 +++ b/sbsa_setup.sh
 @@ -0,0 +1,43 @@
@@ -1268,15 +1282,15 @@ index 0000000..505cdc1
 +git clone git://linux-arm.org/linux-acs.git
 +cd linux-acs
 +#copy .bb and source files to relevant places
-+git checkout -b v18.02_REL1.3 v18.02_REL1.3
++git checkout -b v18.03_REL1.4 v18.03_REL1.4
 +rm -rf $LUVDIR/meta-luv/recipes-core/sbsa-acs-drv
 +mv -f sbsa-acs-drv $LUVDIR/meta-luv/recipes-core/
 +mv -f kernel/src/0001-Enterprise-acs-linux-v4.13.patch $LUVDIR/meta-luv/recipes-kernel/linux/linux-yocto-efi-test/
 +
 +cd $TMPDIR
 +git clone https://github.com/ARM-software/sbsa-acs.git
 +cd sbsa-acs
-+git checkout -b v18.02_REL1.3 v18.02_REL1.3
++git checkout -b v18.03_REL1.4 v18.03_REL1.4
 +mv -f val $LUVDIR/meta-luv/recipes-core/sbsa-acs-drv/files/
 +mv -f test_pool $LUVDIR/meta-luv/recipes-core/sbsa-acs-drv/files/
 +