From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Sergey V Turchin To: Distributions development Date: Mon, 07 Sep 2020 12:16:01 +0300 Message-ID: <5308991.0VBMTVartN@zerg.malta.altlinux.ru> In-Reply-To: <31104c35-6591-4b4c-01f1-73f0cc0c1f73@ya.ru> References: <1cd8e7f9-4dc3-1eeb-268f-84c0d36a3204@ya.ru> <3541294.CbtlEUcBR6@zerg.malta.altlinux.ru> <31104c35-6591-4b4c-01f1-73f0cc0c1f73@ya.ru> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="nextPart3158541.X9hSmTKtgW" Content-Transfer-Encoding: 7Bit Subject: Re: [devel-distro] =?utf-8?b?0L/RgNC+0L/QsNC70L4g0LzQtdC90Y4gZ3J1Yg==?= X-BeenThere: devel-distro@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Distributions development List-Id: Distributions development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Sep 2020 09:16:02 -0000 Archived-At: List-Archive: This is a multi-part message in MIME format. --nextPart3158541.X9hSmTKtgW Content-Transfer-Encoding: base64 Content-Type: text/plain; charset="UTF-8" T24gTW9uZGF5LCA3IFNlcHRlbWJlciAyMDIwIDExOjUzOjQ1IE1TSyDQkNC90YLQvtC9INCc0LjQ tNGO0LrQvtCyIHdyb3RlOgo+IDA3LjA5LjIwMjAgMTU6NDYsIFNlcmdleSBWIFR1cmNoaW4g0L/Q uNGI0LXRgjoKPiA+IE9uIE1vbmRheSwgNyBTZXB0ZW1iZXIgMjAyMCAxMToyOToxNCBNU0sg0JDQ vdGC0L7QvSDQnNC40LTRjtC60L7QsiB3cm90ZToKPiA+IAo+ID4gWy4uLl0KPiA+IAo+ID4+INCh 0YLQvtC/LiDQn9C10YDQtdC60LvRjtGH0LDQu9C60LAg0YLQviDRg9C20LUg0LXRgdGC0Yw6Cj4g Pj4gCj4gPj4gdXNlL3gxMS9ub3V2ZWF1OiB1c2UveDExIHVzZS9maXJtd2FyZQo+ID4+IAo+ID4+ ICAgICBAJChjYWxsIHNldCxOVklESUFfS01PRFVMRVMsZHJtLW5vdXZlYXUpCj4gPj4gICAgIEAk KGNhbGwgc2V0LE5WSURJQV9QQUNLQUdFUyx4b3JnLWRydi1ub3V2ZWF1KQo+ID4+IAo+ID4+IHVz ZS94MTEvbnZpZGlhOiB1c2UveDExCj4gPj4gCj4gPj4gICAgIEAkKGNhbGwgc2V0LE5WSURJQV9L TU9EVUxFUyxudmlkaWEpCj4gPj4gICAgIEAkKGNhbGwgc2V0LE5WSURJQV9QQUNLQUdFUyxudmlk aWEtc2V0dGluZ3MgbnZpZGlhLXhjb25maWcpCj4gPj4gCj4gPj4g0JTQvtGB0YLQsNGC0L7Rh9C9 0L4g0LLRi9C30LLQsNGC0YwgdXNlL3gxMS9udmlkaWEg0L/QvtGB0LvQtSB1c2UveDExL3hvcmcg 0Lgg0L/QvtGB0YLQsNCy0Y/RgtGB0Y8g0YLQvtC70YzQutC+Cj4gPj4g0L/RgNC+0L/RgNC40LXR gtCw0YDQvdGL0LUg0LTRgNCw0LnQstC10YDQsC4g0KIu0LUuINCy0YvQutC40LTRi9Cy0LDRgtGM IHVzZS94MTEvbm91dmVhdSDQvdC1INC90YPQttC90L4uINCU0L7Qu9C20L3Qvgo+ID4+INGA0LDQ sdC+0YLQsNGC0YwuCj4gPiAKPiA+INCR0LXQtyBibGFja2xpc3Qg0LHRg9C00LXRgiDQs9GA0YPQ t9C40YLRjNGB0Y8gbm91dmVhdSDQv9GA0Y/QvNC+INC40LcgaW5pdHJkINC4INCx0LvQvtC60LjR gNC+0LLQsNGC0YwKPiA+IG52aWRpYS4KPiAKPiDQotCw0Logbm91dmVhdSDQsiDRgdCx0L7RgNC6 0YMg0L3QtSDQv9C+0L/QsNC00ZHRgiDQstC+0L7QsdGJ0LUuINCf0LXRgNC10LzQtdC90L3Ri9C1 IE5WSURJQV9LTU9EVUxFUyDQuAo+IE5WSURJQV9QQUNLQUdFUyDQv9C10YDQtdC30LDQv9C40YjR g9GC0YHRjy4K0JXRidGRINC60LDQuiDQv9C+0L/QsNC00ZHRgi4g0KHQvC4sINGH0YLQviDRjyDQ tNC10LvQsNGOLCDRh9GC0L7QsSDQvdC1INC/0L7Qv9Cw0LvQsCDQsiDRgdC40YHRgtC10LzRgywg 0L3QviDQv9C+0L/QsNC70LAg0LIgCtGD0YHRgtCw0L3QvtCy0YnQuNC6KG52aWRpYSDRgtCw0Lwg 0LbQuNGA0L3QvtCy0LDRgtC+KS4KCi0tIApSZWdhcmRzLCBTZXJnZXku --nextPart3158541.X9hSmTKtgW Content-Disposition: attachment; filename="nvidia.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="utf-8"; name="nvidia.patch" --- /dev/null +++ b/conf.d/kworkstation.mk +mixin/kworkstation-common-opts: + @$(call add,CLEANUP_PACKAGES,'^kernel-modules-drm-nouveau.*') + +mixin/kworkstation-install-opts: + @$(call add,STAGE2_KMODULES,drm-nouveau) --- a/features.in/plymouth/config.mk +++ b/features.in/plymouth/config.mk @@ -41,7 +41,7 @@ ifeq (distro,$(IMAGE_CLASS)) @$(call add,INSTALL2_PACKAGES,installer-feature-setup-plymouth) endif @$(call add,BASE_PACKAGES_REGEXP,make-initrd-plymouth cpio) - @$(call add,BASE_KMODULES_REGEXP,drm.*) + @$(call add,BASE_KMODULES,drm drm-radeon) @$(call add,THE_BRANDING,bootsplash) @$(call add,THE_PACKAGES,make-initrd-plymouth) --- a/features.in/stage2/config.mk +++ b/features.in/stage2/config.mk @@ -22,7 +22,7 @@ endif @: use/stage2/kms: use/stage2/drm - @$(call add,STAGE1_KMODULES_REGEXP,drm.*) + @$(call add,STAGE1_KMODULES,drm drm-radeon) # install mount.cifs to stage1 # NB: there's builtin nfsmount there, no reason for nfs-utils --- a/features.in/x11/config.mk +++ b/features.in/x11/config.mk @@ -16,7 +16,7 @@ use/x11/xorg:: use/x11 use/x11/armsoc; @: # x86: free drivers for various hardware (might lack acceleration) ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH))) -use/x11/xorg:: use/x11/intel use/x11/nouveau use/x11/radeon use/x11/amdgpu \ +use/x11/xorg:: use/x11/intel use/x11/radeon use/x11/amdgpu \ use/x11/armsoc @$(call add,THE_LISTS,$(call tags,desktop xorg)) endif --nextPart3158541.X9hSmTKtgW--