From unknown Sat Aug 16 11:12:43 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#41839 <41839@debbugs.gnu.org> To: bug#41839 <41839@debbugs.gnu.org> Subject: Status: [PATCH 0/2] ci: Build Guix System images. Reply-To: bug#41839 <41839@debbugs.gnu.org> Date: Sat, 16 Aug 2025 18:12:43 +0000 retitle 41839 [PATCH 0/2] ci: Build Guix System images. reassign 41839 guix-patches submitter 41839 Mathieu Othacehe severity 41839 normal tag 41839 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 13 15:40:33 2020 Received: (at submit) by debbugs.gnu.org; 13 Jun 2020 19:40:33 +0000 Received: from localhost ([127.0.0.1]:42523 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jkC12-0001lF-PP for submit@debbugs.gnu.org; Sat, 13 Jun 2020 15:40:33 -0400 Received: from lists.gnu.org ([209.51.188.17]:60830) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jkC0x-0001l2-DG for submit@debbugs.gnu.org; Sat, 13 Jun 2020 15:40:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkC0x-0004p3-5y for guix-patches@gnu.org; Sat, 13 Jun 2020 15:40:27 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:39180) by eggs.gnu.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jkC0r-0006sW-Os; Sat, 13 Jun 2020 15:40:26 -0400 Received: by mail-wr1-x42b.google.com with SMTP id t18so13203830wru.6; Sat, 13 Jun 2020 12:40:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=U9DgeLjLJT4+JM2ZwpigQAaEcYLTdIFZEN7Rux+vI4Q=; b=OGG4HEIMTi1RnOJsgXoQy5rK0aXR+o1qtkqs5rK5ahTDnAOrNY/5OFZ/AM9MsKa3YJ BjlD4fRsqxJJsJIbkhdjIAeo5RBxfeidDuO5it+BsXmk7No5uDH9QbmULtuDJlcuiLMy Gmtzn55USmCQlV9pIPirMc/yrtBMCLVuRTt2jpxylwxjtuX67CMet6i1vCldKDzGnxVR 6i1OgzaDBgzO+Hfc2KqMhFcOFwkIy0fkD80KaGBfs2ktEg5tUxffUSr++y/MkQ3EholW eJXEiB0jFWmCU2LYa4SMc6g9Vt+gOBVDth/z2rdR8ayRXIvZ5EWsjgsrPl3Tje87rGn+ Eizw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=U9DgeLjLJT4+JM2ZwpigQAaEcYLTdIFZEN7Rux+vI4Q=; b=dF/29eMToW/XZtffDZzilrh7n78sevcDcXbsO1TkT4BghKWGJcj+w3Gc7hROx/vnpH mE29Cpt0DVVJJ4DrTIDqntwyIaRHnUnNLdS2J7C/iizmK0RphMbRavHx9jOyEwXlfv4/ 1/gwqxc8Lm6I8N5PDRuKpwTpXV7DLVkfsrIk9mJ9JimbvhPnxh1W1xbB6PgJKsQJgcvL 6aLKG0osv0P0FyM5EzAGVYxybRrq9yThtrUE+Acwz+mrFU1qtEF5bDEogT8jeIaUAmTS QV5786POCiLIActXF06qTP7N202ZIIROGJnBwDXt06Ni/J+HqqAU9XReUT96wdE/IIWq J9gQ== X-Gm-Message-State: AOAM530sLasm4EhJLvEtWtTuX1GBmsY5KP/EiRlYz1PKDSL++Dn4nWQg ApvDmMmw5Tdxc9uX250z7cyLKYcy5dA= X-Google-Smtp-Source: ABdhPJze48WkcZiOKIxiXurFBMB53ypmkKKQ9dosba0vmA+/yqFNfglZQcsUUEl2AEYOhXDoSdm+6g== X-Received: by 2002:a05:6000:1104:: with SMTP id z4mr20888510wrw.272.1592077208441; Sat, 13 Jun 2020 12:40:08 -0700 (PDT) Received: from meru.fronius.com ([2a01:e0a:fa:a50:d869:cbcf:2456:40cc]) by smtp.gmail.com with ESMTPSA id p16sm17645895wru.27.2020.06.13.12.40.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jun 2020 12:40:07 -0700 (PDT) From: Mathieu Othacehe X-Google-Original-From: Mathieu Othacehe To: guix-patches@gnu.org Subject: [PATCH 0/2] ci: Build Guix System images. Date: Sat, 13 Jun 2020 21:40:01 +0200 Message-Id: <20200613194001.9580-1-othacehe@gnu.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=m.othacehe@gmail.com; helo=mail-wr1-x42b.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: submit Cc: Mathieu Othacehe X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hello, Now that we have a new shiny new "image" record that contains all the required informations to build or cross-build a Guix System image, it would be nice if Cuirass could provide associated substitutes. This serie allows to build a list of Guix System images in the CI. For now this list only contains the Hurd barebones Guix System image. Thanks, Mathieu Mathieu Othacehe (2): image: Move hurd image definition to a dedicated file. ci: Build Guix System images. gnu/ci.scm | 69 +++++++++++++++++----------------- gnu/image.scm | 2 + gnu/local.mk | 2 + gnu/system/image.scm | 23 +++--------- gnu/system/images/hurd.scm | 76 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 121 insertions(+), 51 deletions(-) create mode 100644 gnu/system/images/hurd.scm -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 13 15:41:58 2020 Received: (at 41839) by debbugs.gnu.org; 13 Jun 2020 19:41:58 +0000 Received: from localhost ([127.0.0.1]:42529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jkC2Q-0001ns-57 for submit@debbugs.gnu.org; Sat, 13 Jun 2020 15:41:58 -0400 Received: from mail-wm1-f43.google.com ([209.85.128.43]:35255) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jkC2O-0001na-2Z for 41839@debbugs.gnu.org; Sat, 13 Jun 2020 15:41:56 -0400 Received: by mail-wm1-f43.google.com with SMTP id q25so11038710wmj.0 for <41839@debbugs.gnu.org>; Sat, 13 Jun 2020 12:41:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ChS2n0k+eLzuFXhOzdvyWOaEhGQRMmPxCDXUtZxs5+w=; b=UW5GWZhxB2yTzrmJmn+gKkL/LdKH7m0mN4quOGIFctbvZ5wXiCq1H+U+/jriheLybS QpNUNzPh8bMKMY0STubBvLxe+O86YI5Z7che1zabgWd+GK5R8VQFDioLnft2OWMbHkjg ISP5+l9OvsAfF+7zTlYyZ9bF1+emslnT/Q2BjDB17ts/g3gDOvS+ERl4Goamx6JW/p4D Zr3whn5oE2J8d9PjRn4Vo9lcJoLlVEv1HEq4yUQqcZw3cC4wwaeJ7izE0y93p/97oIqH loEvHq7PIEoKqmFaZx8/VY5fWnLQHI24VMAlz7zk7bsaNsAMY+v7lK6Z45AJslt8HEUf 3Tfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ChS2n0k+eLzuFXhOzdvyWOaEhGQRMmPxCDXUtZxs5+w=; b=Ii69crHFnxZ+5I2ll6runWCAkzFGH9168JbtUDwZCA9Q+rF1cBcwUtYCr9mguf5CL6 bmaC7FNm7/jmAOf3EmywfvKIcwl8HtF8ZM5KykLaHAH+0NoT1KRrA4InDFVOddzghGO8 3CP7GBN891fGfAyO7q7vaRE5GyoJIpSnvmayUEsM2RQg91YVTOrOiW+xt1Z24DlgAjHu GIAPeP7AbDJ16VRuA3QVCsrrq6CF1pBOLNCOqYY5mHdcG/s1tjozYLnKS+GMp3IV2xzi h6TDbYt42KRfYBzHoGf8g9JyEtho7DcAKHVCXML1LE/RL8sgEBwQnvToJR2PBroQlVOE pzQQ== X-Gm-Message-State: AOAM532QoggR2dvh/2Yf+flSH8hEOT0ttmxVCxUd03by1j+YjsMlYZ2/ JlwYOGNNJxhKa2Cc2LMmWUXcxd9Amzk= X-Google-Smtp-Source: ABdhPJwjSKh8/AOt9KtyLbMS9cq5/qaWoEV2tjeurjqb7lCoHy7tpoJueKJeJzygPW9QlwEF0IPZ5A== X-Received: by 2002:a1c:9d09:: with SMTP id g9mr4977771wme.31.1592077310112; Sat, 13 Jun 2020 12:41:50 -0700 (PDT) Received: from meru.fronius.com ([2a01:e0a:fa:a50:d869:cbcf:2456:40cc]) by smtp.gmail.com with ESMTPSA id a6sm15968918wrn.38.2020.06.13.12.41.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jun 2020 12:41:49 -0700 (PDT) From: Mathieu Othacehe X-Google-Original-From: Mathieu Othacehe To: 41839@debbugs.gnu.org Subject: [PATCH 2/2] ci: Build Guix System images. Date: Sat, 13 Jun 2020 21:41:40 +0200 Message-Id: <20200613194140.10367-2-othacehe@gnu.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200613194140.10367-1-othacehe@gnu.org> References: <20200613194140.10367-1-othacehe@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 41839 Cc: Mathieu Othacehe X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Build a list of Guix System images. For now, this list only contains the Hurd barebones Guix System image. * gnu/ci.scm (%guixsd-supported-systems): Remove "armhf-linux", (%u-boot-systems): remove unused variable, (%guix-system-images): new variable (qemu-jobs): rename to "image-jobs" and build the Guix Systems listed in the new "%guix-system-images" variable, (system-test-jobs): adapt accordingly, (hydra-jobs): ditto. --- gnu/ci.scm | 69 +++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/gnu/ci.scm b/gnu/ci.scm index fa67168e22..2d49009810 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -53,6 +53,7 @@ #:use-module (gnu system image) #:use-module (gnu system vm) #:use-module (gnu system install) + #:use-module (gnu system images hurd) #:use-module (gnu tests) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) @@ -185,18 +186,21 @@ SYSTEM." (remove (either from-32-to-64? same? pointless?) %cross-targets))) -(define %guixsd-supported-systems - '("x86_64-linux" "i686-linux" "armhf-linux")) +;; Architectures that are able to build or cross-build Guix System images. +;; This does not mean that other architectures are not supported, only that +;; they are often not fast enough to support Guix System images building. +(define %guix-system-supported-systems + '("x86_64-linux" "i686-linux")) -(define %u-boot-systems - '("armhf-linux")) +(define %guix-system-images + (list hurd-barebones-disk-image)) -(define (qemu-jobs store system) - "Return a list of jobs that build QEMU images for SYSTEM." +(define (image-jobs store system) + "Return a list of jobs that build images for SYSTEM." (define (->alist drv) `((derivation . ,(derivation-file-name drv)) - (description . "Stand-alone QEMU image of the GNU system") - (long-description . "This is a demo stand-alone QEMU image of the GNU + (description . "Stand-alone image of the GNU system") + (long-description . "This is a demo stand-alone image of the GNU system.") (license . ,(license-name gpl3+)) (max-silent-time . 600) @@ -211,29 +215,30 @@ system.") (parameterize ((%graft? #f)) (->alist drv)))))) + (define (build-image image) + (run-with-store store + (mbegin %store-monad + (set-guile-for-build (default-guile)) + (lower-object (system-image image))))) + (define MiB (expt 2 20)) - (if (member system %guixsd-supported-systems) - (list (->job 'usb-image - (run-with-store store - (mbegin %store-monad - (set-guile-for-build (default-guile)) - (lower-object - (system-image - (image - (inherit efi-disk-image) - (size (* 1500 MiB)) - (operating-system installation-os))))))) - (->job 'iso9660-image - (run-with-store store - (mbegin %store-monad - (set-guile-for-build (default-guile)) - (lower-object - (system-image - (image - (inherit iso9660-image) - (operating-system installation-os)))))))) + (if (member system %guix-system-supported-systems) + `(,(->job 'usb-image + (build-image + (image + (inherit efi-disk-image) + (size (* 1500 MiB)) + (operating-system installation-os)))) + ,(->job 'iso9660-image + (build-image + (image + (inherit iso9660-image) + (operating-system installation-os)))) + ,@(map (lambda (image) + (->job (image-name image) (build-image image))) + %guix-system-images)) '())) (define channel-build-system @@ -305,11 +310,7 @@ system.") "." system)))) (cons name (test->thunk test)))) - (if (and (member system %guixsd-supported-systems) - - ;; XXX: Our build farm has too few ARMv7 machines and they are very - ;; slow, so skip system tests there. - (not (string=? system "armhf-linux"))) + (if (member system %guix-system-supported-systems) ;; Override the value of 'current-guix' used by system tests. Using a ;; channel instance makes tests that rely on 'current-guix' less ;; expensive. It also makes sure we get a valid Guix package when this @@ -486,7 +487,7 @@ Return #f if no such checkout is found." (package->job store package system)))) (append (filter-map job all) - (qemu-jobs store system) + (image-jobs store system) (system-test-jobs store system #:source source #:commit commit) -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 13 15:42:00 2020 Received: (at 41839) by debbugs.gnu.org; 13 Jun 2020 19:42:00 +0000 Received: from localhost ([127.0.0.1]:42531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jkC2S-0001o2-FB for submit@debbugs.gnu.org; Sat, 13 Jun 2020 15:42:00 -0400 Received: from mail-wm1-f46.google.com ([209.85.128.46]:52992) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jkC2N-0001nZ-Cc for 41839@debbugs.gnu.org; Sat, 13 Jun 2020 15:41:58 -0400 Received: by mail-wm1-f46.google.com with SMTP id r9so10887396wmh.2 for <41839@debbugs.gnu.org>; Sat, 13 Jun 2020 12:41:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=a9zzTa9ejzdaIGoo65ggUDBrQ6Gy7gHFs2bSFTc2/Tw=; b=GiiHRaXY4kfcxLjDejAu0xyk7pXAqIEgmGl3baqAC977wZlMoJu3d90QiD4dYefkFl eHmI1uLDwepvFxOV/H6DS3X+EVA20Ewk21VrlWQQ9KhcFqDd9QpgSxbTiiyWosC7DNWp 7hUNo0HIA2wiehAKyLCABgsJlO7xyeOpUoCacUvxQO84ApqiM7S2921cPy02QV5rott8 MuKVfYi+zbaX+Q4IfOtBamWLQwUIPk4lpyxcPjubyUs0cX2aOP8//PdNkVFC9m1q6CuQ 0HN+pqI5fNzKRqBXGfMsrul5iLwnWrGHTuX0cD12c4vqxm1NzdiK2p7m4ViAwDMmz+pw k0qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=a9zzTa9ejzdaIGoo65ggUDBrQ6Gy7gHFs2bSFTc2/Tw=; b=QZ1R0xQEQeRtEYt3qUVW4uIqL236GUi8ZwM6RHzavnE89z1yphH4xm2iehY2CskMg/ UpNflm/BDp7zIVZMZKwdvxsZ6WIbcafNYo/nDpBr4Pt2Qq5S5RQa1pVbah8Sr0+XM75c jYuj6bPcrB5VOyw/7QiPQowHWG5jrFl7X7WxIfPT1heSpYszG9Q6UOYmX6pZQllN2cCY N8wS+MefjhiRrBLRyUu3i5mRJ0Uz2f+5zqoHw3YPULtxlDMbFHd7fqhgSHMpaVM3ElIN oWmBF89r0KvYOy87EfdS1cgDZDPM70xnum6oMyBsGrOD/rHS5J8bAB6bB9kOAAAyBNeJ I3VQ== X-Gm-Message-State: AOAM530LuEXbTZzwJVlPwaFifk8OmDnZAA1tys8ot96WgUKiNvdSUZTL Kb031GDO6mbdWxmsUFJcWtyxkoqcIRY= X-Google-Smtp-Source: ABdhPJxgDfx91LjXFdz5WHZ8pznPMaRNM2MWwwOKXslwRtfdb3NDrPsMniEKbPLPXcVxZTc3Vjt6Vw== X-Received: by 2002:a1c:5603:: with SMTP id k3mr5199814wmb.116.1592077308997; Sat, 13 Jun 2020 12:41:48 -0700 (PDT) Received: from meru.fronius.com ([2a01:e0a:fa:a50:d869:cbcf:2456:40cc]) by smtp.gmail.com with ESMTPSA id a6sm15968918wrn.38.2020.06.13.12.41.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jun 2020 12:41:48 -0700 (PDT) From: Mathieu Othacehe X-Google-Original-From: Mathieu Othacehe To: 41839@debbugs.gnu.org Subject: [PATCH 1/2] image: Move hurd image definition to a dedicated file. Date: Sat, 13 Jun 2020 21:41:39 +0200 Message-Id: <20200613194140.10367-1-othacehe@gnu.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 41839 Cc: Mathieu Othacehe X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This moves hurd-disk-image to a dedicated file. It also defines a default operating-system so that the image can be built standalone. * gnu/system/images/hurd.scm: New file, * gnu/local.mk (GNU_SYSTEM_MODULES): add it. * gnu/image.scm ()[name]: New field. * gnu/system/image.scm (root-offset, root-label): Export it, (hurd-disk-image): remove it as this is now defined in the new, Hurd dedicated file above, (find-image): adapt to avoid loop dependency. --- gnu/image.scm | 2 + gnu/local.mk | 2 + gnu/system/image.scm | 23 +++--------- gnu/system/images/hurd.scm | 76 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 86 insertions(+), 17 deletions(-) create mode 100644 gnu/system/images/hurd.scm diff --git a/gnu/image.scm b/gnu/image.scm index 19b466527b..dc66f2c533 100644 --- a/gnu/image.scm +++ b/gnu/image.scm @@ -67,6 +67,8 @@ (define-record-type* image make-image image? + (name image-name ;symbol + (default #f)) (format image-format) ;symbol (target image-target (default #f)) diff --git a/gnu/local.mk b/gnu/local.mk index 583274235b..eeeb276478 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -629,6 +629,8 @@ GNU_SYSTEM_MODULES = \ %D%/system/uuid.scm \ %D%/system/vm.scm \ \ + %D%/system/images/hurd.scm \ + \ %D%/machine.scm \ %D%/machine/digital-ocean.scm \ %D%/machine/ssh.scm \ diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 1bda25fd7f..cb8fe18bcc 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -53,10 +53,12 @@ #:use-module (srfi srfi-35) #:use-module (rnrs bytevectors) #:use-module (ice-9 match) - #:export (esp-partition + #:export (root-offset + root-label + + esp-partition root-partition - hurd-disk-image efi-disk-image iso9660-image @@ -101,20 +103,6 @@ (list #:make-device-nodes make-hurd-device-nodes))))) -(define hurd-disk-image - (image - (format 'disk-image) - (target "i586-pc-gnu") - (partitions - (list (partition - (size 'guess) - (offset root-offset) - (label root-label) - (file-system "ext2") - (file-system-options '("-o" "hurd" "-O" "ext_attr")) - (flags '(boot)) - (initializer hurd-initialize-root-partition)))))) - (define efi-disk-image (image (format 'disk-image) @@ -569,7 +557,8 @@ addition of the record." (_ (cond ((and target (hurd-triplet? target)) - hurd-disk-image) + (module-ref (resolve-interface '(gnu system images hurd)) + 'hurd-disk-image)) (else efi-disk-image))))) diff --git a/gnu/system/images/hurd.scm b/gnu/system/images/hurd.scm new file mode 100644 index 0000000000..4417f03cc8 --- /dev/null +++ b/gnu/system/images/hurd.scm @@ -0,0 +1,76 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Mathieu Othacehe +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu system images hurd) + #:use-module (guix gexp) + #:use-module (gnu bootloader) + #:use-module (gnu bootloader grub) + #:use-module (gnu image) + #:use-module (gnu packages ssh) + #:use-module (gnu services) + #:use-module (gnu services ssh) + #:use-module (gnu system) + #:use-module (gnu system file-systems) + #:use-module (gnu system hurd) + #:use-module (gnu system image) + #:export (hurd-barebones-os + hurd-disk-image + hurd-barebones-disk-image)) + +(define hurd-barebones-os + (operating-system + (inherit %hurd-default-operating-system) + (bootloader (bootloader-configuration + (bootloader grub-minimal-bootloader) + (target "/dev/sdX"))) + (file-systems (cons (file-system + (device (file-system-label "my-root")) + (mount-point "/") + (type "ext2")) + %base-file-systems)) + (host-name "guixygnu") + (timezone "Europe/Amsterdam") + (packages (cons openssh-sans-x %base-packages/hurd)) + (services (cons (service openssh-service-type + (openssh-configuration + (openssh openssh-sans-x) + (use-pam? #f) + (port-number 2222) + (permit-root-login #t) + (allow-empty-passwords? #t) + (password-authentication? #t))) + %base-services/hurd)))) + +(define hurd-disk-image + (image + (format 'disk-image) + (target "i586-pc-gnu") + (partitions + (list (partition + (size 'guess) + (offset root-offset) + (label root-label) + (file-system "ext2") + (flags '(boot)) + (initializer (gexp initialize-root-partition))))))) + +(define hurd-barebones-disk-image + (image + (inherit hurd-disk-image) + (name 'hurd-barebones-disk-image) + (operating-system hurd-barebones-os))) -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 23 17:47:37 2020 Received: (at 41839) by debbugs.gnu.org; 23 Jun 2020 21:47:38 +0000 Received: from localhost ([127.0.0.1]:37292 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jnqlR-0005A2-5g for submit@debbugs.gnu.org; Tue, 23 Jun 2020 17:47:37 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45380) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jnqlK-00059a-Lr for 41839@debbugs.gnu.org; Tue, 23 Jun 2020 17:47:31 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:40741) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jnqlF-0002DR-CU; Tue, 23 Jun 2020 17:47:21 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=58500 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jnqlE-00007M-MJ; Tue, 23 Jun 2020 17:47:20 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Mathieu Othacehe Subject: Re: [bug#41839] [PATCH 1/2] image: Move hurd image definition to a dedicated file. References: <20200613194001.9580-1-othacehe@gnu.org> <20200613194140.10367-1-othacehe@gnu.org> Date: Tue, 23 Jun 2020 23:47:18 +0200 In-Reply-To: <20200613194140.10367-1-othacehe@gnu.org> (Mathieu Othacehe's message of "Sat, 13 Jun 2020 21:41:39 +0200") Message-ID: <87sgelxxnd.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 41839 Cc: Mathieu Othacehe , 41839@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi! Mathieu Othacehe skribis: > This moves hurd-disk-image to a dedicated file. It also defines a default > operating-system so that the image can be built standalone. > > * gnu/system/images/hurd.scm: New file, > * gnu/local.mk (GNU_SYSTEM_MODULES): add it. > * gnu/image.scm ()[name]: New field. > * gnu/system/image.scm (root-offset, root-label): Export it, > (hurd-disk-image): remove it as this is now defined in the new, Hurd dedi= cated > file above, > (find-image): adapt to avoid loop dependency. LGTM! It would be good to check by running =E2=80=9Cmake as-derivation=E2=80=9D i= f gnu/image/* gets included. Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 23 17:49:07 2020 Received: (at 41839) by debbugs.gnu.org; 23 Jun 2020 21:49:07 +0000 Received: from localhost ([127.0.0.1]:37300 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jnqmx-0005Dp-8X for submit@debbugs.gnu.org; Tue, 23 Jun 2020 17:49:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45682) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jnqmv-0005DD-K9 for 41839@debbugs.gnu.org; Tue, 23 Jun 2020 17:49:05 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:40749) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jnqmq-0002yJ-6A; Tue, 23 Jun 2020 17:49:00 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=58504 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jnqmo-0000CC-0v; Tue, 23 Jun 2020 17:48:58 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Mathieu Othacehe Subject: Re: [bug#41839] [PATCH 2/2] ci: Build Guix System images. References: <20200613194140.10367-1-othacehe@gnu.org> <20200613194140.10367-2-othacehe@gnu.org> Date: Tue, 23 Jun 2020 23:48:56 +0200 In-Reply-To: <20200613194140.10367-2-othacehe@gnu.org> (Mathieu Othacehe's message of "Sat, 13 Jun 2020 21:41:40 +0200") Message-ID: <87o8p9xxkn.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 41839 Cc: Mathieu Othacehe , 41839@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Mathieu Othacehe skribis: > Build a list of Guix System images. For now, this list only contains the = Hurd > barebones Guix System image. > > * gnu/ci.scm (%guixsd-supported-systems): Remove "armhf-linux", > (%u-boot-systems): remove unused variable, > (%guix-system-images): new variable > (qemu-jobs): rename to "image-jobs" and build the Guix Systems listed in = the > new "%guix-system-images" variable, > (system-test-jobs): adapt accordingly, > (hydra-jobs): ditto. Cool. > + (if (member system %guix-system-supported-systems) > + `(,(->job 'usb-image > + (build-image > + (image > + (inherit efi-disk-image) > + (size (* 1500 MiB)) > + (operating-system installation-os)))) > + ,(->job 'iso9660-image > + (build-image > + (image > + (inherit iso9660-image) > + (operating-system installation-os)))) > + ,@(map (lambda (image) > + (->job (image-name image) (build-image image))) > + %guix-system-images)) > '())) I think the effect is that we=E2=80=99ll also cross-build GNU/Hurd images f= rom i686-linux, right? It would be nice to avoid that and only cross-build from x86_64. Otherwise LGTM, thank you! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 25 05:54:58 2020 Received: (at 41839) by debbugs.gnu.org; 25 Jun 2020 09:54:58 +0000 Received: from localhost ([127.0.0.1]:39707 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1joOaw-0001N9-Ku for submit@debbugs.gnu.org; Thu, 25 Jun 2020 05:54:58 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:37810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1joOat-0001Mu-95 for 41839@debbugs.gnu.org; Thu, 25 Jun 2020 05:54:57 -0400 Received: by mail-wm1-f68.google.com with SMTP id o2so5270725wmh.2 for <41839@debbugs.gnu.org>; Thu, 25 Jun 2020 02:54:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=yLP53FVFZoJqoLqmLZwDAvbr4PG9VPq9nm/1t/iKjeM=; b=kLWcuCIk95hoPmaVk5ymxtrU34Z15VnAxyZS/nCj9CT7AVKSSV9+QbAjE7sdA9ldl2 8ObLuADIxjCdhnwO1smCGJPwvDuteo1YJqkYwoccPd+Fg+B93p4q9LnUjb3za9x8NFqN dS36bOJodTqQltd4o103ptzmAWGpf8YNesahigO5UAvPdXZ+dfn8ZYcgDK3TSTVP2F5e TmJ9YrXe5qPDN6g8x8Z6gRAcg3rpzXUDrCwUJ8VkQM+3aYpjZBJf7565B5e2ua3HmvqR aXOYb7g7gzgCdKy12R5Wd/xZqzwCjsAfRRVtwdBQOWcO6HAK25nmtQ21yNkUIwutc3jM bBXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=yLP53FVFZoJqoLqmLZwDAvbr4PG9VPq9nm/1t/iKjeM=; b=DDyhT0Trn0FUEFxa5dYM570PkGyqY2vmqXierU2x4eTqKFNHw2OxQYQTui5QQPavic jgzWwAOv4s2EtWXR1V/ZdKEyIX4nHRN9ke8rCAU0Ju9p0yTmtgcfIYyUPykcPw0vFDQd DTQOZcg7OnoK2boanYx2fcAkZU5uapaGwRGa3GTaLNd5YO4kriipBzOjZz1ohuVMLzTM 8NHplfaeHCdi8wVr60NSHUhAV1QnhZRlLn7NmGl0cpxmWbRTTqvd/PssIndDL/ADC3LY Uk5OUqKT4COxGJ9ySAj8qcIW+YL2slGEacpVylEeSN4TAjScXPUpoXHVSb0n7F8OAxos ZL5A== X-Gm-Message-State: AOAM532E99y5qAhXse9/FhuYye+wYENhsXtsXu9Ft1eciy3kw+uIqOcd 7yzEQRvAN1pySpttZaHzGhV+urJR X-Google-Smtp-Source: ABdhPJw6BXajxl74IUkrWgLi/MixuW418zJdY6oNvcTT7q4Y5a+ZPawVbyJvmbFEINJc+IAYNxmS+w== X-Received: by 2002:a1c:2157:: with SMTP id h84mr2393831wmh.35.1593078889120; Thu, 25 Jun 2020 02:54:49 -0700 (PDT) Received: from meru (lfbn-ann-1-136-86.w86-200.abo.wanadoo.fr. [86.200.104.86]) by smtp.gmail.com with ESMTPSA id u15sm25669273wrm.64.2020.06.25.02.54.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 02:54:48 -0700 (PDT) From: Mathieu Othacehe To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#41839] [PATCH 1/2] image: Move hurd image definition to a dedicated file. References: <20200613194001.9580-1-othacehe@gnu.org> <20200613194140.10367-1-othacehe@gnu.org> <87sgelxxnd.fsf@gnu.org> Date: Thu, 25 Jun 2020 11:54:46 +0200 In-Reply-To: <87sgelxxnd.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Tue, 23 Jun 2020 23:47:18 +0200") Message-ID: <87y2obcvx5.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 41839 Cc: 41839@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hey, > It would be good to check by running =E2=80=9Cmake as-derivation=E2=80=9D= if gnu/image/* > gets included. Yep, its included. Thanks for reviewing! Mathieu From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 25 06:02:42 2020 Received: (at 41839-done) by debbugs.gnu.org; 25 Jun 2020 10:02:42 +0000 Received: from localhost ([127.0.0.1]:39711 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1joOiQ-0001Zg-ED for submit@debbugs.gnu.org; Thu, 25 Jun 2020 06:02:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43866) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1joOiP-0001ZV-CD for 41839-done@debbugs.gnu.org; Thu, 25 Jun 2020 06:02:41 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:37413) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joOiJ-0001H4-Ez; Thu, 25 Jun 2020 06:02:35 -0400 Received: from lfbn-ann-1-136-86.w86-200.abo.wanadoo.fr ([86.200.104.86]:41216 helo=meru) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1joOiI-0001fW-SE; Thu, 25 Jun 2020 06:02:35 -0400 From: Mathieu Othacehe To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#41839] [PATCH 2/2] ci: Build Guix System images. References: <20200613194140.10367-1-othacehe@gnu.org> <20200613194140.10367-2-othacehe@gnu.org> <87o8p9xxkn.fsf@gnu.org> Date: Thu, 25 Jun 2020 12:02:30 +0200 In-Reply-To: <87o8p9xxkn.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Tue, 23 Jun 2020 23:48:56 +0200") Message-ID: <87r1u3cvk9.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 41839-done Cc: 41839-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hey, > I think the effect is that we=E2=80=99ll also cross-build GNU/Hurd images= from > i686-linux, right? It would be nice to avoid that and only cross-build > from x86_64. Yes, I fixed that (in two tries actually :p). Now working on adding this image to the website. Thanks, Mathieu From unknown Sat Aug 16 11:12:43 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 23 Jul 2020 11:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator