From patchwork Sat Nov 5 12:55:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 17221 Received: (qmail 5430 invoked by uid 89); 5 Nov 2016 12:55:57 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RP_MATCHES_RCVD, SPF_PASS, UNWANTED_LANGUAGE_BODY autolearn=ham version=3.3.2 spammy=FAT, Hx-spam-relays-external:ESMTPA X-Spam-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RP_MATCHES_RCVD, SPF_PASS, UNWANTED_LANGUAGE_BODY autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: lists.gnu.org Received: from lists.gnu.org (HELO lists.gnu.org) (208.118.235.17) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 05 Nov 2016 12:55:47 +0000 Received: from localhost ([::1]:47687 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c30Ve-0001Pn-8v for patchwork@sourceware.org; Sat, 05 Nov 2016 08:55:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38667) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c30VX-0001OQ-0n for guix-devel@gnu.org; Sat, 05 Nov 2016 08:55:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c30VW-00012S-04 for guix-devel@gnu.org; Sat, 05 Nov 2016 08:55:39 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:37429) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c30VV-00012C-So for guix-devel@gnu.org; Sat, 05 Nov 2016 08:55:37 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 79FC7207DA; Sat, 5 Nov 2016 08:55:37 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute4.internal (MEProxy); Sat, 05 Nov 2016 08:55:37 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=fastmail.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=qOHk1gXox2AqQNN iayadHLqMnqg=; b=cWdGCHfB71zo0DeqiZ3c0eBUdpfFILHrgrY2ohfSU+iQWAh 7eu9xSRp8cxUt5GGTZB4TZUJjBD5W6s+vywNu7APtk1ZT8GvQQYW+s8ye2kTBHjl ipkEE4xgi8lV9AjPNcS8yXB/inILFo2ks66JPbDszhFXBqPa/0EreeezrsPs= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s= smtpout; bh=qOHk1gXox2AqQNNiayadHLqMnqg=; b=pv7jRVUl4d0AujZ9uKn4 RsTfcskc2Niqq3/A55ytAYbS4bLGscXpo3BFX+NAyjacbRUJj/e7S8vOvynMqj60 UEsggF/PakEHpeT122n4VRNT8HuTxNjk6t5IOGIkTVUZW8XmdRA4ioLHaHvJsk// t6XVpkwuZ+fcYKGdvWTJdy0= X-ME-Sender: X-Sasl-enc: jxrwNZ+x8kh7XiAXi6i28myGZ2xLs50hkkV2D575xFmL 1478350534 Received: from localhost (169.243.187.81.in-addr.arpa [81.187.243.169]) by mail.messagingengine.com (Postfix) with ESMTPA id 0D2ACCC027; Sat, 5 Nov 2016 08:55:33 -0400 (EDT) From: Marius Bakke To: guix-devel@gnu.org Subject: [PATCH 1/6] gnu: Add fatfsck-static. Date: Sat, 5 Nov 2016 12:55:06 +0000 Message-Id: <20161105125511.29383-2-mbakke@fastmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161105125511.29383-1-mbakke@fastmail.com> References: <20161105125511.29383-1-mbakke@fastmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.111.4.26 X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marius Bakke Errors-To: guix-devel-bounces+patchwork=sourceware.org@gnu.org Sender: "Guix-devel" * gnu/packages/disk.scm (dosfstools/static): New private variable. (fatfsck/static): New variable. --- gnu/packages/disk.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index db050d6..477c25a 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Roel Janssen +;;; Copyright © 2016 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages docbook) @@ -197,6 +199,40 @@ to recover data more efficiently by only reading the necessary blocks.") which respectively make and check MS-DOS FAT file systems.") (license license:gpl3+))) +(define dosfstools/static + (static-package + (package (inherit dosfstools)))) + +(define-public fatfsck/static + (package + (name "fatfsck-static") + (version (package-version dosfstools)) + (build-system trivial-build-system) + (source #f) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let ((source (string-append (assoc-ref %build-inputs "dosfstools") + "/sbin/")) + (exe "fsck.fat") + (bin (string-append (assoc-ref %outputs "out") "/sbin"))) + (mkdir-p bin) + (with-directory-excursion bin + (copy-file (string-append source exe) exe) + (remove-store-references exe) + (chmod exe #o555) + ;; Add fsck.vfat symlink to match the Linux driver name. + (symlink exe "fsck.vfat") + #t))))) + (inputs `(("dosfstools" ,dosfstools/static))) + (home-page (package-home-page dosfstools)) + (synopsis "Statically linked fsck.fat from dosfstools") + (description "This package provides a statically-linked fsck.fat +and a fsck.vfat compatibility symlink for use in an initrd.") + (license (package-license dosfstools)))) + (define-public sdparm (package (name "sdparm")