Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mkimage-profiles
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2
Issues
2
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ximper Linux
mkimage-profiles
Commits
80090d1f
Commit
80090d1f
authored
Mar 21, 2012
by
Michael Shigorin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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
4 changed files
with
10 additions
and
10 deletions
+10
-10
desktop.mk
conf.d/desktop.mk
+4
-7
server.mk
conf.d/server.mk
+1
-2
config.mk
features.in/install2/config.mk
+4
-0
vars.mk
image.in/vars.mk
+1
-1
No files found.
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment