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

cosmetic fixup (s/GROUPS/MAIN_GROUPS/g)

Browse Source 
MAIN_GROUPS should align better along with MAIN_PACKAGES
and MAIN_LISTS (even if MAIN_ prefix might be suboptimal
given that these packages are essentially extras within
the particular image).
This commit is contained in:
Michael Shigorin 2011-09-01 12:04:04 +03:00
parent 4dfd689810
commit b56df31624
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
distro.mk
View File

@ -65,9 +65,9 @@ distro/server-ovz: distro/server-base use/hdt use/rescue use/firmware/server
@$(call add,BASE_LISTS,ovz-server)
@$(call add,BASE_LISTS,$(call tags,base server))
@$(call add,MAIN_LISTS,kernel-wifi)
@$(call add,GROUPS,dns-server http-server ftp-server kvm-server)
@$(call add,GROUPS,ipmi mysql-server dhcp-server mail-server)
@$(call add,GROUPS,monitoring diag-tools)
@$(call add,MAIN_GROUPS,dns-server http-server ftp-server kvm-server)
@$(call add,MAIN_GROUPS,ipmi mysql-server dhcp-server mail-server)
@$(call add,MAIN_GROUPS,monitoring diag-tools)
# desktop distributions

2
features.in/live/live/stage2cfg.mk
View File

@ -2,7 +2,7 @@
IMAGE_PACKAGES = $(COMMON_PACKAGES) \
$(LIVE_PACKAGES) \
$(call map,list,$(LIVE_LISTS) $(LIVE_GROUPS)) \
$(call map,list,$(LIVE_LISTS) $(LIVE_MAIN_GROUPS)) \
interactivesystem
MKI_PACK_RESULTS = squash:live

4
image.in/Makefile
View File

@ -49,8 +49,8 @@ metadata: dot-base
@rm -f files/Metadata/pkg-groups.tar
# see also alterator-pkg (backend3/pkg-install); we only tar up what's up to it
@tar -cvf files/Metadata/pkg-groups.tar -C $(PKGDIR) \
$$(echo $(call list,$(GROUPS) .base) \
$(call group,$(GROUPS)) \
$$(echo $(call list,$(MAIN_GROUPS) .base) \
$(call group,$(MAIN_GROUPS)) \
| sed 's,$(PKGDIR)/*,,g')
dot-base:

6
pkg.in/groups/Makefile
View File

@ -10,9 +10,9 @@ SUFFIX := pkg/groups
TARGET := $(BUILDDIR)/$(SUFFIX)
all: $(GLOBAL_DEBUG)
@if [ -n "$(GROUPS)" ]; then \
@if [ -n "$(MAIN_GROUPS)" ]; then \
mkdir -p $(TARGET) && \
cp -at $(TARGET) -- $(addsuffix .directory,$(GROUPS)); \
cp -at $(TARGET) -- $(addsuffix .directory,$(MAIN_GROUPS)); \
type -t git >&/dev/null && \
cd $(TARGET) && \
git add . && \
@ -21,4 +21,4 @@ all: $(GLOBAL_DEBUG)
fi
debug:
@echo "** GROUPS: $(GROUPS)"
@echo "** MAIN_GROUPS: $(MAIN_GROUPS)"

2
pkg.in/groups/README
View File

@ -1,6 +1,6 @@
Этот каталог содержит описания групп, копируемые из метапрофиля
в создаваемый профиль по необходимости (только фигурирующие в
списке, которым является значение переменной GROUPS).
списке, которым является значение переменной MAIN_GROUPS).
В данный момент перенесено почти 1:1 из mkimage-profiles-desktop,
требует увязки с ../lists/tagged/.

2
pkg.in/lists/Makefile
View File

@ -35,7 +35,7 @@ all: $(TARGET) $(GLOBAL_DEBUG)
echo "$(BASE_PACKAGES)"; \
}; \
) | sed -re '/^[^[:space:]#]/ s/[[:space:]]+/\n/g' >$(TARGET)/.base
@[ -z "$(GROUPS)" ] || cp -at $(TARGET) $(GROUPS)
@[ -z "$(MAIN_GROUPS)" ] || cp -at $(TARGET) $(MAIN_GROUPS)
@type -t git >&/dev/null && \
cd $(TARGET) && \
git add . && \

2
sub.in/main/Makefile
View File

@ -15,7 +15,7 @@ CHROOT_PACKAGES = apt-utils rsync
IMAGE_PACKAGES_REGEXP = $(call kpackages,$(KMODULES),$(KFLAVOURS)) \
$(MAIN_PACKAGES_REGEXP)
IMAGE_PACKAGES = $(call map,list,$(BASE_LISTS) $(MAIN_LISTS) $(GROUPS)) \
IMAGE_PACKAGES = $(call map,list,$(BASE_LISTS) $(MAIN_LISTS) $(MAIN_GROUPS)) \
$(COMMON_PACKAGES) \
$(BASE_PACKAGES) \
$(MAIN_PACKAGES)