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
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
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
b16288bb
Commit
b16288bb
authored
Aug 25, 2021
by
Anton Midyukov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add COMMON_LISTS variable support by analogy COMMON_PACKAGES
The commit
99695713
used this variable even though it didn't exist yet. A good reason to add this variable.
parent
94213d29
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
13 additions
and
10 deletions
+13
-10
README
conf.d/README
+3
-2
pkglists.txt
doc/pkglists.txt
+3
-3
90-build-ve.mk
features.in/build-ve/lib/90-build-ve.mk
+1
-1
90-build-vm.mk
features.in/build-vm/lib/90-build-vm.mk
+1
-1
stage2cfg.mk
features.in/live/live/stage2cfg.mk
+2
-1
50-metadata.mk
features.in/metadata/lib/50-metadata.mk
+1
-1
stage2cfg.mk
features.in/rescue/rescue/stage2cfg.mk
+1
-1
Makefile
sub.in/main/Makefile
+1
-0
No files found.
conf.d/README
View file @
b16288bb
...
...
@@ -23,8 +23,9 @@
* для пользовательского окружения (live, main) предназначены
THE_PACKAGES, THE_LISTS, THE_GROUPS, THE_PACKAGES_REGEXP
* для "обычного общего" (live, main, rescue) есть COMMON_PACKAGES
(NB: тоже попадают в базовую установку)
* для "обычного общего" (live, main, rescue) есть COMMON_PACKAGES и
COMMON_LISTS
(NB: тоже попадают в базовую установку, ve/ и vm/ сборки)
* SYSTEM_PACKAGES стоит применять крайне осторожно -- эти пакеты попадут
во все стадии, в том числе в образ чувствительной к объёму install2
...
...
doc/pkglists.txt
View file @
b16288bb
...
...
@@ -5,7 +5,7 @@
* main: пакетная база для установки
** sub.in/main/Makefile, features.in/*/main/lib/
** THE_LISTS, BASE_LISTS, MAIN_LISTS
** THE_LISTS, BASE_LISTS, MAIN_LISTS
, COMMON_LISTS
** THE_GROUPS, MAIN_GROUPS
** THE_PACKAGES, BASE_PACKAGES, MAIN_PACKAGES,
SYSTEM_PACKAGES, COMMON_PACKAGES
...
...
@@ -31,7 +31,7 @@
** см. stage2
** features.in/live/live/stage2cfg.mk,
features.in/*/live/lib/
** THE_LISTS, LIVE_LISTS
** THE_LISTS, LIVE_LISTS
, COMMON_LISTS
** THE_GROUPS, LIVE_GROUPS
** THE_PACKAGES, LIVE_PACKAGES, COMMON_PACKAGES
** THE_PACKAGES_REGEXP, LIVE_PACKAGES_REGEXP
...
...
@@ -41,7 +41,7 @@
** см. stage2
** features.in/rescue/rescue/stage2cfg.mk
** RESCUE_PACKAGES, COMMON_PACKAGES
** RESCUE_LISTS
** RESCUE_LISTS
, COMMON_LISTS
* stage1: ядро и загрузчик второй стадии
** sub.in/stage1/Makefile, features.in/*/stage1/lib/
...
...
features.in/build-ve/lib/90-build-ve.mk
View file @
b16288bb
...
...
@@ -19,7 +19,7 @@ IMAGE_PACKAGES = $(DOT_BASE) \
$(COMMON_PACKAGES) \
$(BASE_PACKAGES) \
$(THE_PACKAGES) \
$(call list,$(BASE_LISTS) $(THE_LISTS))
$(call list,$(BASE_LISTS) $(THE_LISTS)
$(COMMON_LISTS)
)
IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
$(BASE_PACKAGES_REGEXP)
...
...
features.in/build-vm/lib/90-build-vm.mk
View file @
b16288bb
...
...
@@ -5,7 +5,7 @@ IMAGE_PACKAGES = $(DOT_BASE) \
$(COMMON_PACKAGES) \
$(BASE_PACKAGES) \
$(THE_PACKAGES) \
$(call list,$(BASE_LISTS) $(THE_LISTS))
$(call list,$(BASE_LISTS) $(THE_LISTS)
$(COMMON_LISTS)
)
IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
$(BASE_PACKAGES_REGEXP)
...
...
features.in/live/live/stage2cfg.mk
View file @
b16288bb
...
...
@@ -7,7 +7,8 @@ IMAGE_PACKAGES_REGEXP = $(LIVE_PACKAGES_REGEXP) $(THE_PACKAGES_REGEXP)
IMAGE_PACKAGES = $(COMMON_PACKAGES) $(LIVE_PACKAGES) $(THE_PACKAGES) \
$(call map,list, \
$(LIVE_LISTS) $(LIVE_GROUPS) \
$(THE_LISTS) $(THE_GROUPS)) \
$(THE_LISTS) $(THE_GROUPS) \
$(COMMON_LISTS)) \
interactivesystem
MKI_PACK_RESULTS = squash:live
...
...
features.in/metadata/lib/50-metadata.mk
View file @
b16288bb
...
...
@@ -27,7 +27,7 @@ metadata-.base:
{ \
echo "## generated by features.in/metadata/lib/50-metadata.mk";\
$(foreach p,SYSTEM COMMON THE BASE,$(call dump,PACKAGES,$(p))) \
$(foreach l,THE BASE,$(call dump,LISTS,$(l))) \
$(foreach l,
COMMON
THE BASE,$(call dump,LISTS,$(l))) \
if [ -n "$(DOT_BASE)" ]; then \
echo -e "\n## DOT_BASE\n$(DOT_BASE)"; \
fi; \
...
...
features.in/rescue/rescue/stage2cfg.mk
View file @
b16288bb
...
...
@@ -2,7 +2,7 @@
IMAGE_PACKAGES = $(COMMON_PACKAGES) \
$(RESCUE_PACKAGES) \
$(call list,$(RESCUE_LISTS)) \
$(call list,$(RESCUE_LISTS)
$(COMMON_LISTS)
) \
interactivesystem startup-rescue
MKI_PACK_RESULTS = squash:rescue
...
...
sub.in/main/Makefile
View file @
b16288bb
...
...
@@ -27,6 +27,7 @@ IMAGE_PACKAGES_REGEXP = $(BASE_PACKAGES_REGEXP) \
IMAGE_PACKAGES
=
$(SYSTEM_PACKAGES)
$(COMMON_PACKAGES)
\
$(BASE_PACKAGES)
$(THE_PACKAGES)
$(MAIN_PACKAGES)
\
$
(
call map,list,
$(BASE_LISTS)
$(THE_LISTS)
$(MAIN_LISTS)
\
$(COMMON_LISTS)
\
$
(
call groups2lists
))
-include
$(sort
$(wildcard
lib/*.mk))
...
...
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