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
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
216da236
Commit
216da236
authored
Jan 05, 2020
by
Anton Midyukov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
syslinux: do not use syslinux to generate config on unsupported arches
These are partial commits reverts:
01ee4075
e42bcdcb
5cfc7ede
parent
7ae39113
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
26 deletions
+4
-26
config.mk
features.in/syslinux/config.mk
+2
-18
20-propagator-ramdisk-syslinux
...ures.in/syslinux/scripts.d/20-propagator-ramdisk-syslinux
+1
-7
01-syslinux
features.in/syslinux/stage1/scripts.d/01-syslinux
+1
-1
No files found.
features.in/syslinux/config.mk
View file @
216da236
# default is plain text prompt
# NB: might be usbflash-ready hybrid iso
# on ppc64le, aarch64 syslinux feature is used only to generate config
# (it's converted into grub.cfg later)
ifeq (,$(filter-out i586 x86_64 ppc64le aarch64,$(ARCH)))
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
use/syslinux: sub/stage1 $(ISOHYBRID:%=use/isohybrid)
@$(call add_feature)
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call add,STAGE1_PACKAGES,syslinux)
@$(call try,BOOTVGA,normal)
@$(call add,SYSLINUX_FILES,/usr/lib/syslinux/pxelinux.0)
endif
@$(call try,META_SYSTEM_ID,SYSLINUX)
@$(call set,RELNAME,ALT ($(IMAGE_NAME)))
@$(call set,IMAGE_PACKTYPE,boot)
else
use/syslinux: ; @:
endif
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
# UI is overwritten
use/syslinux/ui/%: use/syslinux
@$(call set,SYSLINUX_UI,$*)
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@if [ "$*" == gfxboot ]; then \
$(call add,STAGE1_PACKAGES,gfxboot); \
$(call add,STAGE1_BRANDING,bootloader); \
fi
else
use/syslinux/ui/%: use/syslinux; @:
endif
# modules and config snippets just add up
...
...
@@ -40,11 +30,5 @@ use/syslinux/%.com use/syslinux/%.c32: use/syslinux
use/syslinux/%.cfg: use/syslinux
@$(call add,SYSLINUX_CFG,$*)
ifeq (,$(filter-out ppc64le aarch64,$(ARCH)))
use/syslinux/localboot.cfg use/syslinux/removable.cfg use/syslinux/lateboot.cfg use/syslinux/sdab.cfg: use/syslinux; @:
use/syslinux/install-vnc-connect.cfg: use/syslinux/grub-install-vnc-connect.cfg; @:
use/syslinux/install-vnc-listen.cfg: use/syslinux/grub-install-vnc-listen.cfg; @:
endif
use/syslinux/timeout/%: use/syslinux
@$(call set,SYSLINUX_TIMEOUT,$*)
features.in/syslinux/scripts.d/20-propagator-ramdisk-syslinux
View file @
216da236
...
...
@@ -5,16 +5,10 @@
cd
"
$WORKDIR
"
cfgs
=
"
$(
find syslinux boot/grub EFI/BOOT
-name
'*.cfg'
)
"
[
-n
"
$cfgs
"
]
||
{
echo
"
${
0
##*/
}
: did not find any config under /syslinux or /boot/grub"
>
&2
exit
1
}
# apply size census while looking for potential squashfs images
find
-maxdepth
1
-type
f
-size
+1M
\
|
sed
's,^\./,,'
\
|
while
read
image
;
do
size
=
"
$[
$(
stat
-c
%s
"
$image
"
)
/ 1024 + 1 ]"
sed
-i
"s,@
${
image
}
_size@,
$size
,"
$cfgs
sed
-i
"s,@
${
image
}
_size@,
$size
,"
syslinux/
*
.cfg
done
features.in/syslinux/stage1/scripts.d/01-syslinux
View file @
216da236
...
...
@@ -10,7 +10,7 @@ cd "$WORKDIR/syslinux"
# validate just in case (see also stage1 Makefile)
case
"
$GLOBAL_BOOTLOADER
"
in
isolinux|syslinux
|ieee1275boot|grubaa64boot
)
;;
isolinux|syslinux
)
;;
*
)
echo
"error: weird GLOBAL_BOOTLOADER:
\`
$GLOBAL_BOOTLOADER
'"
>
&2
;
exit
1
;;
esac
...
...
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