From mboxrd@z Thu Jan  1 00:00:00 1970
From: "pelzflorian (Florian Pelz)" <pelzflorian@pelzflorian.de>
Subject: Re: kmscon not working on MacBook
Date: Fri, 20 Mar 2020 09:51:33 +0100
Message-ID: <20200320085133.maj6jkgijvqpnerj@pelzflorian.localdomain>
References: <86lfoqy8h0.fsf@dismail.de> <87pne3d5t6.fsf@gnu.org>
 <60bd323b399bc4fafefc74d7fa84c0db@dismail.de>
 <20200308120400.bdrkyo653fhbtkml@pelzflorian.localdomain>
 <87a74q8spt.fsf_-_@gnu.org>
 <20200309074358.jly3mtrevwm75wip@pelzflorian.localdomain>
 <87h7yx1npi.fsf@gnu.org>
 <20200311071437.6ykyxcqdrgjtagrq@pelzflorian.localdomain>
 <20200320084850.klhoxexhnamkoelg@pelzflorian.localdomain>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="6k5flxbg73pmamiw"
Content-Transfer-Encoding: 7bit
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane-mx.org@gnu.org>
Received: from eggs.gnu.org ([2001:470:142:3::10]:48288)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <pelzflorian@pelzflorian.de>) id 1jFDNR-0001Dg-Ei
 for guix-devel@gnu.org; Fri, 20 Mar 2020 04:51:38 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <pelzflorian@pelzflorian.de>) id 1jFDNP-0003He-T3
 for guix-devel@gnu.org; Fri, 20 Mar 2020 04:51:37 -0400
Content-Disposition: inline
In-Reply-To: <20200320084850.klhoxexhnamkoelg@pelzflorian.localdomain>
List-Id: "Development of GNU Guix and the GNU System distribution."
 <guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
 <mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
 <mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane-mx.org@gnu.org
Sender: "Guix-devel"
 <guix-devel-bounces+gcggd-guix-devel=m.gmane-mx.org@gnu.org>
To: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@gnu.org>
Cc: guix-devel@gnu.org, jbranso@dismail.de


--6k5flxbg73pmamiw
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Fri, Mar 20, 2020 at 09:48:50AM +0100, pelzflorian (Florian Pelz) wrot=
e:
> The attached patch [=E2=80=A6]
Forgot attachment =E2=80=A6

--6k5flxbg73pmamiw
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename="0001-for-TESTING-only-works-for-some-machines-installer-R.patch"

>From 2dd61d18b88f197d8d6951fe1dc97bafdf4fe03f Mon Sep 17 00:00:00 2001
From: Florian Pelz <pelzflorian@pelzflorian.de>
Date: Thu, 19 Mar 2020 15:50:00 +0100
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [PATCH 3/3] [for TESTING, only works for some machines] installer:
 Run installer in uvesafb.

* gnu/system/install.scm (installation-os): Load uvesafb before installer.
---
 gnu/system/install.scm | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index c15c2c7814..88db4320b0 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -50,6 +50,7 @@
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages nvi)
+  #:use-module (gnu packages xorg)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-26)
   #:export (installation-os
@@ -304,8 +305,34 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m
     (define bare-bones-os
       (load "examples/bare-bones.tmpl"))
 
+    (define (insmod-uvesafb-activation value)
+      #~(begin
+          (use-modules (guix build utils))
+          (symlink #$(file-append linux-libre "/lib") "/lib")))
+
+    (define (insmod-uvesafb-shepherd-service _)
+      (list (shepherd-service
+             (provision '(insmod-uvesafb))
+             (requirement '(user-processes udev dbus-system))
+             (start #~(make-forkexec-constructor
+                       (list #+(file-append kmod "/bin/modprobe") "uvesafb"
+                             (string-append "v86d=" #$v86d "/sbin/v86d")
+                             "mode_option=1024x768")))
+             (stop #~(make-kill-destructor))
+             (one-shot? #t))))
+
     (list (service virtual-terminal-service-type)
 
+          (service
+           (service-type (name 'insmod-uvesafb)
+                         (extensions
+                          (list (service-extension activation-service-type
+                                                   insmod-uvesafb-activation)
+                                (service-extension shepherd-root-service-type
+                                                   insmod-uvesafb-shepherd-service)))
+                         (description "Start uvesafb."))
+           #t)
+
           (service kmscon-service-type
                    (kmscon-configuration
                     (virtual-terminal "tty1")
@@ -434,7 +461,7 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m
     ;; non-functional:
     ;; <https://lists.gnu.org/archive/html/guix-devel/2019-03/msg00441.html>.
     ;; Thus, blacklist it.
-    (kernel-arguments '("quiet" "modprobe.blacklist=radeon"))
+    (kernel-arguments '("quiet" "modprobe.blacklist=radeon" "nomodeset"))
 
     (file-systems
      ;; Note: the disk image build code overrides this root file system with
-- 
2.25.1


--6k5flxbg73pmamiw--