gnu: ksoloti-runtime: Update to 1.1.0-0.b7ae4753b.

* gnu/packages/axoloti.scm (ksoloti-runtime): Update to 1.1.0-0.b7ae4753b.
[arguments]: Adjust.
(ksoloti-patcher)[arguments]: Set axoloti_platform and axoloti_firmware in
launcher.

Change-Id: I214267ece9240e651118c90a36c5b0b01a252566

gnu/packages/axoloti.scm

@@ -350,18 +350,20 @@ powerful microcontroller board: Axoloti Core.  This package provides the
 patcher application.")))
 
 (define-public ksoloti-runtime
+  (let ((revision "0")
+        (commit "b7ae4753b33532597db232285f4f3c1808f516b4"))
     (package
       (name "ksoloti-runtime")
-    (version "1.1.0")
+      (version (git-version "1.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
          (uri (git-reference
                (url "https://github.com/ksoloti/ksoloti")
-             (commit version)))
+               (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-        (base32 "0lf4jqd1jwqmapp597zj33zgq7576i1fkww8aqckrpbknnmydrw5"))
+          (base32 "0pf8zpzfx6nibwqrxbagpp3qpypfabshs7mign84dwsl9qdal1cv"))
          (modules '((guix build utils)))
          ;; Remove pre-built Java binaries.
          (snippet
@@ -384,9 +386,10 @@ patcher application.")))
                 (substitute* "chibios/os/various/shell.c"
                   (("#ifdef __DATE__") "#if 0"))
 
-               (substitute* "firmware/compile_firmware_linux.sh"
-                 (("make -j16")
-                  "make USE_VERBOSE_COMPILE=yes"))
+                (substitute* "firmware/compile_firmware.sh"
+                  (("make -j8")
+                   (string-append "make USE_VERBOSE_COMPILE=yes -j"
+                                  (number->string (parallel-job-count)))))
 
                 ;; Patch shell paths
                 (substitute* '("src/main/java/qcmds/QCmdCompileFirmware.java"
@@ -395,13 +398,14 @@ patcher application.")))
                   (("/bin/sh") (which "sh")))
 
                 ;; Override cross compiler base name
-               (substitute* '"firmware/Makefile.patch.mk"
+                (substitute* "firmware/Makefile.patch.mk"
                   (("arm-none-eabi-(gcc|g\\+\\+|objcopy|objdump|size)" tool)
                    (which tool)))
 
                 ;; XXX: for some reason the whitespace substitution does not
                 ;; work, so we disable it.
                 (substitute* "firmware/Makefile.patch.mk"
+                  (("^CHIBIOS +=.*") "CHIBIOS=${axoloti_firmware}/../chibios\n")
                   (("^BUILDDIR=.*") "BUILDDIR=${axoloti_libraries}/build\n"))
 
                 ;; Hardcode full path to compiler tools
@@ -414,22 +418,21 @@ patcher application.")))
                                   "/bin/arm-none-eabi-\n")))
 
                 ;; Hardcode path to "make"
-               (substitute* '("firmware/compile_firmware_linux.sh"
-                              "firmware/compile_patch_linux.sh")
+                (substitute* '("firmware/compile_firmware.sh"
+                               "firmware/compile_patch.sh")
                   (("make") (which "make")))
 
                 ;; Hardcode path to "dfu-util"
-               (substitute* "platform_linux/upload_fw_dfu.sh"
+                (substitute* "firmware/upload_fw_dfu.sh"
                   (("-f \"\\$\\{platformdir\\}/bin/dfu-util\"") "-z \"\"")
                   (("\\./dfu-util") (which "dfu-util")))))
             (delete 'configure)
             (replace 'build
               ;; Build Axoloti firmware with cross-compiler
               (lambda _
-               (with-directory-excursion "platform_linux"
+                (with-directory-excursion "firmware"
                   (substitute* "compile_firmware.sh"
-                   (("^\"\\$\\{axoloti.*_firmware\\}/compile_firmware_linux.sh" m)
-                    (string-append (which "bash") " " m)))
+                    (("`uname`") (string-append "`" (which "uname") "`")))
                   (invoke "sh" "compile_firmware.sh" "BOARD_KSOLOTI_CORE")
                   (invoke "sh" "compile_firmware.sh" "BOARD_AXOLOTI_CORE"))))
             (replace 'install
@@ -441,6 +444,7 @@ patcher application.")))
                                 "/patches/[^/]+/[^/]+$"
                                 "/objects/[^/]+/[^/]+$"
                                 "/firmware/.+"
+                                "/platform_linux/.+"
                                 "/chibios/[^/]+$"
                                 "/chibios/boards/ST_STM32F4_DISCOVERY/[^/]+$"
                                 "/chibios/(ext|os|docs)/.+"
@@ -486,7 +490,7 @@ short, Ksoloti aims for maximum compatibility with the original Axoloti, but
 with some layout changes and added features.
 
 This package provides the runtime.")
-    (license license:gpl3+)))
+      (license license:gpl3+))))
 
 (define-public ksoloti-patcher
   (package
@@ -615,8 +619,8 @@ This package provides the runtime.")
                                         " -Dsun.java2d.renderer=org.marlin.pisces.MarlinRenderingEngine"
                                         " -Dsun.java2d.d3d=false"
                                         " -Dsun.java2d.dpiaware=true"
-                                        " -Daxoloti_release=" runtime
-                                        " -Daxoloti_runtime=" runtime
+                                        " -Daxoloti_platform=" runtime "/platform_linux"
+                                        " -Daxoloti_firmware=" runtime "/firmware"
                                         " -jar " dir "/Ksoloti.jar")))))
                   (chmod target #o555)))))
           (add-after 'install 'strip-jar-timestamps