From bd50f525df9dfe076c1e2057ba8260f490ff0e25 Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Tue, 9 Apr 2019 22:15:25 +0700 Subject: [PATCH] regular.mk, desktop+lxde: refactoring With the arrival of elogind in sysvinit, the lxde metapackage can be used for all builds. --- conf.d/regular.mk | 7 ++----- pkg.in/lists/tagged/desktop+lxde | 23 +---------------------- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/conf.d/regular.mk b/conf.d/regular.mk index bb9b5abb..dc4cab5f 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -120,11 +120,8 @@ distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce \ distro/regular-xfce-sysv: distro/.regular-sysv-gtk \ mixin/regular-xfce mixin/regular-xfce-sysv; @: -distro/regular-lxde: distro/.regular-gtk mixin/regular-lxde - @$(call add,THE_PACKAGES,lxde) - -distro/regular-lxde-sysv: distro/.regular-sysv-gtk mixin/regular-lxde - @$(call add,THE_PACKAGES,lxde-sysvinit) +distro/regular-lxde: distro/.regular-gtk mixin/regular-lxde; @: +distro/regular-lxde-sysv: distro/.regular-sysv-gtk mixin/regular-lxde; @: distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad @$(call add,LIVE_PACKAGES,livecd-regular-xmonad) diff --git a/pkg.in/lists/tagged/desktop+lxde b/pkg.in/lists/tagged/desktop+lxde index bc30ce8f..1c8a1599 100644 --- a/pkg.in/lists/tagged/desktop+lxde +++ b/pkg.in/lists/tagged/desktop+lxde @@ -1,23 +1,2 @@ -openbox - -pcmanfm2 -eject - +lxde lxde-settings-lxdesktop -lxde-common -lxde-lxpanel -lxde-lxsession -lxde-lxsession-edit -lxde-lxrandr -lxde-lxtask -lxde-lxshortcut -lxde-lxappearance -lxde-lxappearance-obconf -lxde-lxinput -lxde-lxhotkey -lxde-lxterminal - -menu-cache -altlinux-freedesktop-menu-lxde - -tango-icon-theme