Skip to content

M
mkimage-profiles
Commit 80090d1f authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

minor tweaks (no functional changes)

Mostly multiline compactions, but also use/install2/net got factored out from distro/server-ovz for future reuse.
parent 7ffd6000
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
conf.d/desktop.mk
View file @ 80090d1f
# desktop distributions # desktop distributions
ifeq (distro,$(IMAGE_CLASS)) ifeq (distro,$(IMAGE_CLASS))
distro/.desktop-base: distro/.installer \ distro/.desktop-base: distro/.installer use/syslinux/ui-vesamenu use/x11/xorg
use/syslinux/ui-vesamenu use/x11/xorg
@$(call set,INSTALLER,desktop) @$(call set,INSTALLER,desktop)
distro/.desktop-mini: distro/.desktop-base \ distro/.desktop-mini: distro/.desktop-base use/lowmem use/x11/xdm \
use/lowmem use/x11/xdm use/power/acpi/button \ use/power/acpi/button use/cleanup/alterator; @:
use/cleanup/alterator; @:
distro/tde: distro/.desktop-mini +tde distro/tde: distro/.desktop-mini +tde
@$(call add,BASE_LISTS, \ @$(call add,BASE_LISTS,$(call tags,(base || desktop) && network))
$(call tags,(base || desktop) && network))
distro/icewm: distro/.desktop-mini +icewm; @: distro/icewm: distro/.desktop-mini +icewm; @:
distro/ltsp-icewm: distro/icewm +ltsp; @: distro/ltsp-icewm: distro/icewm +ltsp; @:
......
conf.d/server.mk
View file @ 80090d1f
...@@ -14,7 +14,7 @@ distro/server-mini: distro/.server-base use/cleanup/x11-alterator ...@@ -14,7 +14,7 @@ distro/server-mini: distro/.server-base use/cleanup/x11-alterator
distro/server-systemd: distro/server-mini use/systemd use/bootloader/lilo; @: distro/server-systemd: distro/server-mini use/systemd use/bootloader/lilo; @:
distro/server-ovz: distro/server-mini \ distro/server-ovz: distro/server-mini use/install2/net \
use/hdt use/rescue use/firmware/server use/power/acpi/button use/hdt use/rescue use/firmware/server use/power/acpi/button
@$(call set,STAGE1_KFLAVOUR,std-def) @$(call set,STAGE1_KFLAVOUR,std-def)
@$(call set,KFLAVOURS,std-def ovz-el) @$(call set,KFLAVOURS,std-def ovz-el)
...@@ -22,7 +22,6 @@ distro/server-ovz: distro/server-mini \ ...@@ -22,7 +22,6 @@ distro/server-ovz: distro/server-mini \
@$(call add,MAIN_KMODULES,bcmwl ndiswrapper) @$(call add,MAIN_KMODULES,bcmwl ndiswrapper)
@$(call add,MAIN_KMODULES,ipset ipt-netflow opendpi pf_ring xtables-addons) @$(call add,MAIN_KMODULES,ipset ipt-netflow opendpi pf_ring xtables-addons)
@$(call add,MAIN_KMODULES,drbd83 kvm) @$(call add,MAIN_KMODULES,drbd83 kvm)
@$(call add,INSTALL2_PACKAGES,curl) ### should become curl-mini
@$(call add,BASE_LISTS,ovz-server) @$(call add,BASE_LISTS,ovz-server)
@$(call add,MAIN_LISTS,kernel-wifi) @$(call add,MAIN_LISTS,kernel-wifi)
@$(call add,MAIN_GROUPS,dns-server http-server ftp-server kvm-server) @$(call add,MAIN_GROUPS,dns-server http-server ftp-server kvm-server)
......
features.in/install2/config.mk
View file @ 80090d1f
...@@ -4,3 +4,7 @@ use/install2: use/stage2 sub/stage2/install2 use/cleanup/installer ...@@ -4,3 +4,7 @@ use/install2: use/stage2 sub/stage2/install2 use/cleanup/installer
@$(call add,INSTALL2_PACKAGES,branding-$$(BRANDING)-alterator) @$(call add,INSTALL2_PACKAGES,branding-$$(BRANDING)-alterator)
@$(call add,BASE_PACKAGES,branding-$$(BRANDING)-release) @$(call add,BASE_PACKAGES,branding-$$(BRANDING)-release)
@$(call add,BASE_LISTS,$(call tags,basesystem)) @$(call add,BASE_LISTS,$(call tags,basesystem))
### FR: curl-mini
use/install2/net: use/install2
@$(call add,INSTALL2_PACKAGES,curl)
image.in/vars.mk
View file @ 80090d1f
...@@ -10,7 +10,7 @@ PREFS := $(.VARIABLES) ...@@ -10,7 +10,7 @@ PREFS := $(.VARIABLES)
DISTCFG := $(.VARIABLES) DISTCFG := $(.VARIABLES)
# a separator variable # a separator variable
-- := -- -- = --
.PHONY: dump-vars .PHONY: dump-vars
......
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