From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 6OwzM2sRp1+2UwAA0tVLHw (envelope-from ) for ; Sat, 07 Nov 2020 21:28:11 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id QK3yLmsRp1+gUAAAbx9fmQ (envelope-from ) for ; Sat, 07 Nov 2020 21:28:11 +0000 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 aspmx1.migadu.com (Postfix) with ESMTPS id 76EBD94042C for ; Sat, 7 Nov 2020 21:28:11 +0000 (UTC) Received: from localhost ([::1]:47700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kbVko-00071i-7t for larch@yhetil.org; Sat, 07 Nov 2020 16:28:10 -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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 3.99 X-TUID: hHZ/RLrQe+lm * 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!!!")