From patchwork Sat Nov 7 21:27:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 25033 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9CFAD27BBF5; Sat, 7 Nov 2020 21:28:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 375E827BBF3 for ; Sat, 7 Nov 2020 21:28:09 +0000 (GMT) Received: from localhost ([::1]:47670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kbVkm-00070f-9K for patchwork@mira.cbaines.net; Sat, 07 Nov 2020 16:28:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44368) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kbVkg-00070L-9E for guix-patches@gnu.org; Sat, 07 Nov 2020 16:28:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47804) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kbVkf-0004Aa-VZ for guix-patches@gnu.org; Sat, 07 Nov 2020 16:28:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kbVkf-00014q-Ra for guix-patches@gnu.org; Sat, 07 Nov 2020 16:28:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44507] [PATCH 1/3] linux-initrd: Handle 'block-special and 'char-special cpio headers as well. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 07 Nov 2020 21:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44507 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44507@debbugs.gnu.org Cc: Danny Milosavljevic Received: via spool by 44507-submit@debbugs.gnu.org id=B44507.16047844584095 (code B ref 44507); Sat, 07 Nov 2020 21:28:01 +0000 Received: (at 44507) by debbugs.gnu.org; 7 Nov 2020 21:27:38 +0000 Received: from localhost ([127.0.0.1]:59346 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kbVkH-00013y-Qu for submit@debbugs.gnu.org; Sat, 07 Nov 2020 16:27:38 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:53758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kbVkG-00013c-AS for 44507@debbugs.gnu.org; Sat, 07 Nov 2020 16:27:36 -0500 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 9BAD933604BC; Sat, 7 Nov 2020 22:27:34 +0100 (CET) From: Danny Milosavljevic Date: Sat, 7 Nov 2020 22:27:31 +0100 Message-Id: <20201107212733.22326-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201107204718.21824-1-dannym@scratchpost.org> References: <20201107204718.21824-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/cpio.scm (make-cpio-header): Handle size correctly for all file types. (mode->type): Add 'block-special, 'char-special. --- guix/cpio.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/guix/cpio.scm b/guix/cpio.scm index e4692e2e9c..5d38573971 100644 --- a/guix/cpio.scm +++ b/guix/cpio.scm @@ -132,9 +132,10 @@ (%make-cpio-header MAGIC inode mode uid gid nlink mtime - (if (= C_ISDIR (logand mode C_FMT)) - 0 - size) + (if (or (= C_ISLNK (logand mode C_FMT)) + (= C_ISREG (logand mode C_FMT))) + size + 0) major minor rmajor rminor (+ name-size 1) ;include trailing zero 0))) ;checksum @@ -146,6 +147,8 @@ denotes, similar to 'stat:type'." (cond ((= C_ISREG fmt) 'regular) ((= C_ISDIR fmt) 'directory) ((= C_ISLNK fmt) 'symlink) + ((= C_ISBLK fmt) 'block-special) + ((= C_ISCHR fmt) 'char-special) (else (error "unsupported file type" mode))))) @@ -233,6 +236,10 @@ produces with the '-H newc' option." (put-string port target))) ((directory) #t) + ((block-special) + #t) + ((char-special) + #t) (else (error "file type not supported"))) From patchwork Sat Nov 7 21:27:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 25035 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id ADB5D27BBF4; Sat, 7 Nov 2020 21:28:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 119D427BBF3 for ; Sat, 7 Nov 2020 21:28:10 +0000 (GMT) Received: from localhost ([::1]:47700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kbVkn-00071i-7k for patchwork@mira.cbaines.net; Sat, 07 Nov 2020 16:28:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44370) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kbVkg-00070R-KF for guix-patches@gnu.org; Sat, 07 Nov 2020 16:28:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47805) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kbVkg-0004Ae-A7 for guix-patches@gnu.org; Sat, 07 Nov 2020 16:28:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kbVkg-00014x-7N for guix-patches@gnu.org; Sat, 07 Nov 2020 16:28:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44507] [PATCH 2/3] linux-initrd: Add special-file->cpio-header* Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 07 Nov 2020 21:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44507 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44507@debbugs.gnu.org Cc: Danny Milosavljevic Received: via spool by 44507-submit@debbugs.gnu.org id=B44507.16047844584102 (code B ref 44507); Sat, 07 Nov 2020 21:28:02 +0000 Received: (at 44507) by debbugs.gnu.org; 7 Nov 2020 21:27:38 +0000 Received: from localhost ([127.0.0.1]:59348 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kbVkI-000140-2P for submit@debbugs.gnu.org; Sat, 07 Nov 2020 16:27:38 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:53760) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kbVkG-00013d-Ax for 44507@debbugs.gnu.org; Sat, 07 Nov 2020 16:27:36 -0500 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 603FA336075E; Sat, 7 Nov 2020 22:27:35 +0100 (CET) From: Danny Milosavljevic Date: Sat, 7 Nov 2020 22:27:32 +0100 Message-Id: <20201107212733.22326-2-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201107212733.22326-1-dannym@scratchpost.org> References: <20201107204718.21824-1-dannym@scratchpost.org> <20201107212733.22326-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/cpio.scm (special-file->cpio-header*): New public procedure. --- guix/cpio.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/guix/cpio.scm b/guix/cpio.scm index 5d38573971..c9932f5bf9 100644 --- a/guix/cpio.scm +++ b/guix/cpio.scm @@ -27,6 +27,7 @@ make-cpio-header file->cpio-header file->cpio-header* + special-file->cpio-header* write-cpio-header read-cpio-header @@ -190,6 +191,25 @@ produced in a deterministic fashion." #:size (stat:size st) #:name-size (string-length file-name)))) +(define* (special-file->cpio-header* file + device-type + device-major + device-minor + permission-bits + #:optional (file-name file)) + "Create a character or block device header. + +DEVICE-TYPE is either 'char-special or 'block-special. + +The number of hard links is assumed to be 1." + (make-cpio-header #:mode (logior (match device-type + ('block-special C_ISBLK) + ('char-special C_ISCHR)) + permission-bits) + #:nlink 1 + #:rdev (device-number device-major device-minor) + #:name-size (string-length file-name))) + (define %trailer "TRAILER!!!") From patchwork Sat Nov 7 21:27:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 25034 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3065627BBF5; Sat, 7 Nov 2020 21:28:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7EB1127BBF4 for ; Sat, 7 Nov 2020 21:28:09 +0000 (GMT) Received: from localhost ([::1]:47678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kbVkm-00070x-Nh for patchwork@mira.cbaines.net; Sat, 07 Nov 2020 16:28:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44372) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kbVkg-00070X-Uo for guix-patches@gnu.org; Sat, 07 Nov 2020 16:28:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47806) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kbVkg-0004Ai-Ln for guix-patches@gnu.org; Sat, 07 Nov 2020 16:28:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kbVkg-000154-JF for guix-patches@gnu.org; Sat, 07 Nov 2020 16:28:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44507] [PATCH 3/3] gnu: Add heads-dev-cpio. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 07 Nov 2020 21:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44507 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44507@debbugs.gnu.org Cc: Danny Milosavljevic Received: via spool by 44507-submit@debbugs.gnu.org id=B44507.16047844604111 (code B ref 44507); Sat, 07 Nov 2020 21:28:02 +0000 Received: (at 44507) by debbugs.gnu.org; 7 Nov 2020 21:27:40 +0000 Received: from localhost ([127.0.0.1]:59350 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kbVkK-00014E-AQ for submit@debbugs.gnu.org; Sat, 07 Nov 2020 16:27:40 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:53768) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kbVkG-00013g-Qy for 44507@debbugs.gnu.org; Sat, 07 Nov 2020 16:27:37 -0500 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 14D04336076C; Sat, 7 Nov 2020 22:27:36 +0100 (CET) From: Danny Milosavljevic Date: Sat, 7 Nov 2020 22:27:33 +0100 Message-Id: <20201107212733.22326-3-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201107212733.22326-1-dannym@scratchpost.org> References: <20201107204718.21824-1-dannym@scratchpost.org> <20201107212733.22326-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/heads.scm (heads-dev-cpio): New variable. --- gnu/packages/heads.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/heads.scm b/gnu/packages/heads.scm index b28433431c..d7e90471a2 100644 --- a/gnu/packages/heads.scm +++ b/gnu/packages/heads.scm @@ -19,6 +19,7 @@ (define-module (gnu packages heads) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -161,3 +162,36 @@ done (synopsis "Musl-cross gcc 5 toolchain") (description "Musl-cross toolchain: binutils, gcc 5 and musl.") (license license:isc)))) + +;; This package provides a "dev.cpio" file usable as a base for booting Heads. +(define-public heads-dev-cpio + (package + (name "heads-dev-cpio") + (version "0.1") + (source #f) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils) + (guix cpio)) + #:builder (begin + (use-modules (guix build utils) + (guix cpio) + (srfi srfi-26)) + (mkdir-p "dev") ; input directory. + (let* ((out (assoc-ref %outputs "out")) + (libexec (string-append out "/libexec"))) + (mkdir-p libexec) + (call-with-output-file (string-append libexec "/dev.cpio") + (lambda (port) + (write-cpio-archive '("dev" "dev/console") port + #:file->header + (lambda (name) + (if (string=? "dev/console" name) + (special-file->cpio-header* name 'char-special 5 1 #o600) + (file->cpio-header* name)))))) + #t)))) + (synopsis "\"dev.cpio\" for Heads") + (description "This package provides a \"dev.cpio\" file usable as a base for +heads' initrd.") + (home-page "http://osresearch.net/") + (license license:bsd-2)))