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

Revert "grub: Drop multiple kernel support"

Browse Source 
This reverts commit 5848ae70df.
This commit is contained in:
Anton Midyukov 2021-03-21 09:30:39 +07:00
parent 918293f1f4
commit f7043b4a3a
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
features.in/grub/generate.mk
View File

@ -27,6 +27,10 @@ ifdef LOCALE
GRUB_CFG := $(GRUB_CFG) lang GRUB_CFG := $(GRUB_CFG) lang
endif endif
ifneq ($(words $(KFLAVOURS)),1)
GRUB_CFG := $(GRUB_CFG) kernel
endif
DSTDIR := $(BUILDDIR)/stage1/files/boot/grub/.in DSTDIR := $(BUILDDIR)/stage1/files/boot/grub/.in
DSTCFGS := $(DSTDIR)/*.cfg DSTCFGS := $(DSTDIR)/*.cfg
@ -95,6 +99,9 @@ bootargs: clean
sed -i "s, lang=.lang,,g" $(DSTCFGS); \ sed -i "s, lang=.lang,,g" $(DSTCFGS); \
fi; \ fi; \
sed -i "/lang=@LOCALE@/d" $(DSTCFGS) sed -i "/lang=@LOCALE@/d" $(DSTCFGS)
@if [ $$(echo $(KFLAVOURS) | wc -w) -gt 1 ]; then \
sed -i "s,@KFLAVOUR@,$(KFLAVOURS),g" $(DSTCFGS); \
fi
GRUBTHEME=$(GRUBTHEME); \ GRUBTHEME=$(GRUBTHEME); \
[ -n "$$GRUBTHEME" ] || GRUBTHEME=$$(cut -d "-" -f2 <<< $(BRANDING)); \ [ -n "$$GRUBTHEME" ] || GRUBTHEME=$$(cut -d "-" -f2 <<< $(BRANDING)); \
sed -i "s,@grubtheme@,$$GRUBTHEME,g" $(DSTCFGS) sed -i "s,@grubtheme@,$$GRUBTHEME,g" $(DSTCFGS)