Skip to content

M
mkimage-profiles
Commit c6d072dd authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

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

This reverts commit c9e86e13. INSTALL2_PACKAGES are now added to live when using the live-install feature.
parent 5e8b757c
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 35 deletions
features.in/e2k/config.mk
View file @ c6d072dd
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
......
features.in/install2/config.mk
View file @ c6d072dd
......@@ -21,23 +21,6 @@ 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: \
......
features.in/live-install/config.mk
View file @ c6d072dd
......@@ -30,24 +30,6 @@ use/live-install: use/live use/metadata use/repo/main \
@$(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 \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment