From 5848ae70df1daf7950e7b4e3a18822210d496462 Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Thu, 12 Nov 2020 21:41:32 +0700 Subject: [PATCH] grub: Drop multiple kernel support --- features.in/grub/generate.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/features.in/grub/generate.mk b/features.in/grub/generate.mk index 302248fe..f3faf1eb 100644 --- a/features.in/grub/generate.mk +++ b/features.in/grub/generate.mk @@ -27,10 +27,6 @@ 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,9 +91,6 @@ 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); \