stepchenkoas/mkimage-profiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regular.mk, p8.mk: drop some corner cases

Browse Source 
No need to shorten most of the image names now due to #28271:
"ALT" prefix is 6 bytes shorter than "ALT Linux" and this
changes a lot for these particular names (<= 32-byte long)!
This commit is contained in:
Michael Shigorin 2016-08-15 13:21:18 +03:00
parent 9f0af1d112
commit eca96bc44e
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conf.d/p8.mk
View File

@ -23,10 +23,7 @@ distro/alt-p8-tde-sysv: distro/regular-tde-sysv mixin/p8; @:
distro/alt-p8-wmaker: distro/regular-wmaker mixin/p8; @:
distro/alt-p8-xfce: distro/regular-xfce mixin/p8; @:
distro/alt-p8-xfce-sysv: distro/regular-xfce-sysv mixin/p8; @:
distro/alt-p8-enlightenment: distro/regular-enlightenment mixin/p8
@$(call set,META_VOL_ID,ALT p8 E/$(ARCH))
distro/alt-p8-enlightenment: distro/regular-enlightenment mixin/p8; @:
distro/alt-p8-sysv-tde: distro/regular-sysv-tde mixin/p8; @:
distro/alt-p8-jeos: distro/regular-jeos mixin/p8; @:

6
conf.d/regular.mk
View File

@ -144,16 +144,14 @@ distro/regular-mate: distro/.regular-gtk +nm \
distro/regular-e17: distro/.regular-gtk use/x11/e17 use/fonts/infinality; @:
distro/regular-enlightenment: distro/.regular-gtk \
use/x11/enlightenment use/fonts/infinality
@$(call set,META_VOL_ID,ALT regular-E/$(ARCH))
use/x11/enlightenment use/fonts/infinality; @:
distro/regular-enlightenment-sysv: distro/.regular-sysv-gtk \
use/x11/enlightenment
@$(call set,META_VOL_ID,ALT regular-E-SysV/$(ARCH))
@$(call set,META_VOL_ID,ALT regular-E-SysV/$(ARCH)) # see also #28271
distro/regular-cinnamon: distro/.regular-gtk \
use/x11/cinnamon use/fonts/infinality use/net/nm/mmgui use/im
@$(call set,META_VOL_ID,ALT $(IMAGE_NAME)) # see also #28271
@$(call add,DEFAULT_SERVICES_ENABLE,powertop)
# not .regular-gtk due to gdm vs lightdm