keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

p9.mk, regular.mk, regular-vm.mk: rename targets for unification

Browse Source
This commit is contained in:
Anton Midyukov 2019-11-17 01:40:39 +07:00
parent 26a9453cd0
commit 7b817a260d
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
conf.d/p9.mk
View File

@ -8,16 +8,16 @@ mixin/p9: use/browser/firefox/esr
ifeq (distro,$(IMAGE_CLASS))
distro/alt-p9-cinnamon distro/alt-p9-enlightenment \
distro/alt-p9-gnome3 distro/alt-p9-gnustep \
distro/alt-p9-icewm distro/alt-p9-kde5 \
distro/alt-p9-gnome3 distro/alt-p9-gnustep-sysv \
distro/alt-p9-icewm-sysv distro/alt-p9-kde5 \
distro/alt-p9-lxde distro/alt-p9-lxqt \
distro/alt-p9-mate distro/alt-p9-rescue \
distro/alt-p9-wmaker distro/alt-p9-xfce \
distro/alt-p9-xfce-sysv distro/alt-p9-sysv-xfce: \
distro/alt-p9-wmaker-sysv distro/alt-p9-xfce \
distro/alt-p9-xfce-sysv distro/alt-p9-xfce-sysv-install: \
distro/alt-p9-%: distro/regular-% mixin/p9; @:
distro/alt-p9-jeos distro/alt-p9-jeos-ovz \
distro/alt-p9-server distro/alt-p9-server-ovz \
distro/alt-p9-jeos-sysv distro/alt-p9-jeos-ovz \
distro/alt-p9-server-sysv distro/alt-p9-server-ovz \
distro/alt-p9-server-hyperv distro/alt-p9-server-samba4 \
distro/alt-p9-server-pve distro/alt-p9-server-lxd: \
distro/alt-p9-%: distro/regular-% mixin/p9; @:
@ -42,7 +42,7 @@ vm/alt-p9-opennebula: vm/opennebula-systemd mixin/p9; @:
# universal builds rootfs and image for all platforms
vm/alt-p9-jeos-systemd vm/alt-p9-jeos-sysv vm/alt-p9-builder \
vm/alt-p9-cinnamon vm/alt-p9-kde5 \
vm/alt-p9-icewm vm/alt-p9-lxde \
vm/alt-p9-icewm-sysv vm/alt-p9-lxde \
vm/alt-p9-lxqt vm/alt-p9-mate \
vm/alt-p9-xfce: \
vm/alt-p9-%: vm/regular-% mixin/p9; @:
@ -71,7 +71,7 @@ vm/tavolga-alt-p9-jeos-systemd vm/tavolga-alt-p9-jeos-sysv \
vm/tavolga-alt-p9-lxde vm/tavolga-alt-p9-lxqt \
vm/tavolga-alt-p9-mate vm/tavolga-alt-p9-xfce \
vm/tavolga-alt-p9-icewm: \
vm/tavolga-alt-p9-icewm-sysv: \
vm/tavolga-alt-p9-%: vm/tavolga-regular-% mixin/p9; @:
vm/bfk3-alt-p9-jeos-systemd vm/bfk3-alt-p9-jeos-sysv \
@ -79,7 +79,7 @@ vm/bfk3-alt-p9-jeos-systemd vm/bfk3-alt-p9-jeos-sysv \
vm/bfk3-alt-p9-%: vm/bfk3-regular-% mixin/p9; @:
vm/bfk3-alt-p9-lxde vm/bfk3-alt-p9-lxqt vm/bfk3-alt-p9-mate \
vm/bfk3-alt-p9-xfce vm/bfk3-alt-p9-icewm: \
vm/bfk3-alt-p9-xfce vm/bfk3-alt-p9-icewm-sysv: \
vm/bfk3-alt-p9-%: vm/bfk3-regular-% mixin/p9; @:
endif

6
conf.d/regular-vm.mk
View File

