From 2ea157af009d040f92817b3362d9994e5854ea30 Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Thu, 24 Jun 2021 22:11:44 +0700 Subject: [PATCH] mixin.mk, regular.mk, regular-vm.mk: add deepin rootfs targets --- conf.d/mixin.mk | 3 +++ conf.d/regular-vm.mk | 5 +++++ conf.d/regular.mk | 3 +-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/conf.d/mixin.mk b/conf.d/mixin.mk index cb76c27f..e728ff2b 100644 --- a/conf.d/mixin.mk +++ b/conf.d/mixin.mk @@ -96,6 +96,9 @@ mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck \ mixin/regular-cinnamon: use/x11/cinnamon use/x11/lightdm/slick +nm-gtk \ use/fonts/ttf/google use/net/nm/mmgui use/im; @: +mixin/regular-deepin: use/x11/deepin use/browser/chromium + @$(call add,THE_PACKAGES,deepin-regular) + mixin/regular-gnome3: use/x11/gnome3 use/fonts/ttf/redhat +nm-gtk @$(call add,THE_PACKAGES,gnome3-regular xcalib templates) @$(call add,THE_PACKAGES,chrome-gnome-shell) diff --git a/conf.d/regular-vm.mk b/conf.d/regular-vm.mk index 5426a403..51f3cfbf 100644 --- a/conf.d/regular-vm.mk +++ b/conf.d/regular-vm.mk @@ -71,6 +71,8 @@ vm/regular-icewm-sysv: vm/.regular-desktop-sysv mixin/regular-icewm \ vm/regular-cinnamon: vm/.regular-gtk mixin/regular-cinnamon mixin/vm-archdep; @: +vm/regular-deepin: vm/.regular-gtk mixin/regular-deepin mixin/vm-archdep; @: + vm/regular-gnome3: vm/.regular-gtk mixin/regular-gnome3 mixin/vm-archdep; @: vm/regular-lxde: vm/.regular-gtk mixin/regular-lxde mixin/vm-archdep; @: @@ -98,6 +100,9 @@ vm/regular-jeos-sysv-rpi: vm/net mixin/regular-vm-jeos use/tty/AMA0 \ vm/regular-builder-rpi: vm/regular-jeos-systemd-rpi mixin/regular-builder; @: +vm/regular-deepin-rpi: vm/.regular-gtk use/x11/deepin use/arm-rpi4/full + @$(call add,THE_PACKAGES,deepin-regular) + vm/regular-lxde-rpi: vm/.regular-gtk mixin/regular-lxde use/arm-rpi4/full; @: vm/regular-lxqt-rpi: vm/.regular-gtk mixin/regular-lxqt use/arm-rpi4/full; @: diff --git a/conf.d/regular.mk b/conf.d/regular.mk index d3bd9b34..5a4b0eee 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -165,8 +165,7 @@ distro/regular-gnome3: distro/.regular-desktop mixin/regular-gnome3 \ distro/regular-lxqt: distro/.regular-gtk mixin/regular-lxqt +plymouth @$(call add,THE_LISTS,$(call tags,lxqt desktop)) -distro/regular-deepin: distro/.regular-gtk use/x11/deepin - @$(call add,THE_PACKAGES,deepin-regular) +distro/regular-deepin: distro/.regular-gtk mixin/regular-deepin; @: distro/regular-kde5: distro/.regular-desktop \ mixin/regular-kde5 use/domain-client +plymouth; @: