stage2: fix use/stage2/kms/nvidia

All drm modules are added to the first and second stages, except for nouveau and nvidia. Nouveau is added to stage2. nvidia needs to be added to live and the base system separately. This is an auxiliary target. See also https://bugzilla.altlinux.org/31971

stage2: fix use/stage2/kms/nvidia
71c4deba · Anton Midyukov · 23717941 · 71c4deba · 71c4deba
Commit 71c4deba authored Apr 10, 2023 by Anton Midyukov
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

config.mk features.in/drm/config.mk +5 -2

config.mk features.in/stage2/config.mk +2 -2

No files found.
--- a/features.in/drm/config.mk
+++ b/features.in/drm/config.mk
@@ -29,7 +29,7 @@ use/drm/full: use/drm/ancient use/drm/radeon \

 use/drm/stage2:
 	@$(call add,STAGE1_DRM_KMODULES,drm)
-	@$(call add,STAGE1_KMODULES,$$(STAGE1_DRM_KMODULES))
+	@$(call add,STAGE1_KMODULES,$$(STAGE1_DRM_KMODULES) $$(STAGE1_NVIDIA_KMODULES))

 use/drm/stage2/ancient: use/drm/stage2
 	@$(call add,STAGE1_DRM_KMODULES,drm-ancient)
@@ -38,7 +38,10 @@ use/drm/stage2/radeon: use/drm/stage2
 	@$(call add,STAGE1_DRM_KMODULES,drm-radeon)

 use/drm/stage2/nouveau: use/drm/stage2
-	@$(call add,STAGE1_DRM_KMODULES,drm-nouveau)
+	@$(call set,STAGE1_NVIDIA_KMODULES,drm-nouveau)
+
+use/drm/stage2/nvidia: use/drm/stage2/nouveau
+	@$(call set,STAGE1_NVIDIA_KMODULES,)

 use/drm/stage2/full: use/drm/stage2/ancient use/drm/stage2/radeon \
 	use/drm/stage2/nouveau; @:
--- a/features.in/stage2/config.mk
+++ b/features.in/stage2/config.mk
@@ -33,8 +33,8 @@ endif

 use/stage2/kms: use/stage2/drm use/drm/stage2/full; @:

-use/stage2/kms/nvidia: use/stage2/kms \
-	use/drm/stage2/nvidia; @:
+# initrd without nouveau; see ALT bug 31971
+use/stage2/kms/nvidia: use/stage2/drm use/drm/stage2/nvidia; @:

 # install mount.cifs to stage1
 # NB: there's builtin nfsmount there, no reason for nfs-utils