From b012426f073d1d76ca3450084376cfc112cbbad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Wed, 14 Nov 2018 16:06:47 +0100
Subject: [PATCH] Say farewell mortsgna.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.inc | 60 -------------------------------
 conf/distro/mortsgna.conf        | 61 +++++++++++++++++++++++++++++++-
 2 files changed, 60 insertions(+), 61 deletions(-)
 delete mode 100644 conf/distro/include/mortsgna.inc

diff --git a/conf/distro/include/mortsgna.inc b/conf/distro/include/mortsgna.inc
deleted file mode 100644
index 3fd2e05..0000000
--- a/conf/distro/include/mortsgna.inc
+++ /dev/null
@@ -1,60 +0,0 @@
-# Preserve original DISTRO value
-USERDISTRO := "${DISTRO}"
-DISTRO = "mortsgna"
-DISTRO_NAME = "Mortsgna"
-
-BUILDNAME = "Mortsgna ${DISTRO_VERSION}"
-
-TARGET_VENDOR = "-mortsgna"
-SDK_VENDOR = "-mortsgnasdk"
-
-# Yocto work around for missing ONLINE_PACKAGE_MANAGEMENT support
-ONLINE_PACKAGE_MANAGEMENT = "full"
-
-# Can be "glibc" or "musl"
-TCLIBC ?= "glibc"
-
-PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
-PREFERRED_PROVIDER_linux-libc-headers-nativesdk = "linux-libc-headers-nativesdk"
-
-require conf/distro/include/mortsgna-${TCLIBC}.inc
-
-# thumb2 only
-ARM_INSTRUCTION_SET ??= "thumb"
-ARM_INSTRUCTION_SET_armv4 ?= "arm"
-ARM_INSTRUCTION_SET_armv5 ?= "arm"
-ARM_INSTRUCTION_SET_armv6 ?= "arm"
-
-# set MORTSGNA_ARMV7_TUNE="1" in your local.conf to build armv7athf
-require conf/distro/include/mortsgna-armv7-tune.inc
-DEFAULTTUNE_mortsgna := "${@armv7_tune_handler(d)}"
-
-
-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"
-
-# build UTF8 locales only
-LOCALE_UTF8_ONLY = "1"
-
-# qemu doesn't like this fp
-ENABLE_BINARY_LOCALE_GENERATION_ep9312 = "0"
-
-# qemu has taken a dislike to armeb as well
-ENABLE_BINARY_LOCALE_GENERATION_armeb = "0"
-
-# 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}"
-
-# Prefer ext4 images where possible
-SDIMG_ROOTFS_TYPE = "ext4"
-
-require conf/distro/include/mortsgna-distro-features.inc
-
-# image specific volatile logfile handlding with image feature 'volatile-log'
-require conf/distro/include/mortsgna-image-logfile-volatile.inc
-
-# Yocto tweaks
-require conf/distro/include/mortsgna-core-tweaks.inc
diff --git a/conf/distro/mortsgna.conf b/conf/distro/mortsgna.conf
index da8ac7a..f0f09c2 100644
--- a/conf/distro/mortsgna.conf
+++ b/conf/distro/mortsgna.conf
@@ -41,7 +41,66 @@ MIRRORS += " \
     svn://.*/.*   http://downloads.yoctoproject.org/mirror/sources/ \n \
 "
 
-require conf/distro/include/mortsgna.inc
+# Preserve original DISTRO value
+USERDISTRO := "${DISTRO}"
+DISTRO = "mortsgna"
+DISTRO_NAME = "Mortsgna"
+
+BUILDNAME = "Mortsgna ${DISTRO_VERSION}"
+
+TARGET_VENDOR = "-mortsgna"
+SDK_VENDOR = "-mortsgnasdk"
+
+# Yocto work around for missing ONLINE_PACKAGE_MANAGEMENT support
+ONLINE_PACKAGE_MANAGEMENT = "full"
+
+# Can be "glibc" or "musl"
+TCLIBC ?= "glibc"
+
+PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
+PREFERRED_PROVIDER_linux-libc-headers-nativesdk = "linux-libc-headers-nativesdk"
+
+require conf/distro/include/mortsgna-${TCLIBC}.inc
+
+# thumb2 only
+ARM_INSTRUCTION_SET ??= "thumb"
+ARM_INSTRUCTION_SET_armv4 ?= "arm"
+ARM_INSTRUCTION_SET_armv5 ?= "arm"
+ARM_INSTRUCTION_SET_armv6 ?= "arm"
+
+# set MORTSGNA_ARMV7_TUNE="1" in your local.conf to build armv7athf
+require conf/distro/include/mortsgna-armv7-tune.inc
+DEFAULTTUNE_mortsgna := "${@armv7_tune_handler(d)}"
+
+
+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"
+
+# build UTF8 locales only
+LOCALE_UTF8_ONLY = "1"
+
+# qemu doesn't like this fp
+ENABLE_BINARY_LOCALE_GENERATION_ep9312 = "0"
+
+# qemu has taken a dislike to armeb as well
+ENABLE_BINARY_LOCALE_GENERATION_armeb = "0"
+
+# 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}"
+
+# Prefer ext4 images where possible
+SDIMG_ROOTFS_TYPE = "ext4"
+
+require conf/distro/include/mortsgna-distro-features.inc
+
+# image specific volatile logfile handlding with image feature 'volatile-log'
+require conf/distro/include/mortsgna-image-logfile-volatile.inc
+
+# Yocto tweaks
+require conf/distro/include/mortsgna-core-tweaks.inc
 
 # uncomment to enable security flags - images tested had issues
 #require conf/distro/include/security_flags.inc