From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id CPQCEGjaGGScJgAASxT56A (envelope-from ) for ; Mon, 20 Mar 2023 23:12:56 +0100 Received: from aspmx2.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id AAs2D2jaGGSyIQAAG6o9tA (envelope-from ) for ; Mon, 20 Mar 2023 23:12:56 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx2.migadu.com (Postfix) with ESMTPS id E39D4392D1 for ; Mon, 20 Mar 2023 23:12:55 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peNjh-0003uj-FE; Mon, 20 Mar 2023 18:12:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peNjb-0003nM-5p for guix-patches@gnu.org; Mon, 20 Mar 2023 18:12:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peNja-0003HW-Sz for guix-patches@gnu.org; Mon, 20 Mar 2023 18:12:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peNja-0007P0-Of for guix-patches@gnu.org; Mon, 20 Mar 2023 18:12:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62307] [PATCH core-updates 12/15] hurd: Update DDE and use libdde_linux26. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 22:12:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62307 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62307@debbugs.gnu.org, Josselin Poiret Received: via spool by 62307-submit@debbugs.gnu.org id=B62307.167935029428256 (code B ref 62307); Mon, 20 Mar 2023 22:12:06 +0000 Received: (at 62307) by debbugs.gnu.org; 20 Mar 2023 22:11:34 +0000 Received: from localhost ([127.0.0.1]:57031 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNj4-0007LZ-8k for submit@debbugs.gnu.org; Mon, 20 Mar 2023 18:11:34 -0400 Received: from jpoiret.xyz ([206.189.101.64]:47374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNii-0007Jm-8D for 62307@debbugs.gnu.org; Mon, 20 Mar 2023 18:11:13 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 9BC9E185326; Mon, 20 Mar 2023 22:11:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1679350271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iho8jAAAVXtJCc3TfpxN2+sGo+phw7Kr5q6anliUKkk=; b=aiC5UhhFOkYYL/EHVCdHoWsv3CpLM3ZWaS46LMehcoIToC5qU9szRLSImYy4tEOeje1LxB +pTweqWV7EiY+ZhO6vIuAaZ0XXbLAY4oaJ6nuaqhvo1wYslxsfUBNzUm+Vp9CGWSFBMX9p vTlbZNwzyLZTbN01W/X+fVNkZ4IjYoDoALsDgZKZDND14HoqxXd4/T0gJppWIfh7MJLJ4B W442dW5+3Eq4DDxCK/WYxX42iHMuS80dcsHWfCEWusejRj8b2mKbhvDf3WcVylFS6wNqRB Xvi5ZuNg648ZkOBQbsdSEh7IlAsMaaenrrxIqj+0QuK6Yvbh7Kz7n86EFrKw0Q== Date: Mon, 20 Mar 2023 23:10:48 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches From: Josselin Poiret via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679350376; a=rsa-sha256; cv=none; b=eXH0X5i77dgjaGF23TGjZ9vj3LW3Z+7Eb/QouDB2lUC9unsZx6z6mCTjLzUaBDRZ7fK/Qg r0WdIexTDViXiiY2JqLNzbMmw9Yc9f1SgXQhfUEKeO3kwDsP5nha3hoFu3d065RlCzp0Ot 8cX7OM0mhSazbZXOJBSCJvAJBm2vA8o1nfyagJDyG1c7PmVd77wVyiG5P8XQHUx7q//DEJ G9NLn9dioR3QGI3PxV9OwZOOFgdYdPbDvdKbtsH2lxYl8neb9btgqrT3UpChozygJGDGp3 iTzkILsAj/odkjxwkX+iqaksQxutF1y3oPHyMFKaGPlu/OXBaP2W4VTaJNSRPw== ARC-Authentication-Results: i=1; aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=aiC5UhhF; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx2.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679350376; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=iho8jAAAVXtJCc3TfpxN2+sGo+phw7Kr5q6anliUKkk=; b=CaF/aGGsiAOxzMf3xpnUcArh3L5v8J4Xw/2xeEIq5kZMGpErMR6+4egpd+A+D7vaomk//L 7RlgP33zWoR0FTxbbzRjk78PhWZ69CmNZgOZ8hYNsVT5vEoXsNIe9FB8+REfDZGkGY5PKD bHjrWGgrgE6XkiOt+XXzJc4qfdQbo3a+dAjDQ97pOEalnb4GBEz9ZeF/M8I2GAl5CK9/l3 O9+UNX6j+jftTr/P6xxk/UHjr5sDEXdXXK/lG647D5Zewe4O/FWH2DMrvY2qjhNdtDg6KX S4v1oLMmDPBgJzzMMqD51vWQthYJyPQGpVfaO4dShUKPUJLCORtWHZDnheeq9Q== X-Migadu-Spam-Score: -3.25 X-Spam-Score: -3.25 X-Migadu-Queue-Id: E39D4392D1 Authentication-Results: aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=aiC5UhhF; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx2.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn1.migadu.com X-TUID: n7ZdQjl1Tf6E * gnu/packages/hurd.scm (dde-sources): Update. (hurd): Build libdde_linux26 and install it. --- gnu/packages/hurd.scm | 46 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index be5eb25fee..4f85d10237 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -340,7 +340,7 @@ (define unifont (define dde-sources ;; This is the current tip of the dde branch - (let ((commit "ac1c7eb7a8b24b7469bed5365be38a968d59a136")) + (let ((commit "ce8810277fa3584eb36ecb23da58394153fabe6f")) (origin (method git-fetch) (uri (git-reference @@ -348,9 +348,15 @@ (define dde-sources (commit commit))) (sha256 (base32 - "1vryinbg75xpydfrv9dbgfnds6knlh8l8bk2rxp32y9dc58z0692")) + "0ygk7jm4jmhpvh0zzi5bk638242z7sbcab2i57fkb4y2mmdkjjbw")) (file-name (git-file-name "dde" commit))))) +(define %import-from-dde + (list "libmachdevdde" "libddekit" "libdde_linux26")) + +(define %add-to-hurd-subdirs + (list "libmachdevdde" "libddekit")) + (define-public hurd (package (name "hurd") @@ -361,17 +367,19 @@ (define-public hurd (modify-phases %standard-phases (add-after 'unpack 'prepare-dde (lambda* (#:key native-inputs inputs #:allow-other-keys) - (substitute* "Makefile" - (("libbpf ") - "libbpf libmachdev libmachdevdde libddekit")) + ;; First we import the things we want from dde. (for-each make-file-writable (find-files ".")) (let ((dde (or (assoc-ref inputs "dde-sources") (assoc-ref native-inputs "dde-sources")))) (for-each (lambda (dir) (copy-recursively (string-append dde "/" dir ) dir)) - '("libmachdev" "libmachdevdde" "libddekit"))) - #t)) + '("libmachdevdde" "libddekit" "libdde_linux26"))) + ;; And we add some as subdirs so that they're built by the main + ;; Makefile. libdde_linux26 is built later in its own phase. + (substitute* "Makefile" + (("libbpf ") + "libbpf libmachdevdde libddekit")))) (add-after 'unpack 'find-tirpc (lambda* (#:key inputs #:allow-other-keys) (for-each (lambda (var) @@ -490,12 +498,34 @@ (define-public hurd (patch-shebang file path)) (find-files (string-append out "/libexec"))) #t))) + (add-after 'build 'build-libdde-linux + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (invoke (string-append (assoc-ref native-inputs "make") + "/bin/make") + ;; XXX There can be a race condition because subdirs + ;; aren't interdependent targets in the Makefile. + "-j1" "-C" "libdde_linux26" + (string-append "SHELL=" + (assoc-ref native-inputs "bash") + "/bin/bash") + (string-append "CC=" + ,(cc-for-target))))) (add-after 'install 'install-goodies - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda* (#:key inputs native-inputs outputs #:allow-other-keys) ;; Install additional goodies. ;; TODO: Build & install *.msgids for rpctrace. (let* ((out (assoc-ref outputs "out")) (datadir (string-append out "/share/hurd"))) + ;; Install libdde_linux26. + (invoke (string-append (assoc-ref native-inputs "make") + "/bin/make") + "-C" "libdde_linux26" "install" + (string-append "SHELL=" + (assoc-ref native-inputs "bash") + "/bin/bash") + (string-append "INSTALLDIR=" + out + "/share/libdde_linux26/build/include")) ;; Install the fancy UTF-8 motd. (mkdir-p (string-append out "/etc")) (copy-file "console/motd.UTF8" -- 2.39.2