Merge pull request #2539 from Freescale/backport-2538-to-wrynosewrynose

[Backport wrynose] README, SECURITY.md, merge-files, glm: Fix layer compatibility checks

4 files changed, 23 insertions, 2 deletions

diff --git a/README.md b/README.md
index 91ffff93b..03f71b45a 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,11 @@ Welcome to `meta-freescale`. This document outlines our commitment to providing
 
 This layer provides support for NXP's platforms for use with OpenEmbedded and/or Yocto Project.
 
-### Dependencies
+## Maintainer
+
+Otavio Salvador <otavio.salvador@ossystems.com.br>
+
+## Dependencies
 
 This layer depends on:
 
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000..3ebe6e61f
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,17 @@
+# How to Report a Potential Vulnerability
+
+  Confirmed or potential security vulnerabilities in the meta-freescale layer
+  should be submitted through the
+  [Issues](https://github.com/Freescale/meta-freescale/issues) page.
+
+  For urgent or not-yet-released issues, contact the maintainer listed in the
+  [README](README.md). Include:
+
+  - The affected layer or software module
+  - The recipe and its version
+  - Example code, if available
+
+  ## Branches Maintained with Security Fixes
+
+  See the [Yocto Project release list](https://wiki.yoctoproject.org/wiki/Releases).
+  Security patches are accepted for the LTS releases and the master branch.
diff --git a/recipes-graphics/glm/glm_%.bbappend b/dynamic-layers/openembedded-layer/recipes-graphics/glm/glm_%.bbappend
index 88a16cb9d..88a16cb9d 100644
--- a/recipes-graphics/glm/glm_%.bbappend
+++ b/dynamic-layers/openembedded-layer/recipes-graphics/glm/glm_%.bbappend
diff --git a/recipes-extended/merge-files/merge-files_1.0.bb b/recipes-extended/merge-files/merge-files_1.0.bb
index bd788fdb5..a1f8a35a7 100644
--- a/recipes-extended/merge-files/merge-files_1.0.bb
+++ b/recipes-extended/merge-files/merge-files_1.0.bb
@@ -18,4 +18,4 @@ do_compile[noexec] = "1"
 
 FILES:${PN} = "/*"
 ALLOW_EMPTY:${PN} = "1"
-INSANE_SKIP:${PN} = "debug-files dev-so"
+INSANE_SKIP:${PN} = "dev-so"