From 3f56cd0204ea1636a3dc865b4fc2a07a94f80eb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Wed, 14 Nov 2018 15:51:21 +0100
Subject: [PATCH] Split out all INHERITS to mortsgna-inherits.inc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 conf/distro/include/mortsgna-inherits.inc | 26 ++++++++++++++++++++++
 conf/distro/include/mortsgna.inc          | 27 +----------------------
 2 files changed, 27 insertions(+), 26 deletions(-)
 create mode 100644 conf/distro/include/mortsgna-inherits.inc

diff --git a/conf/distro/include/mortsgna-inherits.inc b/conf/distro/include/mortsgna-inherits.inc
new file mode 100644
index 0000000..fcd427a
--- /dev/null
+++ b/conf/distro/include/mortsgna-inherits.inc
@@ -0,0 +1,26 @@
+# use debian style naming
+INHERIT += "debian"
+
+# activate config checker
+INHERIT += "sanity"
+
+# activate the blacklister
+INHERIT += "blacklist"
+
+# make devshell available as task
+INHERIT += "devshell"
+
+# run QA tests on builds and packages and log them
+INHERIT += "insane"
+
+# run QA tests on recipes
+#INHERIT += "recipe_sanity"
+
+# have a shared state a.k.a package-staging2
+INHERIT += "sstate"
+
+# drop buildinfo to /etc/build
+INHERIT += "image-buildinfo"
+
+# Prelink images
+INHERIT += "image-prelink"
diff --git a/conf/distro/include/mortsgna.inc b/conf/distro/include/mortsgna.inc
index cda7943..3fd2e05 100644
--- a/conf/distro/include/mortsgna.inc
+++ b/conf/distro/include/mortsgna.inc
@@ -29,27 +29,8 @@ ARM_INSTRUCTION_SET_armv6 ?= "arm"
 require conf/distro/include/mortsgna-armv7-tune.inc
 DEFAULTTUNE_mortsgna := "${@armv7_tune_handler(d)}"
 
-# use debian style naming
-INHERIT += "debian"
 
-# activate config checker
-INHERIT += "sanity" 
-
-# activate the blacklister
-INHERIT += "blacklist"
-
-# make devshell available as task
-INHERIT += "devshell" 
-
-# run QA tests on builds and packages and log them
-INHERIT += "insane"
-QA_LOG = "1"
-
-# run QA tests on recipes
-#INHERIT += "recipe_sanity"
-
-# have a shared state a.k.a package-staging2
-INHERIT += "sstate"
+require conf/distro/include/mortsgna-inherits.inc
 
 # Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
 ENABLE_BINARY_LOCALE_GENERATION ?= "1"
@@ -63,12 +44,6 @@ ENABLE_BINARY_LOCALE_GENERATION_ep9312 = "0"
 # qemu has taken a dislike to armeb as well
 ENABLE_BINARY_LOCALE_GENERATION_armeb = "0"
 
-# drop buildinfo to /etc/build
-INHERIT += "image-buildinfo"
-
-# Prelink images
-INHERIT += "image-prelink"
-
 # Name the generated images in a sane way
 IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${TCLIBC}-${IMAGE_PKGTYPE}-${DISTRO_VERSION}-${MACHINE}"
 DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"