From unknown Sun Jun 22 11:38:13 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#44507 <44507@debbugs.gnu.org> To: bug#44507 <44507@debbugs.gnu.org> Subject: Status: [PATCH 0/3] Create "dev.cpio" for Heads. Reply-To: bug#44507 <44507@debbugs.gnu.org> Date: Sun, 22 Jun 2025 18:38:13 +0000 retitle 44507 [PATCH 0/3] Create "dev.cpio" for Heads. reassign 44507 guix-patches submitter 44507 Danny Milosavljevic severity 44507 normal tag 44507 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 07 15:47:32 2020 Received: (at submit) by debbugs.gnu.org; 7 Nov 2020 20:47:33 +0000 Received: from localhost ([127.0.0.1]:59322 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kbV7U-00006f-Lc for submit@debbugs.gnu.org; Sat, 07 Nov 2020 15:47:32 -0500 Received: from lists.gnu.org ([209.51.188.17]:46820) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kbV7S-00006X-VX for submit@debbugs.gnu.org; Sat, 07 Nov 2020 15:47:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38502) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kbV7S-0004am-I7 for guix-patches@gnu.org; Sat, 07 Nov 2020 15:47:30 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:58384) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kbV7Q-00086k-8g for guix-patches@gnu.org; Sat, 07 Nov 2020 15:47:30 -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 EAB60336066C; Sat, 7 Nov 2020 21:47:22 +0100 (CET) From: Danny Milosavljevic To: guix-patches@gnu.org Subject: [PATCH 0/3] Create "dev.cpio" for Heads. Date: Sat, 7 Nov 2020 21:47:18 +0100 Message-Id: <20201107204718.21824-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=85.13.145.193; envelope-from=dannym@scratchpost.org; helo=dd26836.kasserver.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/07 15:47:23 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit Cc: Danny Milosavljevic 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 (---) This patch series dynamically creates "dev.cpio" for Heads instead of carrying it as a binary blob. Danny Milosavljevic (3): linux-initrd: Handle 'block-special and 'char-special cpio headers as well. linux-initrd: Add special-file->cpio-header* gnu: Add heads-dev-cpio. gnu/packages/heads.scm | 34 ++++++++++++++++++++++++++++++++++ guix/cpio.scm | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 64 insertions(+), 3 deletions(-) From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 07 16:27:38 2020 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 To: 44507@debbugs.gnu.org Subject: [PATCH 1/3] linux-initrd: Handle 'block-special and 'char-special cpio headers as well. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 44507 Cc: Danny Milosavljevic 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.7 (-) * 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 debbugs-submit-bounces@debbugs.gnu.org Sat Nov 07 16:27:38 2020 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 To: 44507@debbugs.gnu.org Subject: [PATCH 2/3] linux-initrd: Add special-file->cpio-header* 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 44507 Cc: Danny Milosavljevic 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.7 (-) * 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 debbugs-submit-bounces@debbugs.gnu.org Sat Nov 07 16:27:40 2020 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 To: 44507@debbugs.gnu.org Subject: [PATCH 3/3] gnu: Add heads-dev-cpio. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 44507 Cc: Danny Milosavljevic 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.7 (-) * 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))) From debbugs-submit-bounces@debbugs.gnu.org Sun Nov 22 05:07:53 2020 Received: (at 44507-done) by debbugs.gnu.org; 22 Nov 2020 10:07:53 +0000 Received: from localhost ([127.0.0.1]:46946 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kgmHh-0007nO-Fj for submit@debbugs.gnu.org; Sun, 22 Nov 2020 05:07:53 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:48456) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kgmHg-0007nF-4O for 44507-done@debbugs.gnu.org; Sun, 22 Nov 2020 05:07:52 -0500 Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 9FF203362437 for <44507-done@debbugs.gnu.org>; Sun, 22 Nov 2020 11:07:50 +0100 (CET) Date: Sun, 22 Nov 2020 11:07:47 +0100 From: Danny Milosavljevic To: 44507-done@debbugs.gnu.org Subject: Re: [PATCH 0/3] Create "dev.cpio" for Heads. Message-ID: <20201122110747.17a61481@scratchpost.org> In-Reply-To: <20201107204718.21824-1-dannym@scratchpost.org> References: <20201107204718.21824-1-dannym@scratchpost.org> X-Mailer: Claws Mail 3.17.7 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/qLG6HJZeSFr++XJDsG+OcbD"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 44507-done 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.7 (-) --Sig_/qLG6HJZeSFr++XJDsG+OcbD Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Pushed dev.cpio generator to guix master as these commits: * b1dfc64552265d66e60d11c2a1b6f4da549cd495 * 8e7c98963f7e51b2ee9fd140f1aa59cf0f762a60 * d82f227291699e4bea655fbac23620576702667b --Sig_/qLG6HJZeSFr++XJDsG+OcbD Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl+6OHMACgkQ5xo1VCww uqXBvwf/S91MZnzw4t05KSvgAT7QJ03m7qSa9nbDK5DzUN6DEV3A8YMSd1+W4Q7K ib2t1fWtKpvTdP5l5cT42UfUVkTaVrLzLNxh1P/80eyPzLLNjowTpEaibm3phRud 6yuZY9mBYNyeKLnzeL2xpBYBtkXHMHiAAv7AvwVyqj1H/XbxQLviaNan164k4ywz qJ1wsj9J827g/ZqOk8Vws9awrb3iLGvIfLxc9il17XlY1ifbxQWXYgwgbLllaJ1B 8DApah8Q8MTVXLIh99LKk3oumQdkVw0M8u7uW+pXr1/jsMJC4EIQLZZWH0DfbfV7 BAt+xy7GbC1+e7H0W6Pw5eKMu89sPA== =cR+x -----END PGP SIGNATURE----- --Sig_/qLG6HJZeSFr++XJDsG+OcbD-- From unknown Sun Jun 22 11:38:13 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 20 Dec 2020 12:24:04 +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