Attachment #6736 for bug #30564

View | Details | Raw Unified | Return to bug 30564
Collapse All | Expand All

Lines 10-16 use/dev/repo: use/dev use/repo/main Link Here

(-)a/features.in/dev/config.mk (-1 / +1 lines)
10	@$(call add,THE_PACKAGES,apt-repo)	10	@$(call add,THE_PACKAGES,apt-repo)
11	@$(call add,MAIN_PACKAGES,rpm-build basesystem)	11	@$(call add,MAIN_PACKAGES,rpm-build basesystem)
12	@$(call add,MAIN_PACKAGES,fakeroot sisyphus_check)	12	@$(call add,MAIN_PACKAGES,fakeroot sisyphus_check)
13	@$(call add,MAIN_PACKAGES,file make-initrd make-initrd-propagator)	13	@$(call add,MAIN_PACKAGES,file make-initrd2 make-initrd2-propagator)
14		14
15	use/dev/builder/base: use/dev/mkimage use/dev	15	use/dev/builder/base: use/dev/mkimage use/dev
16	@$(call set,KFLAVOURS,$(BIGRAM))	16	@$(call set,KFLAVOURS,$(BIGRAM))




# while leaving the very basic text bootloader screen
use/plymouth/stage2: use/plymouth use/branding \
	use/syslinux/ui/gfxboot use/stage2/kms
	@$(call add,STAGE1_PACKAGES_REGEXP,make-initrd2-plymouth)
	@$(call add,STAGE1_BRANDING,bootsplash)
	@$(call add,STAGE2_BRANDING,bootsplash)
	@$(call add,STAGE2_BOOTARGS,quiet splash)

use/plymouth/base: use/plymouth/stage2
	@$(call add,INSTALL2_PACKAGES,installer-feature-setup-plymouth)
	@$(call add,BASE_PACKAGES_REGEXP,make-initrd2-plymouth cpio)
	@$(call add,BASE_KMODULES_REGEXP,drm.*)
	@$(call add,THE_BRANDING,bootsplash)


Lines 1-7 Link Here

(-)a/features.in/stage2/config.mk (-1 / +1 lines)
1	# "1" is not a typo	1	# "1" is not a typo
2	use/stage2: sub/stage1	2	use/stage2: sub/stage1
3	@$(call add_feature)	3	@$(call add_feature)
4	@$(call add,STAGE1_PACKAGES,file make-initrd make-initrd-propagator propagator)	4	@$(call add,STAGE1_PACKAGES,file make-initrd2 make-initrd2-propagator propagator)
5	@$(call add,STAGE1_MODLISTS,$$(FEATURES))	5	@$(call add,STAGE1_MODLISTS,$$(FEATURES))
6	@$(call xport,STAGE1_KCONFIG)	6	@$(call xport,STAGE1_KCONFIG)
7		7

Lines 48-53 sysfsutils Link Here

(-)a/pkg.in/lists/tagged/rescue+misc (-1 / +1 lines)
48	# initrd helpers	48	# initrd helpers
49	make-initrd-devmapper	49	make-initrd-devmapper
50	make-initrd-mdadm	50	make-initrd-mdadm
		51
51	make-initrd-lvm	52	make-initrd-lvm
52	make-initrd-multipath	53	make-initrd-multipath
53	make-initrd-nfs	54	make-initrd-nfs
54	-

Return to bug 30564

Lines 15-28 use/plymouth: Link Here

(-)a/features.in/plymouth/config.mk (-2 / +2 lines)
15	# while leaving the very basic text bootloader screen	15	# while leaving the very basic text bootloader screen
16	use/plymouth/stage2: use/plymouth use/branding \	16	use/plymouth/stage2: use/plymouth use/branding \
17	use/syslinux/ui/gfxboot use/stage2/kms	17	use/syslinux/ui/gfxboot use/stage2/kms
18	@$(call add,STAGE1_PACKAGES_REGEXP,make-initrd-plymouth)	18	@$(call add,STAGE1_PACKAGES_REGEXP,make-initrd2-plymouth)
19	@$(call add,STAGE1_BRANDING,bootsplash)	19	@$(call add,STAGE1_BRANDING,bootsplash)
20	@$(call add,STAGE2_BRANDING,bootsplash)	20	@$(call add,STAGE2_BRANDING,bootsplash)
21	@$(call add,STAGE2_BOOTARGS,quiet splash)	21	@$(call add,STAGE2_BOOTARGS,quiet splash)
22		22
23	use/plymouth/base: use/plymouth/stage2	23	use/plymouth/base: use/plymouth/stage2
24	@$(call add,INSTALL2_PACKAGES,installer-feature-setup-plymouth)	24	@$(call add,INSTALL2_PACKAGES,installer-feature-setup-plymouth)
25	@$(call add,BASE_PACKAGES_REGEXP,make-initrd-plymouth cpio)	25	@$(call add,BASE_PACKAGES_REGEXP,make-initrd2-plymouth cpio)
26	@$(call add,BASE_KMODULES_REGEXP,drm.*)	26	@$(call add,BASE_KMODULES_REGEXP,drm.*)
27	@$(call add,THE_BRANDING,bootsplash)	27	@$(call add,THE_BRANDING,bootsplash)
28		28