From 59da290d1754ebb62689acda0122def69156eb8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 29 Sep 2018 00:51:31 +0200 Subject: [PATCH] Say farewell angstrom - mortsgna is my new distro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I mean it Signed-off-by: Andreas Müller --- ...re-tweaks.inc => mortsgna-core-tweaks.inc} | 0 ...{angstrom-glibc.inc => mortsgna-glibc.inc} | 0 .../{angstrom-musl.inc => mortsgna-musl.inc} | 0 .../include/{angstrom.inc => mortsgna.inc} | 63 ++++--------------- conf/distro/{angstrom.conf => mortsgna.conf} | 6 +- 5 files changed, 13 insertions(+), 56 deletions(-) rename conf/distro/include/{angstrom-core-tweaks.inc => mortsgna-core-tweaks.inc} (100%) rename conf/distro/include/{angstrom-glibc.inc => mortsgna-glibc.inc} (100%) rename conf/distro/include/{angstrom-musl.inc => mortsgna-musl.inc} (100%) rename conf/distro/include/{angstrom.inc => mortsgna.inc} (55%) rename conf/distro/{angstrom.conf => mortsgna.conf} (97%) diff --git a/conf/distro/include/angstrom-core-tweaks.inc b/conf/distro/include/mortsgna-core-tweaks.inc similarity index 100% rename from conf/distro/include/angstrom-core-tweaks.inc rename to conf/distro/include/mortsgna-core-tweaks.inc diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/mortsgna-glibc.inc similarity index 100% rename from conf/distro/include/angstrom-glibc.inc rename to conf/distro/include/mortsgna-glibc.inc diff --git a/conf/distro/include/angstrom-musl.inc b/conf/distro/include/mortsgna-musl.inc similarity index 100% rename from conf/distro/include/angstrom-musl.inc rename to conf/distro/include/mortsgna-musl.inc diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/mortsgna.inc similarity index 55% rename from conf/distro/include/angstrom.inc rename to conf/distro/include/mortsgna.inc index abb8013..c25b763 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/mortsgna.inc @@ -1,34 +1,22 @@ #@TYPE: Distribution -#@NAME: Angstrom -#@DESCRIPTION: Release independent distribution configuration for Angstrom +#@NAME: Mortsgna +#@DESCRIPTION: Release independent distribution configuration for Mortsgna # Preserve original DISTRO value USERDISTRO := "${DISTRO}" -DISTRO = "angstrom" -DISTRO_NAME = "Angstrom" +DISTRO = "mortsgna" +DISTRO_NAME = "Mortsgna" -BUILDNAME = "Angstrom ${DISTRO_VERSION}" +BUILDNAME = "Mortsgna ${DISTRO_VERSION}" -TARGET_VENDOR = "-angstrom" -SDK_VENDOR = "-angstromsdk" +TARGET_VENDOR = "-mortsgna" +SDK_VENDOR = "-mortsgnasdk" SOC_FAMILY ?= "" # Yocto work around for missing ONLINE_PACKAGE_MANAGEMENT support ONLINE_PACKAGE_MANAGEMENT = "full" -#Set the right arch for the feeds -#Alphabetically sorted - -FEED_ARCH ?= "${TUNE_PKGARCH}" - -#blackfin machines -FEED_ARCH_bfin = "blackfin" - -# Add FEED_ARCH to machine overrides so we get access to e.g. 'armv7a' and 'sh4' -# Hopefully we'll never see a machine or arch with 'all' as substring -MACHINEOVERRIDES .= ":${@d.getVar('FEED_ARCH', d,1).replace('all','noarch')}" - # Put links to sources in deploy/sources to make it easier for people to be GPL compliant #INHERIT += "src_distribute_local" SRC_DIST_LOCAL ?= "symlink" @@ -42,37 +30,13 @@ PREFERRED_PROVIDER_eglibc = "glibc" PREFERRED_PROVIDER_virtual/gettext ??= "gettext" PREFERRED_PROVIDER_linux-libc-headers-nativesdk = "linux-libc-headers-nativesdk" -require conf/distro/include/angstrom-${TCLIBC}.inc - -# ARM920T and up can use thumb mode to decrease binary size at the expense of speed -# (the complete story is a bit more nuanced due to cache starvation) -# Angstrom turns on thumb for armv4t machine according to this RFC: -# http://lists.linuxtogo.org/pipermail/angstrom-distro-devel/2008-October/002714.html +require conf/distro/include/mortsgna-${TCLIBC}.inc ARM_INSTRUCTION_SET ??= "thumb" ARM_INSTRUCTION_SET_armv4t ?= "arm" ARM_INSTRUCTION_SET_armv5te ?= "arm" ARM_INSTRUCTION_SET_armv6 ?= "arm" -# "arm" "thumb" -# The instruction set the compiler should use when generating application -# code. The kernel is always compiled with arm code at present. arm code -# is the original 32 bit ARM instruction set, thumb code is the 16 bit -# encoded RISC sub-set. Thumb code is smaller (maybe 70% of the ARM size) -# but requires more instructions (140% for 70% smaller code) so may be -# slower. - -#Use this variable in feeds and other parts that need a URI -ANGSTROM_URI ?= "http://feeds.angstrom-distribution.org" - -#Use this variable to select which recipe you want to use to get feed configs (/etc/ipkg/, /etc/apt/sources.list) -# usefull for derivative distros and local testing -# As this is runtime we can't and won't use virtual/feed-configs -ANGSTROM_FEED_CONFIGS ??= "angstrom-feed-configs" - -#Set the default maintainer to angstrom-dev -MAINTAINER = "Angstrom Developers " - #use debian style naming INHERIT += "debian" @@ -89,8 +53,6 @@ INHERIT += "devshell" INHERIT += "insane" QA_LOG = "1" -# Log information on images and packages -# https://github.com/Angstrom-distribution/buildhistory/ INHERIT += "buildhistory" BUILDHISTORY_COMMIT = "1" @@ -100,7 +62,7 @@ BUILDHISTORY_COMMIT = "1" #have a shared state a.k.a package-staging2 INHERIT += "sstate" -ANGSTROM_PKG_FORMAT ?= "ipk" +MORTSGNA_PKG_FORMAT ?= "ipk" #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable ENABLE_BINARY_LOCALE_GENERATION ?= "1" @@ -121,15 +83,12 @@ INHERIT += "image-buildinfo" INHERIT += "image-prelink" #Name the generated images in a sane way -IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${TCLIBC}-${ANGSTROM_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" +IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${TCLIBC}-${MORSTGNA_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" # Prefer ext4 images where possible SDIMG_ROOTFS_TYPE = "ext4" -# Angstrom *always* has some form of release config, so error out if someone thinks he knows better -DISTRO_CHECK := "${@d.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" - # We want images supporting the following features (for packagegroup(-core)-base) DISTRO_FEATURES = "alsa argp bluetooth ext2 ipv4 ipv6 irda largefile nfs pam pci pcmcia ppp smbfs systemd usbgadget usbhost vfat wifi xattr zeroconf gobject-introspection-data" @@ -165,4 +124,4 @@ DISTRO_FEATURES += "${DISTRO_WAYLAND}" DISTRO_FEATURES += "${DISTRO_FEATURES_LIBC}" # Yocto tweaks -require conf/distro/include/angstrom-core-tweaks.inc +require conf/distro/include/mortsgna-core-tweaks.inc diff --git a/conf/distro/angstrom.conf b/conf/distro/mortsgna.conf similarity index 97% rename from conf/distro/angstrom.conf rename to conf/distro/mortsgna.conf index 21b8d08..1480e25 100644 --- a/conf/distro/angstrom.conf +++ b/conf/distro/mortsgna.conf @@ -31,12 +31,10 @@ PNBLACKLIST[pn-fso-apm] = "regular apmd is good enough" PNBLACKLIST[gconf-dbus] = "gconf-dbus has been merged back into main GConf" PNBLACKLIST[gconf-dbus-native] = "gconf-dbus has been merged back into main GConf" -require conf/distro/include/angstrom.inc - - +require conf/distro/include/mortsgna.inc # uncomment to enable security flags - images tested had issues -#require conf/distro/include/security_flags.inc +require conf/distro/include/security_flags.inc # Prefer openssh over dropbear TASK_BASIC_SSHDAEMON = "openssh-ssh openssh-sshd openssh-scp openssh-sftp openssh-sftp-server"