@ -47,7 +47,7 @@ vm/regular-jeos-sysv: vm/net mixin/regular-vm-jeos mixin/vm-archdep +power; @:
vm/regular-builder: vm/regular-jeos-sysv mixin/regular-builder; @:
vm/regular-icewm: vm/.regular-desktop-sysv mixin/regular-icewm \
vm/regular-icewm-sysv: vm/.regular-desktop-sysv mixin/regular-icewm \
mixin/vm-archdep; @:
vm/regular-cinnamon: vm/.regular-gtk mixin/regular-cinnamon mixin/vm-archdep \
@ -122,7 +122,7 @@ vm/tavolga-regular-jeos-sysv: vm/net mixin/regular-vm-jeos \
vm/tavolga-regular-builder: vm/tavolga-regular-jeos-sysv \
mixin/regular-builder; @:
vm/tavolga-regular-icewm: vm/.regular-desktop-sysv mixin/regular-icewm \
vm/tavolga-regular-icewm-sysv: vm/.regular-desktop-sysv mixin/regular-icewm \
use/mipsel-mitx/x11; @:
vm/tavolga-regular-lxde: vm/.regular-gtk mixin/regular-lxde \
@ -149,7 +149,7 @@ vm/bfk3-regular-jeos-sysv: vm/net mixin/regular-vm-jeos \
vm/bfk3-regular-builder: vm/bfk3-regular-jeos-sysv \
mixin/regular-builder; @:
vm/bfk3-regular-icewm: vm/.regular-desktop-sysv mixin/regular-icewm \
vm/bfk3-regular-icewm-sysv: vm/.regular-desktop-sysv mixin/regular-icewm \
use/mipsel-bfk3/x11; @:
vm/bfk3-regular-lxde: vm/.regular-gtk mixin/regular-lxde \

12
conf.d/regular.mk
View File

@ -82,7 +82,7 @@ distro/.regular-jeos: distro/.regular-jeos-base \
# NB:
# - stock cleanup is not enough (or installer-common-stage3 deps soaring)
distro/regular-jeos: distro/.regular-jeos use/cleanup/jeos/full \
distro/regular-jeos-sysv: distro/.regular-jeos use/cleanup/jeos/full \
use/volumes/jeos use/install2/vmguest use/vmguest/bare
@$(call add,BASE_PACKAGES,nfs-utils gdisk)
@$(call add,MAIN_PACKAGES,firmware-linux)
@ -111,16 +111,16 @@ distro/.regular-install-x11-full: distro/.regular-install-x11 \
@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
@$(call add,DEFAULT_SERVICES_ENABLE,alteratord)
distro/regular-icewm: distro/.regular-gtk-sysv mixin/regular-icewm \
distro/regular-icewm-sysv: distro/.regular-gtk-sysv mixin/regular-icewm \
use/browser/chromium
@$(call set,KFLAVOURS,un-def)
# wdm can't do autologin so add standalone one for livecd
distro/regular-wmaker: distro/.regular-desktop-sysv \
distro/regular-wmaker-sysv: distro/.regular-desktop-sysv \
mixin/regular-wmaker use/live/autologin
@$(call add,LIVE_PACKAGES,wdm wmxkbru)
distro/regular-gnustep: distro/.regular-desktop-sysv \
distro/regular-gnustep-sysv: distro/.regular-desktop-sysv \
mixin/regular-wmaker mixin/regular-gnustep; @:
distro/regular-gnustep-systemd: distro/.regular-wm +systemd \
mixin/regular-wmaker mixin/regular-gnustep; @:
@ -130,7 +130,7 @@ distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce; @:
distro/regular-xfce-sysv: distro/.regular-gtk-sysv mixin/regular-xfce-sysv; @:
distro/regular-sysv-xfce: distro/.regular-install-x11-full \
distro/regular-xfce-sysv-install: distro/.regular-install-x11-full \
mixin/regular-xfce-sysv; @:
distro/regular-lxde: distro/.regular-gtk mixin/regular-lxde; @:
@ -200,7 +200,7 @@ distro/.regular-server-managed: distro/.regular-server
@$(call add,INSTALL2_PACKAGES,ntfs-3g)
@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord)
distro/regular-server: distro/.regular-server-managed \
distro/regular-server-sysv: distro/.regular-server-managed \
use/server/groups/base use/dev/groups/builder use/install2/vnc/full
@$(call add,MAIN_GROUPS,server/sambaDC)
@$(call add,MAIN_GROUPS,tools/hyperv)