From mboxrd@z Thu Jan 1 00:00:00 1970 From: Patrick Hetu Subject: [PATCH] Add btrfs-progs. Date: Thu, 5 Nov 2015 17:12:10 -0500 Message-ID: <563BD43A.3030409@auf.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60072) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZuSlW-0007MT-QX for guix-devel@gnu.org; Thu, 05 Nov 2015 17:12:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZuSlR-00036O-QZ for guix-devel@gnu.org; Thu, 05 Nov 2015 17:12:18 -0500 Received: from smtp.ca.auf.org ([199.84.140.5]:56584) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZuSlR-000364-Kj for guix-devel@gnu.org; Thu, 05 Nov 2015 17:12:13 -0500 Received: from smtp-sortant.ca.auf.org (smtp-sortant.ca.auf.org [199.84.140.10]) by smtp.ca.auf.org (Postfix) with ESMTP id E7D8314E5 for ; Thu, 5 Nov 2015 17:12:11 -0500 (EST) Received: from localhost (amavis-montreal.ca.auf.org [199.84.140.2]) by smtp-sortant.ca.auf.org (Postfix) with ESMTP id 8B7566B4 for ; Thu, 5 Nov 2015 17:12:12 -0500 (EST) Received: from smtp-sortant.ca.auf.org ([IPv6:::ffff:199.84.140.10]) by localhost (amavis-montreal.ca.auf.org [::ffff:199.84.140.2]) (amavisd-new, port 10024) with ESMTP id B3xNHxIbjLcm for ; Thu, 5 Nov 2015 17:12:09 -0500 (EST) Received: from [10.36.1.102] (unknown [10.36.1.102]) by smtp-sortant.ca.auf.org (Postfix) with ESMTPSA id C0A2F47B for ; Thu, 5 Nov 2015 17:12:10 -0500 (EST) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org I still need to figure out how to get rid of the "fsck.btrfs not found" when the system boots. Maybe it needs to be in the initrd. Note that I'm also adding it to %base-packages like e2fsprogs. Patrick (avoine on IRC) From 982302084d16b53b878b36cc29f4e0cefc2df608 Mon Sep 17 00:00:00 2001 From: Patrick Hetu Date: Thu, 5 Nov 2015 17:01:42 -0500 Subject: [PATCH] gnu: Add btrfs-progs. --- gnu/packages/linux.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ gnu/system.scm | 1 + 2 files changed, 49 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index aa2fc02..c21c151 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -57,6 +57,7 @@ #:use-module (gnu packages asciidoc) #:use-module (gnu packages readline) #:use-module (gnu packages calendar) + #:use-module (gnu packages acl) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) @@ -2410,3 +2411,50 @@ id=0B7CLI-REKbE3VTdaa0EzTkhYdU0") "This package provides a FUSE-based file system that provides read and write access to exFAT devices.") (license gpl2+))) + +(define-public btrfs-progs + (package + (name "btrfs-progs") + (version "4.2.3") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kernel.org/linux/kernel/people/kdave/" + name "/" + name "-v" version ".tar.xz")) + (sha256 + (base32 + "0gpknqvnpl4y78fsfak3iv147czc0rak8fbcg0d9krr50wzd3hf3")) + (modules '((guix build utils))))) + (build-system gnu-build-system) + (inputs `(("acl" ,acl) + ("coreutils" ,coreutils) + ("libblkid" ,util-linux) + ("libext2fs" ,e2fsprogs) + ("libuuid" ,util-linux) + ("lzo" ,lzo) + ("zlib" ,zlib))) + (native-inputs `(("pkg-config" ,pkg-config))) + (arguments + '(#:make-flags + (list "CC=gcc" (string-append "prefix=" %output)) + #:phases (alist-replace + 'configure + (lambda* (#:key outputs #:allow-other-keys) + (setenv "CONFIG_SHELL" (which "sh")) + + (let ((out (assoc-ref outputs "out"))) + ;; The 'configure' script + ;; doesn't recognize things like '--enable-fast-install'. + (zero? (system* "./configure" + "--disable-documentation" + (string-append "--prefix=" out))))) + %standard-phases) + #:tests? #f)) + (home-page "http://btrfs.wiki.kernel.org/") + (synopsis "Checksumming Copy on Write Filesystem utilities") + (description + "Btrfs is a new copy on write filesystem for Linux aimed at implementing + advanced features while focusing on fault tolerance, repair and easy + administration.") + (license gpl2+))) diff --git a/gnu/system.scm b/gnu/system.scm index be6b1ac..f7093e7 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -355,6 +355,7 @@ explicitly appear in OS." kmod eudev e2fsprogs kbd + btrfs-progs bash-completion -- 2.5.0