Skip to content

M
mkimage-profiles
Commit 9d10d78b authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

desktop.mk, live.mk, regular.mk, test.mk: cleanup

There was a semi-awful lot of long-abandoned targets spotted while factoring out mixins; let's just drop these for good, and if anyone needs some of those drop me a commit.
parent 0a87d477
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 36 deletions
conf.d/desktop.mk
View file @ 9d10d78b
......@@ -11,11 +11,6 @@ distro/.desktop-network: distro/.desktop-mini mixin/desktop-installer; @:
distro/.desktop-extra:
@$(call add,BASE_LISTS,$(call tags,(archive || base) && (extra)))
distro/kde4-lite: distro/.desktop-mini \
distro/.desktop-network distro/.desktop-extra +kde4-lite
@$(call set,KFLAVOURS,std-def)
distro/tde: distro/.desktop-network +tde; @:
distro/icewm: distro/.desktop-network use/lowmem use/install2/fs +icewm; @:
distro/ltsp-tde: distro/tde +ltsp; @:
distro/ltsp-icewm: distro/icewm +ltsp; @:
......
conf.d/live.mk
View file @ 9d10d78b
......@@ -107,8 +107,6 @@ distro/live-0ad: distro/.live-games
@$(call add,LIVE_PACKAGES,0ad livecd-0ad)
@$(call try,HOMEPAGE,http://play0ad.com/)
distro/live-e17: distro/.live-desktop-ru use/x11/e17 use/x11/lightdm/gtk; @:
distro/live-gimp: distro/live-icewm use/live/ru
@$(call add,LIVE_LISTS,$(call tags,desktop sane))
@$(call add,LIVE_PACKAGES,gimp tintii immix fim)
......
conf.d/regular.mk
View file @ 9d10d78b
......@@ -139,8 +139,6 @@ distro/regular-mate: distro/.regular-gtk +nm \
@$(call add,LIVE_LISTS,$(call tags,desktop sane))
@$(call add,LIVE_LISTS,$(call tags,base smartcard))
distro/regular-e17: distro/.regular-gtk use/x11/e17 use/fonts/infinality; @:
distro/regular-enlightenment: distro/.regular-gtk \
use/x11/enlightenment use/fonts/infinality; @:
......@@ -179,11 +177,6 @@ distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt; @:
distro/regular-lxqt-sysv: distro/.regular-sysv mixin/regular-lxqt \
use/net-eth/dhcp use/efi/refind; @:
distro/regular-sugar: distro/.regular-gtk use/x11/sugar; @:
distro/regular-leechcraft: distro/.regular-desktop \
use/x11/leechcraft use/x11/lightdm/lxqt +pulse; @:
distro/regular-kde5: distro/.regular-desktop \
use/x11/kde5 use/x11/sddm use/domain-client \
use/fonts/ttf/google use/fonts/ttf/redhat use/fonts/zerg \
......
conf.d/test.mk
View file @ 9d10d78b
......@@ -70,28 +70,6 @@ distro/elinks: distro/.base use/pid1/net
endif # IMAGE_CLASS: distro
ifeq (ve,$(IMAGE_CLASS))
ifeq (centos,$(REPO))
ve/.centos-base: ve/.bare
@$(call set,IMAGE_INIT_LIST,hasher-pkg-init)
ve/centos: ve/.centos-base
@$(call add,BASE_PACKAGES,openssh-server)
endif # REPO: centos
ifeq (opensuse,$(REPO))
ve/.opensuse-base: ve/.bare
@$(call set,IMAGE_INIT_LIST,hasher-pkg-init)
@$(call add,BASE_PACKAGES,aaa_base)
endif # REPO: opensuse
endif # IMAGE_CLASS: ve
ifeq (vm,$(IMAGE_CLASS))
vm/net-static: vm/bare use/net-eth use/net-ssh
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment