Merge remote-tracking branch 'agl/sandbox/ronan/rocko' into HEAD

* agl/sandbox/ronan/rocko: (58 commits)
  Update ulcb conf file
  Remove unsed gstreamer backport
  [GEN3] add preferred version on omx package
  run-(agl-)postinst: Emit progress to console
  meta-security: Remove unused content
  Upgrade wayland-ivi-extension
  Revert "Fix kernel gcc7 issue"
  remove backport commit
  Revert "Fix CVE-2017-1000364 by backporting the patches for gen3"
  Remove fix for optee-os
  Remove gcc 6 fix
  Update rcar gen3 kernel bbappend version
  Update rcar gen3 driver
  Remove porter machine
  dbus-cynara: Upgrade to 1.10.20
  xmlsec1: switch to meta-security version
  systemd: earlier smack label switch
  cynara: upgrade to 0.14.10
  Remove smack recipe
  Integrate parts of meta-intel-iot-security
  ...

Bug-AGL: SPEC-1181

Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

Conflicts:
	meta-app-framework/recipes-security/cynara/cynara_git.bbappend

Change-Id: I9875fcb31e960038ce6c23165c99b52a3bd1a1c0

6 files changed, 3 insertions, 32 deletions

diff --git a/templates/feature/agl-appfw-smack/50_bblayers.conf.inc b/templates/feature/agl-appfw-smack/50_bblayers.conf.inc
index 344c25070..7f5f24eb5 100644
--- a/templates/feature/agl-appfw-smack/50_bblayers.conf.inc
+++ b/templates/feature/agl-appfw-smack/50_bblayers.conf.inc
@@ -1,6 +1,7 @@
 BBLAYERS =+ " \
-	${METADIR}/meta-intel-iot-security/meta-security-smack \
-	${METADIR}/meta-intel-iot-security/meta-security-framework \
+        ${METADIR}/meta-security \
+	${METADIR}/meta-openembedded/meta-perl \
+        ${METADIR}/meta-agl/meta-security \
 	${METADIR}/meta-agl/meta-app-framework \
     "
 
diff --git a/templates/machine/porter-nogfx/50_bblayers.conf.inc b/templates/machine/porter-nogfx/50_bblayers.conf.inc
deleted file mode 100644
index ba0e17ef3..000000000
--- a/templates/machine/porter-nogfx/50_bblayers.conf.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-BBLAYERS =+ "\
-  ${METADIR}/meta-renesas \
-  ${METADIR}/meta-renesas/meta-rcar-gen2 \
-  "
-
diff --git a/templates/machine/porter-nogfx/50_local.conf.inc b/templates/machine/porter-nogfx/50_local.conf.inc
deleted file mode 100644
index 87ec427e3..000000000
--- a/templates/machine/porter-nogfx/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "porter"
-#see meta-agl/meta-agl-bsp/conf/include/agl_porter-nogfx.inc
-require conf/include/agl_porter-nogfx.inc
diff --git a/templates/machine/porter/50_bblayers.conf.inc b/templates/machine/porter/50_bblayers.conf.inc
deleted file mode 100644
index ba0e17ef3..000000000
--- a/templates/machine/porter/50_bblayers.conf.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-BBLAYERS =+ "\
-  ${METADIR}/meta-renesas \
-  ${METADIR}/meta-renesas/meta-rcar-gen2 \
-  "
-
diff --git a/templates/machine/porter/50_local.conf.inc b/templates/machine/porter/50_local.conf.inc
deleted file mode 100644
index f2794b0d0..000000000
--- a/templates/machine/porter/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "porter"
-#see meta-agl/meta-agl-bsp/conf/include/agl_porter.inc
-require conf/include/agl_porter.inc
diff --git a/templates/machine/porter/50_setup.sh b/templates/machine/porter/50_setup.sh
deleted file mode 100644
index f51d4f4f5..000000000
--- a/templates/machine/porter/50_setup.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-# setup proprietary gfx drivers and multimedia packages
-pushd $METADIR 2>/dev/null
-
-SETUP_MM_SCRIPT=$METADIR/meta-renesas/meta-rcar-gen2/scripts/setup_mm_packages.sh
-if [ -f $SETUP_MM_SCRIPT ]; then
-	. $SETUP_MM_SCRIPT $MACHINE
-	copy_mm_packages $MACHINE
-	if [ $? -ne 0 ]; then
-		echo "Copying gfx drivers and multimedia packages for '$MACHINE' failed."
-		exit 1
-	fi
-fi
-
-popd 2>/dev/null