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
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
02a5231b
Commit
02a5231b
authored
Oct 13, 2019
by
Anton Midyukov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stage1, stage2: allow multiple kernels
parent
639d1022
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
0 deletions
+11
-0
Makefile
sub.in/stage1/Makefile
+5
-0
Makefile
sub.in/stage2/Makefile
+6
-0
No files found.
sub.in/stage1/Makefile
View file @
02a5231b
...
@@ -21,8 +21,13 @@ include $(MKIMAGE_PREFIX)/targets.mk
...
@@ -21,8 +21,13 @@ include $(MKIMAGE_PREFIX)/targets.mk
# here we try and come up with the installer kernel/modules, if any;
# here we try and come up with the installer kernel/modules, if any;
# only a single kernel might be needed (STAGE1_KFLAVOUR sets explicitly);
# only a single kernel might be needed (STAGE1_KFLAVOUR sets explicitly);
# kernel image copied from instrumental chroot into .work/syslinux/alt0/
# kernel image copied from instrumental chroot into .work/syslinux/alt0/
# Update: for grub allowed choose kernels
ifeq
(,$(filter-out
x86_64
aarch64
ppc64le,$(ARCH)))
STAGE1_KFLAVOUR
?=
$(KFLAVOURS)
else
STAGE1_KFLAVOUR
?=
$
(
lastword
$(KFLAVOURS)
)
STAGE1_KFLAVOUR
?=
$
(
lastword
$(KFLAVOURS)
)
endif
# propagator needed iff stage1 kernel installed (not for e.g. syslinux.iso)
# propagator needed iff stage1 kernel installed (not for e.g. syslinux.iso)
ifneq
"$(STAGE1_KFLAVOUR)"
""
ifneq
"$(STAGE1_KFLAVOUR)"
""
...
...
sub.in/stage2/Makefile
View file @
02a5231b
...
@@ -29,7 +29,13 @@ IMAGE_PACKAGES += $(SYSTEM_PACKAGES) $(STAGE2_PACKAGES)
...
@@ -29,7 +29,13 @@ IMAGE_PACKAGES += $(SYSTEM_PACKAGES) $(STAGE2_PACKAGES)
# here we also try and come up with the stage1 kernel/modules, if any;
# here we also try and come up with the stage1 kernel/modules, if any;
# no kernel flavour specified will result in no modules for stage1 vmlinuz
# no kernel flavour specified will result in no modules for stage1 vmlinuz
# Update: for grub allowed choose kernels
ifeq
(,$(filter-out
x86_64
aarch64
ppc64le,$(ARCH)))
STAGE1_KFLAVOUR
?=
$(KFLAVOURS)
else
STAGE1_KFLAVOUR
?=
$
(
lastword
$(KFLAVOURS)
)
STAGE1_KFLAVOUR
?=
$
(
lastword
$(KFLAVOURS)
)
endif
ifeq
(,$(STAGE1_KFLAVOUR))
ifeq
(,$(STAGE1_KFLAVOUR))
$(error
STAGE1_KFLAVOUR
is
utterly
empty;
cannot
guess
either)
$(error
STAGE1_KFLAVOUR
is
utterly
empty;
cannot
guess
either)
...
...
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