e2k, install2, live-install: replace install packages from e2k

c9e86e13 · Anton Midyukov · 52f2db44 · c9e86e13 · c9e86e13 · c9e86e13
Commit c9e86e13 authored Mar 26, 2025 by Anton Midyukov
Hide whitespace changes
Inline Side-by-side

Showing with 35 additions and 14 deletions

config.mk features.in/e2k/config.mk +0 -14

config.mk features.in/install2/config.mk +17 -0

config.mk features.in/live-install/config.mk +18 -0

No files found.
--- a/features.in/e2k/config.mk
+++ b/features.in/e2k/config.mk
 ifeq (,$(filter-out e2k%,$(ARCH)))
 use/e2k: use/tty/S0 use/l10n/default/ru_RU
 	@$(call add_feature)
-	@$(call add,BASE_PACKAGES,installer-feature-e2k-fix-clock-stage3)
-	@$(call add,LIVE_PACKAGES,installer-feature-e2k-fix-boot-stage2)
-	@$(call add,LIVE_PACKAGES,installer-feature-e2k-ignore-cf-stage2)
 	@$(call add,LIVE_PACKAGES,blacklist-ide)	# avoid overwriting hda
 	@$(call add,STAGE2_PACKAGES,agetty)
-	@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-xorg-conf-stage2)
-	@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-fix-boot-stage2)
-	@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-sensors-stage2)
-	@$(call add,INSTALL2_PACKAGES,installer-feature-fstrim-stage2)
-	@$(call add,INSTALL2_PACKAGES,blacklist-ide)	# avoid overwriting hda
-	@$(call add,INSTALL2_PACKAGES,ifplugd)	# for net-eth link status
-	@$(call add,INSTALL2_CLEANUP_PACKAGES,llvm)
-ifeq (,$(filter-out e2kv4 e2kv5,$(ARCH)))
-	@# 8C/8CB specific
-	@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-sensors-stage2)
-endif
 ifeq (,$(filter-out e2kv6 e2kv4,$(ARCH)))
 	@# 1C+/2C3 specific
 	@$(call add,SYSTEM_PACKAGES,softdep-mga2x)	# mcst#8089

--- a/features.in/install2/config.mk
+++ b/features.in/install2/config.mk
@@ -21,6 +21,23 @@ use/install2: use/stage2 sub/stage2@install2 use/metadata \
 	@$(call add,INSTALL2_PACKAGES,lsof)
 	@$(call add,INSTALL2_PACKAGES,mdadm)
 	@$(call add,BASE_PACKAGES,e2fsprogs mdadm)
+ifeq (,$(filter-out e2k%,$(ARCH)))
+	@$(call add,BASE_PACKAGES,installer-feature-e2k-fix-clock-stage3)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-xorg-conf-stage2)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-fix-boot-stage2)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-sensors-stage2)
+	@$(call add,INSTALL2_PACKAGES,installer-feature-fstrim-stage2)
+	@$(call add,INSTALL2_PACKAGES,blacklist-ide)	# avoid overwriting hda
+	@$(call add,INSTALL2_PACKAGES,ifplugd)	# for net-eth link status
+ifeq (,$(filter-out e2kv4 e2kv5,$(ARCH)))
+	@# 8C/8CB specific
+	@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-sensors-stage2)
+endif
+ifeq (,$(filter-out e2kv6 e2kv4,$(ARCH)))
+	@# 1C+/2C3 specific
+	@$(call add,SYSTEM_PACKAGES,softdep-mga2x)	# mcst#8089
+endif
+endif

 # doesn't use/install2/fs on purpose (at least so far)
 use/install2/full: \

--- a/features.in/live-install/config.mk
+++ b/features.in/live-install/config.mk
@@ -28,6 +28,24 @@ use/live-install: use/live use/metadata use/repo/main use/l10n \
 	@$(call try,LIVE_INSTALL_PKG,installer-livecd-install)
 	@$(call try,GLOBAL_LIVE_INSTALL,1)
 	@$(call xport,BASE_BOOTLOADER)
+ifeq (,$(filter-out e2k%,$(ARCH)))
+	@$(call add,BASE_PACKAGES,installer-feature-e2k-fix-clock-stage3)
+	@$(call add,LIVE_PACKAGES,installer-feature-e2k-fix-boot-stage2)
+	@$(call add,LIVE_PACKAGES,installer-feature-e2k-ignore-cf-stage2)
+	@$(call add,LIVE_PACKAGES,installer-feature-e2k-xorg-conf-stage2)
+	@$(call add,LIVE_PACKAGES,installer-feature-e2k-sensors-stage2)
+	@$(call add,LIVE_PACKAGES,installer-feature-fstrim-stage2)
+	@$(call add,LIVE_PACKAGES,blacklist-ide)	# avoid overwriting hda
+	@$(call add,LIVE_PACKAGES,ifplugd)	# for net-eth link status
+ifeq (,$(filter-out e2kv4 e2kv5,$(ARCH)))
+	@# 8C/8CB specific
+	@$(call add,LIVE_PACKAGES,installer-feature-e2k-sensors-stage2)
+endif
+ifeq (,$(filter-out e2kv6 e2kv4,$(ARCH)))
+	@# 1C+/2C3 specific
+	@$(call add,SYSTEM_PACKAGES,softdep-mga2x)	# mcst#8089
+endif
+endif

 use/live-install/full: use/live-install \
 	use/syslinux/localboot.cfg use/grub/localboot_bios.cfg \