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
5319a298
Commit
5319a298
authored
Dec 25, 2025
by
Anton Midyukov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup syslinux gfxboot everything
gfxboot has not been used by anyone for a long time and has been removed from Sisyphus.
parent
65ae1aa3
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
4 additions
and
26 deletions
+4
-26
mixin.mk
conf.d/mixin.mk
+0
-5
regular.mk
conf.d/regular.mk
+1
-1
features.txt
doc/features.txt
+1
-1
config.mk
features.in/branding/config.mk
+1
-2
README
features.in/isohybrid/README
+0
-4
01gfxboot.cfg
features.in/syslinux/cfg.in/01gfxboot.cfg
+0
-4
config.mk
features.in/syslinux/config.mk
+0
-6
generate.mk
features.in/syslinux/generate.mk
+1
-3
No files found.
conf.d/mixin.mk
View file @
5319a298
...
@@ -208,11 +208,6 @@ mixin/office: use/fonts/ttf/google use/fonts/ttf/xo
...
@@ -208,11 +208,6 @@ mixin/office: use/fonts/ttf/google use/fonts/ttf/xo
@$(call add,THE_LISTS,$(call tags,desktop && (cups || office)))
@$(call add,THE_LISTS,$(call tags,desktop && (cups || office)))
@$(call add,THE_PACKAGES,apt-indicator)
@$(call add,THE_PACKAGES,apt-indicator)
# NB: never ever use/syslinux/ui/gfxboot here as gfxboot mangles
# kernel cmdline resulting in method:disk instead of method:cdrom
# which will change propagator's behaviour to probe additional
# filesystems (ro but no loop) thus potentially writing to
# an unrecovered filesystem's journal
mixin/regular-rescue: use/rescue use/isohybrid use/luks use/branding \
mixin/regular-rescue: use/rescue use/isohybrid use/luks use/branding \
use/syslinux/ui/menu use/syslinux/timeout/600 \
use/syslinux/ui/menu use/syslinux/timeout/600 \
use/rescue/.base use/syslinux/sdab.cfg use/grub/sdab_bios.cfg \
use/rescue/.base use/syslinux/sdab.cfg use/grub/sdab_bios.cfg \
...
...
conf.d/regular.mk
View file @
5319a298
...
@@ -43,7 +43,7 @@ endif
...
@@ -43,7 +43,7 @@ endif
distro/.regular-desktop-base: distro/.regular-base use/branding/full \
distro/.regular-desktop-base: distro/.regular-base use/branding/full \
mixin/regular-desktop mixin/regular-desktop-install +wireless \
mixin/regular-desktop mixin/regular-desktop-install +wireless \
use/live/rw use/live/x11 use/live/repo use/vmguest/kvm \
use/live/rw use/live/x11 use/live/repo use/vmguest/kvm \
use/live/suspend use/
grub/ui/gfxboot use/
live/rescue
use/live/suspend use/live/rescue
@$(call add,THE_BRANDING,bootloader)
@$(call add,THE_BRANDING,bootloader)
@$(call add,LIVE_PACKAGES,livecd-rescue-base-utils)
@$(call add,LIVE_PACKAGES,livecd-rescue-base-utils)
@$(call set,GRUB_DEFAULT,live)
@$(call set,GRUB_DEFAULT,live)
...
...
doc/features.txt
View file @
5319a298
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
вынужденной необходимости либо контролировать включение нужных
вынужденной необходимости либо контролировать включение нужных
фич "вручную" в скриптах по косвенным признакам, либо выносить
фич "вручную" в скриптах по косвенным признакам, либо выносить
их в пакеты installer-feature-*); также возможно добиться большей
их в пакеты installer-feature-*); также возможно добиться большей
степени интеграции по данным (например, язык
gfxboot
и LiveCD).
степени интеграции по данным (например, язык и LiveCD).
Создание и упаковку installer-feature-* можно рекомендовать, если:
Создание и упаковку installer-feature-* можно рекомендовать, если:
...
...
features.in/branding/config.mk
View file @
5319a298
...
@@ -9,8 +9,7 @@ ifneq (,$(filter-out e2k%,$(ARCH)))
...
@@ -9,8 +9,7 @@ ifneq (,$(filter-out e2k%,$(ARCH)))
endif
endif
# NB: not every distro might have all the branding of its own
# NB: not every distro might have all the branding of its own
use/branding/full: use/branding/notes use/syslinux/ui/gfxboot \
use/branding/full: use/branding/notes
use/grub/ui/gfxboot
@$(call add,THE_BRANDING,alterator graphics)
@$(call add,THE_BRANDING,alterator graphics)
@$(call add,THE_BRANDING,indexhtml slideshow)
@$(call add,THE_BRANDING,indexhtml slideshow)
ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
...
...
features.in/isohybrid/README
View file @
5319a298
...
@@ -8,7 +8,3 @@
...
@@ -8,7 +8,3 @@
чтобы гарантировать гибридный вид образа, либо запросить включение
чтобы гарантировать гибридный вид образа, либо запросить включение
этой фичи при сборке конфигурации произвольного дистрибутива
этой фичи при сборке конфигурации произвольного дистрибутива
(ISOHYBRID=1, см. features.in/pack/config.mk).
(ISOHYBRID=1, см. features.in/pack/config.mk).
Обратите внимание: в propagator до 20101130-alt15 поддержка
автоматической загрузки с флэш-носителя, содержащего ISO-образ,
отсутствует, что компенсируется специальной обработкой в gfxboot.
features.in/syslinux/cfg.in/01gfxboot.cfg
deleted
100644 → 0
View file @
65ae1aa3
ui gfxboot bootlogo message
menu title @relname@
prompt 0
features.in/syslinux/config.mk
View file @
5319a298
...
@@ -17,12 +17,6 @@ endif
...
@@ -17,12 +17,6 @@ endif
# UI is overwritten
# UI is overwritten
use/syslinux/ui/%: use/syslinux
use/syslinux/ui/%: use/syslinux
@$(call set,SYSLINUX_UI,$*)
@$(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
endif
# modules and config snippets just add up
# modules and config snippets just add up
use/syslinux/%.com use/syslinux/%.c32: use/syslinux
use/syslinux/%.com use/syslinux/%.c32: use/syslinux
...
...
features.in/syslinux/generate.mk
View file @
5319a298
...
@@ -98,9 +98,7 @@ bootargs: clean
...
@@ -98,9 +98,7 @@ bootargs: clean
@sed -i "s,@LIVE_NAME@,$(LIVE_NAME),g" $(DSTCFGS)
@sed -i "s,@LIVE_NAME@,$(LIVE_NAME),g" $(DSTCFGS)
clean: copy
clean: copy
@if [ "$(SYSLINUX_UI)" = gfxboot ]; then \
@
sed -i "s/\^//;/menu label /d" $(DSTCFGS); \
fi
copy: prep
copy: prep
@cp -pLt $(DSTDIR) -- $(sort \
@cp -pLt $(DSTDIR) -- $(sort \
...
...
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