From 245e0bff3a8316fb876460db6bc2208b52065be2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 28 Sep 2018 10:18:42 +0200
Subject: [PATCH] Rework version information
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Follow oe-core way: use os-release / image-buildinfo
* No datetime dependent distro version
* Remove further leftovers

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 conf/distro/angstrom.conf                    | 41 +-------------------
 conf/distro/include/angstrom-core-tweaks.inc |  2 -
 conf/distro/include/angstrom.inc             |  3 ++
 3 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf
index 8f984f0..0004a96 100644
--- a/conf/distro/angstrom.conf
+++ b/conf/distro/angstrom.conf
@@ -8,18 +8,7 @@
 #@MAINTAINER: Philip 'Crofton' Balister <philip@balister.org>
 #@--------------------------------------------------------------------
 
-# This is a aimed to be the next stable angstrom release.
-# If you want something stable *right now*, use angstrom-v2013.12
-#
-# Use this at your own risk, we welcome bugreports sent to
-#    angstrom-distro-devel@linuxtogo.org
-#
-# For more contact info please visit
-#    http://www.angstrom-distribution.org/contact
-#
-# Again, in doubt, use the master branch of setup-scripts
-
-DISTRO_VERSION = "v${@time.strftime('%Y.%m',time.gmtime())}"
+DISTRO_VERSION = "v0.1"
 
 #Images built can have to modes:
 # 'debug': empty rootpassword, strace included
@@ -31,21 +20,6 @@ DISTRO_TYPE ?= "debug"
 TOOLCHAIN_TYPE ?= "internal"
 TOOLCHAIN_BRAND ?= ""
 
-# Ship just basic locale by default. Locales are big (~1Mb uncompr.), so
-# shipping some adhoc subset will be still useless and size burden for
-# users of all other languages/countries. Instead, worth to make it easy
-# to install additional languages: installer/wizard + metapackages which
-# will RRECOMMEND as much as possible content for a given language
-# (locales, UI transalations, help, etc. - useless for pros, but really 
-# helpful for common users).
-# Also, it appears that no locales fit in 16Mb for now. "C" locale rules!
-ROOT_FLASH_SIZE ??= "32"
-IMAGE_LINGUAS ?= '${@oe.utils.less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-us", d)}'
-
-# set feed path variables
-FEED_BASEPATH = "feeds/next/${ANGSTROM_PKG_FORMAT}/${TCLIBC}/"
-
-
 PREFERRED_PROVIDER_dbus-glib                     = "dbus-glib"
 PREFERRED_PROVIDER-gconf-dbus                    = "gconf"
 PREFERRED_PROVIDER_hotplug                       = "systemd"
@@ -75,29 +49,17 @@ require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
 # Processor specific tunes like hard float ABI
 include conf/distro/include/${TARGET_ARCH}-defaults.inc
 
-# If we're using an .ipk based rootfs, we want to have opkg installed so postinst script can run
-# We also take this opportunity to inject angstrom-version
-IPKG_VARIANT = "opkg angstrom-version"
-
 # Select xserver-xorg as default, since kdrive has been EOL'ed
 XSERVER ?= "xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mouse xf86-video-fbdev"
 
 # do some packagegroup-base stuff here
 
-# Prefer bluez4, it's needed for things like connman. Bluez4 is also largely backward compatible with
-# bluez 3.x
-DISTRO_BLUETOOTH_MANAGER = "\
-	blueprobe \
-	bluez5 \
-   "
-
 # We want to ship extra debug utils in the rootfs when doing a debug build
 DEBUG_APPS ?= ""
 DEBUG_APPS += '${@oe.utils.conditional("DISTRO_TYPE", "release", "", "strace procps",d)}'
 
 # util-linux-mount util-linux-umount: busybox mount is broken
 DISTRO_EXTRA_RDEPENDS += " \
-    angstrom-version \
     util-linux-mount util-linux-umount \
 "
 
@@ -111,6 +73,7 @@ DISTRO_EXTRA_RDEPENDS += " \
 # psplash-angstrom: angstrom branded psplash, you can add your own psplash-foo to an image, it uses update-alternatives
 # DEBUG_APPS: ship strace and procpc to make simple debugging a lot easier
 DISTRO_EXTRA_RRECOMMENDS += " \
+    os-release \
     kernel-module-vfat \
     kernel-module-ext2 \
     kernel-module-ext3 \
diff --git a/conf/distro/include/angstrom-core-tweaks.inc b/conf/distro/include/angstrom-core-tweaks.inc
index 1f3915d..b9fdc94 100644
--- a/conf/distro/include/angstrom-core-tweaks.inc
+++ b/conf/distro/include/angstrom-core-tweaks.inc
@@ -28,8 +28,6 @@ MACHINEOVERRIDES[vardepsexclude] += "SOC_FAMILY"
 # opkg
 EXTRA_IMAGE_FEATURES ?= "package-management empty-root-password"
 
-PREFERRED_PROVIDER_os-release = "angstrom-version"
-
 # Prefer libjpeg-turbo
 PREFERRED_PROVIDER_jpeg = "libjpeg-turbo"
 PREFERRED_PROVIDER_jpeg-native = "libjpeg-turbo-native"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index be10067..abb8013 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -114,6 +114,9 @@ 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"