From f7043b4a3addfce7621711fd8486aea4424480ef Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Sun, 21 Mar 2021 09:30:39 +0700 Subject: [PATCH] Revert "grub: Drop multiple kernel support" This reverts commit 5848ae70df1daf7950e7b4e3a18822210d496462. --- features.in/grub/generate.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/features.in/grub/generate.mk b/features.in/grub/generate.mk index a9b22bd9..42984279 100644 --- a/features.in/grub/generate.mk +++ b/features.in/grub/generate.mk @@ -27,6 +27,10 @@ ifdef LOCALE GRUB_CFG := $(GRUB_CFG) lang endif +ifneq ($(words $(KFLAVOURS)),1) +GRUB_CFG := $(GRUB_CFG) kernel +endif + DSTDIR := $(BUILDDIR)/stage1/files/boot/grub/.in DSTCFGS := $(DSTDIR)/*.cfg @@ -95,6 +99,9 @@ bootargs: clean sed -i "s, lang=.lang,,g" $(DSTCFGS); \ fi; \ sed -i "/lang=@LOCALE@/d" $(DSTCFGS) + @if [ $$(echo $(KFLAVOURS) | wc -w) -gt 1 ]; then \ + sed -i "s,@KFLAVOUR@,$(KFLAVOURS),g" $(DSTCFGS); \ + fi GRUBTHEME=$(GRUBTHEME); \ [ -n "$$GRUBTHEME" ] || GRUBTHEME=$$(cut -d "-" -f2 <<< $(BRANDING)); \ sed -i "s,@grubtheme@,$$GRUBTHEME,g" $(DSTCFGS)