From patchwork Thu Jan 2 00:38:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 19519 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 04D86179CA; Thu, 2 Jan 2020 00:40:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id C4A3D179BD for ; Thu, 2 Jan 2020 00:40:23 +0000 (GMT) Received: from localhost ([::1]:35010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imoXH-0007TX-Br for patchwork@mira.cbaines.net; Wed, 01 Jan 2020 19:40:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35058) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imoWy-00073b-LQ for guix-patches@gnu.org; Wed, 01 Jan 2020 19:40:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imoWx-0003xr-Lt for guix-patches@gnu.org; Wed, 01 Jan 2020 19:40:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60078) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1imoWx-0003xC-I0 for guix-patches@gnu.org; Wed, 01 Jan 2020 19:40:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1imoWx-0003ee-Fl for guix-patches@gnu.org; Wed, 01 Jan 2020 19:40:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38860] [PATCH 4/7] gnu: Add jfs_fsck-static. Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Jan 2020 00:40:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38860 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 38860@debbugs.gnu.org Received: via spool by 38860-submit@debbugs.gnu.org id=B38860.157792555713938 (code B ref 38860); Thu, 02 Jan 2020 00:40:03 +0000 Received: (at 38860) by debbugs.gnu.org; 2 Jan 2020 00:39:17 +0000 Received: from localhost ([127.0.0.1]:37805 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1imoWD-0003cf-CS for submit@debbugs.gnu.org; Wed, 01 Jan 2020 19:39:17 -0500 Received: from tobias.gr ([80.241.217.52]:39910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1imoWC-0003bs-7R for 38860@debbugs.gnu.org; Wed, 01 Jan 2020 19:39:16 -0500 Received: by tobias.gr (OpenSMTPD) with ESMTP id f01cff07 for <38860@debbugs.gnu.org>; Thu, 2 Jan 2020 00:39:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=2018; i=me@tobias.gr; bh=5crDu+8cd 2hQDktEKdNwzIqqS3b/GKCArEFKMJZJeNE=; b=kJamzi6e6t2XPqH0rB+BWscJY 8tXKDN/+wod2ht+AuPqRXhITdxKxrE0ajyGBr3mm3lNCLEJVi8B2SLwpwn5IM4iu RE5BlyEQ6AAr2YxVEkChLdlJmdhTcBZqsnDjnIwkvUzLrvTQmDSnCniL9HdLIpIe 4W70vA+0sOr761e94PVS43mNEJQGcAT1deiqGO0mcsm+PTo2mkK+U7XtD06izaAx ppDZBbse/k3ErjajdODs3WPKQGpkBAKK3zvpXwVdXH3PgVgc6/LiLMdupps3NntE e40/LAQdXGBu+FvtmOPG0L/dfjCzX1Zf1qlB+VDPEgOEZyWzOOtWRqHB4+wcg== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id a73c7036 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <38860@debbugs.gnu.org>; Thu, 2 Jan 2020 00:39:12 +0000 (UTC) Date: Thu, 2 Jan 2020 01:38:59 +0100 Message-Id: <20200102003902.15205-4-me@tobias.gr> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20200102003902.15205-1-me@tobias.gr> References: <20200102003902.15205-1-me@tobias.gr> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" Reply-to: Tobias Geerinckx-Rice , Tobias Geerinckx-Rice via Guix-patches X-Patchwork-Original-From: Tobias Geerinckx-Rice via Guix-patches via From: "ashish.is--- via Guix-patches\" via" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/file-systems.scm (jfs_fsck-static): New public variable. --- gnu/packages/file-systems.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 3a8848b3ad..a3dc993055 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -28,6 +28,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system linux-module) + #:use-module (guix build-system trivial) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages acl) @@ -154,6 +155,38 @@ transaction log. `(("util-linux:static" ,util-linux "static") ,@(package-inputs jfsutils)))))) +(define-public jfs_fsck/static + (package + (name "jfs_fsck-static") + (version (package-version jfsutils)) + (source #f) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils) + (ice-9 ftw) + (srfi srfi-26)) + (let* ((jfsutils (assoc-ref %build-inputs "jfsutils")) + (fsck "jfs_fsck") + (out (assoc-ref %outputs "out")) + (sbin (string-append out "/sbin"))) + (mkdir-p sbin) + (with-directory-excursion sbin + (install-file (string-append jfsutils "/sbin/" fsck) + ".") + (remove-store-references fsck) + (chmod fsck #o555)) + #t)))) + (inputs + `(("jfsutils" ,jfsutils/static))) + (home-page (package-home-page jfsutils)) + (synopsis "Statically-linked jfs_fsck command from jfsutils") + (description "This package provides statically-linked jfs_fsck command taken +from the jfsutils package. It is meant to be used in initrds.") + (license (package-license jfsutils)))) + (define-public disorderfs (package (name "disorderfs")