aboutsummaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorDavid Phillips <david@yeah.nah.nz>2019-11-24 14:27:12 +1300
committerDavid Phillips <david@yeah.nah.nz>2019-11-24 14:27:12 +1300
commit596586b7522256bcd664d28d1a7072a6f8831b4d (patch)
tree550b9825d4a68c86d06c75efdbf568175b95654e /conf
parentac84734859feb7db4994868dee6b74f73942380b (diff)
downloadmeta-de10-nano-596586b7522256bcd664d28d1a7072a6f8831b4d.tar.xz
Tweaks for zeus upgrade
Diffstat (limited to 'conf')
-rw-r--r--conf/layer.conf1
-rw-r--r--conf/machine/include/de10-nano-common.inc8
2 files changed, 5 insertions, 4 deletions
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 = ""