From d75b2dca31ed9e6ea9fecdba5a1e4448677fede0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 7 Oct 2018 13:30:30 +0200 Subject: [PATCH] Restructure defaults MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- conf/distro/include/mortsgna-core-tweaks.inc | 8 ------- conf/distro/mortsgna.conf | 25 ++++++++++++++------ 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/conf/distro/include/mortsgna-core-tweaks.inc b/conf/distro/include/mortsgna-core-tweaks.inc index f4016ad..45611dd 100644 --- a/conf/distro/include/mortsgna-core-tweaks.inc +++ b/conf/distro/include/mortsgna-core-tweaks.inc @@ -25,18 +25,10 @@ PRINC ??= "0" # Shared state fixups MACHINEOVERRIDES[vardepsexclude] += "SOC_FAMILY" -# Image features strongly suggested -EXTRA_IMAGE_FEATURES += "package-management empty-root-password allow-empty-password post-install-logging" - # Prefer libjpeg-turbo PREFERRED_PROVIDER_jpeg = "libjpeg-turbo" PREFERRED_PROVIDER_jpeg-native = "libjpeg-turbo-native" -# Prefer the one from meta-oe over the one in oe-core -PREFERRED_PROVIDER_virtual/libx11 = "libx11" -PREFERRED_PROVIDER_virtual/xserver-xf86 = "xserver-xorg" -PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" - # libtool REVISIT PREFERRED_PROVIDER_libltdl-dev = "libtool" diff --git a/conf/distro/mortsgna.conf b/conf/distro/mortsgna.conf index 15e1d24..129f43e 100644 --- a/conf/distro/mortsgna.conf +++ b/conf/distro/mortsgna.conf @@ -51,9 +51,6 @@ require conf/distro/include/mortsgna.inc # disable static libs (not yet tested - might need recipe adjustments) #require conf/distro/include/no-static-libs.inc -# Prefer openssh over dropbear when using packagegroup-basic -TASK_BASIC_SSHDAEMON = "openssh-ssh openssh-sshd openssh-scp openssh-sftp openssh-sftp-server" - # Toolchain virtuals: require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc @@ -66,6 +63,13 @@ XSERVER ?= " \ xf86-input-libinput \ xf86-video-modesetting \ " +PREFERRED_PROVIDER_virtual/libx11 = "libx11" +PREFERRED_PROVIDER_virtual/xserver-xf86 = "xserver-xorg" +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" + +# For X11/Wayland images we install an unpriviledged user by default. If this +# is not desired override DISTRO_GUI_USER +DISTRO_GUI_USER ?= "unpriv-user" # If you don't want parts of this in your packagegroup-base using images you can put this in the image recipe: # BAD_RECOMMENDATIONS = "" @@ -92,10 +96,17 @@ DISTRO_EXTRA_RRECOMMENDS += " \ less \ " +# Prefer openssh over dropbear when using packagegroup-basic +TASK_BASIC_SSHDAEMON = "openssh-ssh openssh-sshd openssh-scp openssh-sftp openssh-sftp-server" + +# Image features strongly suggested +EXTRA_IMAGE_FEATURES += " \ + package-management \ + empty-root-password \ + allow-empty-password \ + post-install-logging \ +" + # workaround oe-core long lasting bulls.. 049f89155b1e80875aad6e53b21808b827c06915 # make x11-base a valid IMAGE_FEATURES again IMAGE_FEATURES[validitems] += "x11-base" - -# For X11/Wayland images we install an unpriviledged user by default. If this -# is not desired override DISTRO_GUI_USER -DISTRO_GUI_USER ?= "unpriv-user"