Farewell mortsgna-core-tweaks.inc part2 / try to group more settings

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2018-11-14 18:28:28 +01:00
parent 60e6520a04
commit de48f689ac
2 changed files with 49 additions and 38 deletions

View File

@@ -1,15 +0,0 @@
# This include is to import changes from OE that are hard to overlay into core
# Default hash policy for distro
BB_SIGNATURE_HANDLER ?= "OEBasicHash"
# Empty commercial license, we want to build a superset for the default config
LICENSE_FLAGS_WHITELIST += "commercial"
# Unbreak multimachine builds
LICENSE_DIRECTORY = "${DEPLOY_DIR}/licenses/${MACHINE_ARCH}"
# Shared state fixups
MACHINEOVERRIDES[vardepsexclude] += "SOC_FAMILY"

View File

@@ -5,6 +5,10 @@
#@MAINTAINER: Andreas Müller <schnitzeltony@gmail.com>
#@--------------------------------------------------------------------
###############################################################################
# Global settings
###############################################################################
DISTRO_VERSION = "v0.1"
# With Angstrom we had DISTRO_TYPE = "debug"/"release". No recipe except
@@ -20,9 +24,6 @@ TOOLCHAIN_BRAND ?= ""
# Preferred providers
include conf/distro/include/mortsgna-preferred-providers.inc
# blacklist policy
PNBLACKLIST[pn-fso-apm] = "regular apmd is good enough"
# Add yocto mirros as fallback
MIRRORS += " \
bzr://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
@@ -48,12 +49,40 @@ SDK_VENDOR = "-mortsgnasdk"
# Yocto work around for missing ONLINE_PACKAGE_MANAGEMENT support
ONLINE_PACKAGE_MANAGEMENT = "full"
# Default hash policy for distro
BB_SIGNATURE_HANDLER ?= "OEBasicHash"
# We want to build a superset for the default config
LICENSE_FLAGS_WHITELIST += "commercial"
# Can be "glibc" or "musl"
TCLIBC ?= "glibc"
require conf/distro/include/mortsgna-${TCLIBC}.inc
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"
# 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}"
# DISTRO_FEATURES
require conf/distro/include/mortsgna-distro-features.inc
# Toolchain virtuals:
require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
###############################################################################
# ARM tweaks
###############################################################################
# thumb2 only
ARM_INSTRUCTION_SET ??= "thumb"
ARM_INSTRUCTION_SET_armv4 ?= "arm"
@@ -64,13 +93,16 @@ ARM_INSTRUCTION_SET_armv6 ?= "arm"
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"
###############################################################################
# Extra tweaks
###############################################################################
# build UTF8 locales only
LOCALE_UTF8_ONLY = "1"
# Unbreak multimachine builds
LICENSE_DIRECTORY = "${DEPLOY_DIR}/licenses/${MACHINE_ARCH}"
# Shared state fixups
MACHINEOVERRIDES[vardepsexclude] += "SOC_FAMILY"
# qemu doesn't like this fp
ENABLE_BINARY_LOCALE_GENERATION_ep9312 = "0"
@@ -78,20 +110,13 @@ 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}"
# blacklist policy
PNBLACKLIST[pn-fso-apm] = "regular apmd is good enough"
# 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
###############################################################################
# Quality & security hardening
###############################################################################
# uncomment to enable security flags - images tested had issues
#require conf/distro/include/security_flags.inc
@@ -110,13 +135,14 @@ WARN_TO_ERROR_QA = "already-stripped compile-host-path install-host-path \
WARN_QA_remove = "${WARN_TO_ERROR_QA}"
ERROR_QA_append = " ${WARN_TO_ERROR_QA}"
# Toolchain virtuals:
require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
###############################################################################
# Image defaults
###############################################################################
# image specific volatile logfile handlding with image feature 'volatile-log'
require conf/distro/include/mortsgna-image-logfile-volatile.inc
# For X11/Wayland images we install an unpriviledged user by default. If this
# is not desired override DISTRO_GUI_USER
DISTRO_GUI_USER ?= "unpriv-user"