From 82bf8c1c0fbbc3c3d86fa96887d18f720d7ca3f1 Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Thu, 14 Mar 2019 02:00:47 +0700 Subject: [PATCH] regular.mk: added dependency on mixin/regular-x11 This allows to unify the contents of regular builds. --- conf.d/regular.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/conf.d/regular.mk b/conf.d/regular.mk index a4c9fad4..3738c899 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -84,12 +84,9 @@ distro/regular-jeos-ovz: distro/.regular-jeos \ use/server/ovz-base use/control/server/ldv use/firmware @$(call add,THE_PACKAGES,ipmitool lm_sensors3 mailx) -distro/.regular-install-x11: distro/.regular-install \ - use/install2/suspend mixin/regular-desktop +vmguest +wireless \ - use/ntp/client +distro/.regular-install-x11: distro/.regular-install +vmguest +wireless \ + use/install2/suspend mixin/regular-desktop mixin/regular-x11 @$(call set,INSTALLER,altlinux-desktop) - @$(call add,THE_PACKAGES,disable-usb-autosuspend) - @$(call add,THE_LISTS,$(call tags,regular desktop)) # assumes somewhat more experienced user, mostly for sysv variants distro/.regular-install-x11-full: distro/.regular-install-x11 \