Redefine hvmpd distro based on doog from meta-dimonoff

Signed-off-by: Hugo Villeneuve <hugo@hugovil.com>

diff --git a/conf/distro/hvmpd.conf b/conf/distro/hvmpd.conf
index a3f5fb4..0b157bf 100644 (file)
--- a/conf/distro/hvmpd.conf
+++ b/conf/distro/hvmpd.conf
@@ -1,11 +1,11 @@
-require conf/distro/poky.conf
+# From meta-dimonoff:
+require conf/distro/doog-default.inc
 
 DISTRO = "hvmpd"
 DISTRO_NAME = "HV MPD distribution"
 
-# CUSTOM_DISTRO_VERSION should be defined by the top-level Yocto repos
-# in local.conf:
-DISTRO_VERSION := "${CUSTOM_DISTRO_VERSION}"
+# Declare that we want to be treated like doog:
+DISTROOVERRIDES =. "doog:"
 
 # This can be overrided by machine-specific extra configuration:
 IMAGE_ROOTFS_SIZE = "1048576"
@@ -15,28 +15,13 @@ IMAGE_ROOTFS_SIZE = "1048576"
 include raspberrypi/conf/machine/${MACHINE}-extra.conf
 include wandboard/conf/machine/${MACHINE}-extra.conf
 
-# Declare that we want to be treated like poky:
-DISTROOVERRIDES =. "poky:"
-
-INIT_MANAGER = "systemd"
-DISTRO_FEATURES:append = " systemd"
-DISTRO_FEATURES:append = " usbhost"
-
 # We will _never_ use these features (remember that _remove overrides
 # are final).
-DISTRO_FEATURES:remove = "x11 directfb vulkan 3g nfc opengl ptest pcmcia wayland"
+DISTRO_FEATURES:remove = "x11 directfb vulkan opengl wayland"
 
 # Remove pulseaudio support:
 DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " pulseaudio"
 
-LICENSE_FLAGS_ACCEPTED = "commercial"
-
-DEFAULT_TIMEZONE = "America/New_York"
-
-# The current locale can be set in /etc/locale.conf.
-# List of locales to install in all images:
-IMAGE_LINGUAS = "en-us en-ca"
-
 # Prevent WIC from adding duplicated fstab entries, since we are manually adding
 # our own fstab entries. The reason we need to manually add fstab entries is so
 # that the swupdate and WIC images have an identical /etc/fstab file.