Skip to content

M
mkimage-profiles
You need to sign in or sign up before continuing.
Commit 892400b5 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

plymouth: drop use/plymouth/vm, cleanup

use/plymouth/vm is not needed, because use/plymouth/base is the target that needs to be achieved when building the vm image.
parent cadd66e9
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 18 deletions
features.in/plymouth/config.mk
View file @ 892400b5
...@@ -17,7 +17,7 @@ use/plymouth: ...@@ -17,7 +17,7 @@ use/plymouth:
ifeq (distro,$(IMAGE_CLASS)) ifeq (distro,$(IMAGE_CLASS))
use/plymouth/stage2: use/plymouth use/branding \ use/plymouth/stage2: use/plymouth use/branding \
use/stage2/kms use/stage2/kms
@$(call add,STAGE1_PACKAGES_REGEXP,make-initrd-plymouth) @$(call add,STAGE1_PACKAGES,make-initrd-plymouth)
@$(call add,STAGE1_BRANDING,bootsplash graphics) @$(call add,STAGE1_BRANDING,bootsplash graphics)
@$(call add,STAGE2_BRANDING,bootsplash graphics) @$(call add,STAGE2_BRANDING,bootsplash graphics)
@$(call add,STAGE2_BOOTARGS,quiet splash) @$(call add,STAGE2_BOOTARGS,quiet splash)
...@@ -25,26 +25,16 @@ else ...@@ -25,26 +25,16 @@ else
use/plymouth/stage2: use/plymouth use/branding; @: use/plymouth/stage2: use/plymouth use/branding; @:
endif endif
ifeq (vm,$(IMAGE_CLASS)) use/plymouth/base: use/plymouth/stage2 use/drm/full; @:
use/plymouth/vm: use/plymouth use/branding use/kernel/initrd-setup
@$(call add,VM_INITRDFEATURES,plymouth)
@$(call add,THE_BRANDING,bootsplash graphics)
@$(call add,THE_PACKAGES,make-initrd-plymouth)
@$(call add,BASE_BOOTARGS,quiet)
@$(call add,THE_KMODULES,drm)
else
use/plymouth/vm: use/plymouth; @:
endif
use/plymouth/base: use/plymouth/stage2 use/plymouth/vm \
use/drm/full; @:
ifeq (distro,$(IMAGE_CLASS)) ifeq (distro,$(IMAGE_CLASS))
@$(call add,INSTALL2_PACKAGES,installer-feature-setup-plymouth) @$(call add,INSTALL2_PACKAGES,installer-feature-setup-plymouth)
endif endif
@$(call add,BASE_PACKAGES_REGEXP,make-initrd-plymouth cpio) @$(call add,THE_BRANDING,bootsplash graphics)
@$(call add,THE_BRANDING,bootsplash) @$(call add,THE_PACKAGES,make-initrd-plymouth cpio)
@$(call add,THE_PACKAGES,make-initrd-plymouth) ifeq (vm,$(IMAGE_CLASS))
@$(call add,BASE_BOOTARGS,splash) @$(call add,VM_INITRDFEATURES,plymouth)
@$(call add,BASE_BOOTARGS,quiet splash)
endif
use/plymouth/full: use/plymouth/stage2 use/plymouth/base; @: use/plymouth/full: use/plymouth/stage2 use/plymouth/base; @:
......
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