regular.mk: adapted for e2k

As discussed while tweaking power feature, e2k's powerbutton handling scheme differs slightly at the moment so it does need some special handling. No need to toss firmware-linux around if it's not there though.

regular.mk: adapted for e2k
338f8db6 · Michael Shigorin · 43433e25 · 338f8db6
Commit 338f8db6 authored Sep 05, 2020 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

regular.mk conf.d/regular.mk +5 -1

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -73,11 +73,15 @@ distro/.regular-jeos-full: distro/.regular-jeos \
 	use/volumes/jeos use/ntp/chrony use/bootloader/grub +efi
 	@$(call add,BASE_PACKAGES,nfs-utils gdisk)
 	@$(call add,INSTALL2_PACKAGES,fdisk)
+ifeq (,$(filter-out e2k%,$(ARCH)))
+	@$(call add,CLEANUP_PACKAGES,acpid-events-power)
+else
 	@$(call add,MAIN_PACKAGES,firmware-linux)
 	@$(call add,CLEANUP_PACKAGES,libffi 'libltdl*')
 	@$(call add,CLEANUP_PACKAGES,bridge-utils)
-	@$(call add,DEFAULT_SERVICES_DISABLE,fbsetfont)
 	@$(call set,KFLAVOURS,std-def)
+endif
+	@$(call add,DEFAULT_SERVICES_DISABLE,fbsetfont)
 	@$(call add,BASE_KMODULES,drm)

 # NB: