From 596586b7522256bcd664d28d1a7072a6f8831b4d Mon Sep 17 00:00:00 2001 From: David Phillips Date: Sun, 24 Nov 2019 14:27:12 +1300 Subject: Tweaks for zeus upgrade --- conf/layer.conf | 1 + conf/machine/include/de10-nano-common.inc | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'conf') diff --git a/conf/layer.conf b/conf/layer.conf index 22a745e..ab55aa1 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,6 +9,7 @@ BBFILE_PATTERN_meta-de10-nano := "^${LAYERDIR}/" # increase the number BBFILE_PRIORITY_meta-de10-nano = "9" LAYERDEPENDS_meta-de10-nano = "meta-altera" +LAYERSERIES_COMPAT_meta-de10-nano = "zeus" # this is just for release builds META_DE10_NANO_BASE := '${LAYERDIR}' diff --git a/conf/machine/include/de10-nano-common.inc b/conf/machine/include/de10-nano-common.inc index 307cd12..a64fa3f 100644 --- a/conf/machine/include/de10-nano-common.inc +++ b/conf/machine/include/de10-nano-common.inc @@ -32,10 +32,11 @@ INHERIT += " rootfs_ipk " BAD_RECOMMENDATIONS = " libavahi-core avahi-utils avahi-daemon avahi-autoipd libnss-mdns cpufrequtils fbset consolekit wireless-tools " RDEPENDS_pulseaudio-module-console-kit_remove = "consolekit" -DISTRO_FEATURES_remove = "opengl" -DISTRO_FEATURES_remove = "opencl" -DISTRO_FEATURES_remove = "wayland" +DISTRO_FEATURES_remove = "opengl" +DISTRO_FEATURES_remove = "opencl" +DISTRO_FEATURES_remove = "wayland" DISTRO_FEATURES_remove = "zeroconf" +DISTRO_FEATURES += "systemd" # remove wireless-tools as it is unmaintained VIRTUAL-RUNTIME_wireless-tools = "iw" @@ -44,7 +45,6 @@ VIRTUAL-RUNTIME_wireless-tools = "iw" INHERIT += " extrausers " EXTRA_USERS_PARAMS = "usermod -p U6aMy0wojraho root;" -require conf/distro/include/security_flags.inc # with security flags, some packages fail SECURITY_CFLAGS_pn-libvncserver = "" -- cgit v1.1