all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* Adding btrfs-progs
@ 2016-02-10  4:01 tobias.geerinckx.rice
  2016-02-10  4:01 ` [PATCH 1/2] gnu: Add btrfs-progs tobias.geerinckx.rice
                   ` (2 more replies)
  0 siblings, 3 replies; 10+ messages in thread
From: tobias.geerinckx.rice @ 2016-02-10  4:01 UTC (permalink / raw)
  To: guix-devel

Hullo Guix,

Here are two patches adding btrfs-progs to GuixSD and its
installation image, respectively.

Actually booting from btrfs will likely need more changes[1] to
an initrd that I don't yet grok.

Kind regards,

T G-R

[1]: <http://thread.gmane.org/gmane.comp.gnu.guix.devel/12164>,
     although this patch was not based on that one.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH 1/2] gnu: Add btrfs-progs.
  2016-02-10  4:01 Adding btrfs-progs tobias.geerinckx.rice
@ 2016-02-10  4:01 ` tobias.geerinckx.rice
  2016-02-12  2:43   ` Leo Famulari
  2016-02-10  4:01 ` [PATCH 2/2] install: Add btrfs-progs to the image tobias.geerinckx.rice
  2016-02-12  2:41 ` Adding btrfs-progs Leo Famulari
  2 siblings, 1 reply; 10+ messages in thread
From: tobias.geerinckx.rice @ 2016-02-10  4:01 UTC (permalink / raw)
  To: guix-devel

From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>

* gnu/packages/linux.scm (btrfs-progs): New variable.
---
 gnu/packages/linux.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e7f7bcd..33cf534 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
+;;; Copyright © 2016 Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2467,3 +2468,36 @@ write access to exFAT devices.")
 applications running on the Linux console.  It allows users to select items
 and copy/paste text in the console and in xterm.")
     (license license:gpl2+)))
+
+(define-public btrfs-progs
+  (package
+    (name "btrfs-progs")
+    (version "4.4")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://kernel.org/linux/kernel/people/kdave/"
+                          "btrfs-progs/btrfs-progs-v" version ".tar.xz"))
+     (sha256
+      (base32
+       "0jssv1ys4nw2jf7mkp58c19yspaa8ybf48fxsrhhp0683mzpr73p"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:tests? #f))                              ;no test suite
+    (inputs `(("e2fsprogs" ,e2fsprogs)
+              ("libblkid" ,util-linux)
+              ("libuuid" ,util-linux)
+              ("zlib" ,zlib)
+              ("lzo" ,lzo)))
+    (native-inputs `(("pkg-config" ,pkg-config)
+                     ("asciidoc" ,asciidoc)
+                     ("xmlto" ,xmlto)
+                     ("libxml2" ,libxml2)         ;for building documentation
+                     ("docbook-xml" ,docbook-xml)
+                     ("docbook-xsl" ,docbook-xsl)))
+    (home-page "https://btrfs.wiki.kernel.org/")
+    (synopsis "Create and manage btrfs copy-on-write file systems")
+    (description "Btrfs is a copy-on-write (CoW) filesystem for Linux aimed at
+implementing advanced features while focusing on fault tolerance, repair and
+easy administration.")
+    (license license:gpl2+)))
-- 
2.6.3

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCH 2/2] install: Add btrfs-progs to the image.
  2016-02-10  4:01 Adding btrfs-progs tobias.geerinckx.rice
  2016-02-10  4:01 ` [PATCH 1/2] gnu: Add btrfs-progs tobias.geerinckx.rice
@ 2016-02-10  4:01 ` tobias.geerinckx.rice
  2016-02-12  2:44   ` Leo Famulari
  2016-02-12  2:41 ` Adding btrfs-progs Leo Famulari
  2 siblings, 1 reply; 10+ messages in thread
From: tobias.geerinckx.rice @ 2016-02-10  4:01 UTC (permalink / raw)
  To: guix-devel

From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>

* gnu/system/install.scm (installation-os): Add BTRFS-PROGS.
---
 gnu/system/install.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index 0cfc8fa..2838411 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -365,6 +365,7 @@ Use Alt-F2 for documentation.
                      parted ddrescue
                      grub                  ;mostly so xrefs to its manual work
                      cryptsetup
+                     btrfs-progs
                      wireless-tools iw wpa-supplicant-minimal iproute
                      ;; XXX: We used to have GNU fdisk here, but as of version
                      ;; 2.0.0a, that pulls Guile 1.8, which takes unreasonable
-- 
2.6.3

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: Adding btrfs-progs
  2016-02-10  4:01 Adding btrfs-progs tobias.geerinckx.rice
  2016-02-10  4:01 ` [PATCH 1/2] gnu: Add btrfs-progs tobias.geerinckx.rice
  2016-02-10  4:01 ` [PATCH 2/2] install: Add btrfs-progs to the image tobias.geerinckx.rice
@ 2016-02-12  2:41 ` Leo Famulari
  2016-02-12 16:03   ` Tobias Geerinckx-Rice
  2 siblings, 1 reply; 10+ messages in thread
From: Leo Famulari @ 2016-02-12  2:41 UTC (permalink / raw)
  To: tobias.geerinckx.rice; +Cc: guix-devel

On Wed, Feb 10, 2016 at 05:01:45AM +0100, tobias.geerinckx.rice@gmail.com wrote:
> Hullo Guix,
> 
> Here are two patches adding btrfs-progs to GuixSD and its
> installation image, respectively.

Thanks for the patch! Pushed as fc686f9a19.

> 
> Actually booting from btrfs will likely need more changes[1] to
> an initrd that I don't yet grok.
> 
> Kind regards,
> 
> T G-R
> 
> [1]: <http://thread.gmane.org/gmane.comp.gnu.guix.devel/12164>,
>      although this patch was not based on that one.
> 

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 1/2] gnu: Add btrfs-progs.
  2016-02-10  4:01 ` [PATCH 1/2] gnu: Add btrfs-progs tobias.geerinckx.rice
@ 2016-02-12  2:43   ` Leo Famulari
  0 siblings, 0 replies; 10+ messages in thread
From: Leo Famulari @ 2016-02-12  2:43 UTC (permalink / raw)
  To: tobias.geerinckx.rice; +Cc: guix-devel

On Wed, Feb 10, 2016 at 05:01:46AM +0100, tobias.geerinckx.rice@gmail.com wrote:
> From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
> 
> * gnu/packages/linux.scm (btrfs-progs): New variable.

[...]

> +    (arguments
> +     '(#:tests? #f))                              ;no test suite

I altered this to run `make test` and disabled parallel tests because
they failed repeatedly on 002-uuid-rewrite.

> +    (inputs `(("e2fsprogs" ,e2fsprogs)
> +              ("libblkid" ,util-linux)
> +              ("libuuid" ,util-linux)
> +              ("zlib" ,zlib)
> +              ("lzo" ,lzo)))
> +    (native-inputs `(("pkg-config" ,pkg-config)
> +                     ("asciidoc" ,asciidoc)
> +                     ("xmlto" ,xmlto)
> +                     ("libxml2" ,libxml2)         ;for building documentation
> +                     ("docbook-xml" ,docbook-xml)
> +                     ("docbook-xsl" ,docbook-xsl)))
> +    (home-page "https://btrfs.wiki.kernel.org/")
> +    (synopsis "Create and manage btrfs copy-on-write file systems")
> +    (description "Btrfs is a copy-on-write (CoW) filesystem for Linux aimed at
> +implementing advanced features while focusing on fault tolerance, repair and
> +easy administration.")
> +    (license license:gpl2+)))
> -- 
> 2.6.3
> 
> 

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 2/2] install: Add btrfs-progs to the image.
  2016-02-10  4:01 ` [PATCH 2/2] install: Add btrfs-progs to the image tobias.geerinckx.rice
@ 2016-02-12  2:44   ` Leo Famulari
  2016-02-12  9:07     ` Ludovic Courtès
  0 siblings, 1 reply; 10+ messages in thread
From: Leo Famulari @ 2016-02-12  2:44 UTC (permalink / raw)
  To: tobias.geerinckx.rice; +Cc: guix-devel

On Wed, Feb 10, 2016 at 05:01:47AM +0100, tobias.geerinckx.rice@gmail.com wrote:
> From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
> 
> * gnu/system/install.scm (installation-os): Add BTRFS-PROGS.

This adds only a few megabyes to the installation image, with the
benefit of being able to create and inspect btrfs filesystems.

> ---
>  gnu/system/install.scm | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/gnu/system/install.scm b/gnu/system/install.scm
> index 0cfc8fa..2838411 100644
> --- a/gnu/system/install.scm
> +++ b/gnu/system/install.scm
> @@ -365,6 +365,7 @@ Use Alt-F2 for documentation.
>                       parted ddrescue
>                       grub                  ;mostly so xrefs to its manual work
>                       cryptsetup
> +                     btrfs-progs
>                       wireless-tools iw wpa-supplicant-minimal iproute
>                       ;; XXX: We used to have GNU fdisk here, but as of version
>                       ;; 2.0.0a, that pulls Guile 1.8, which takes unreasonable
> -- 
> 2.6.3
> 
> 

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 2/2] install: Add btrfs-progs to the image.
  2016-02-12  2:44   ` Leo Famulari
@ 2016-02-12  9:07     ` Ludovic Courtès
  2016-02-12 21:47       ` Leo Famulari
  0 siblings, 1 reply; 10+ messages in thread
From: Ludovic Courtès @ 2016-02-12  9:07 UTC (permalink / raw)
  To: Leo Famulari; +Cc: guix-devel

Leo Famulari <leo@famulari.name> skribis:

> On Wed, Feb 10, 2016 at 05:01:47AM +0100, tobias.geerinckx.rice@gmail.com wrote:
>> From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
>> 
>> * gnu/system/install.scm (installation-os): Add BTRFS-PROGS.
>
> This adds only a few megabyes to the installation image,

This is measured by running:

  guix size $(guix system build gnu/system/install.scm)

before and after, right?

If so, this looks OK to apply (I let you take care of it.)

Ludo’.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: Adding btrfs-progs
  2016-02-12  2:41 ` Adding btrfs-progs Leo Famulari
@ 2016-02-12 16:03   ` Tobias Geerinckx-Rice
  2016-02-12 22:10     ` Leo Famulari
  0 siblings, 1 reply; 10+ messages in thread
From: Tobias Geerinckx-Rice @ 2016-02-12 16:03 UTC (permalink / raw)
  To: guix-devel

On 12 February 2016 at 03:41, Leo Famulari <leo@famulari.name> wrote:
> Thanks for the patch! Pushed as fc686f9a19.

\o/

> On Wed, Feb 10, 2016 at 05:01:45AM +0100, tobias.geerinckx.rice@gmail.com wrote:
>> [1]: <http://thread.gmane.org/gmane.comp.gnu.guix.devel/12164>,
>>      although this patch was not based on that one.

I should really stop hacking after 4am. For the record: [1], of course.

Kind regards,

T G-R

[1]: http://thread.gmane.org/gmane.comp.gnu.guix.devel/13164

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 2/2] install: Add btrfs-progs to the image.
  2016-02-12  9:07     ` Ludovic Courtès
@ 2016-02-12 21:47       ` Leo Famulari
  0 siblings, 0 replies; 10+ messages in thread
From: Leo Famulari @ 2016-02-12 21:47 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: guix-devel

On Fri, Feb 12, 2016 at 10:07:35AM +0100, Ludovic Courtès wrote:
> Leo Famulari <leo@famulari.name> skribis:
> 
> > On Wed, Feb 10, 2016 at 05:01:47AM +0100, tobias.geerinckx.rice@gmail.com wrote:
> >> From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
> >> 
> >> * gnu/system/install.scm (installation-os): Add BTRFS-PROGS.
> >
> > This adds only a few megabyes to the installation image,
> 
> This is measured by running:
> 
>   guix size $(guix system build gnu/system/install.scm)
> 
> before and after, right?

Indeed, the total increases from 800.1 to 804.8, which I thought was
worth it.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: Adding btrfs-progs
  2016-02-12 16:03   ` Tobias Geerinckx-Rice
@ 2016-02-12 22:10     ` Leo Famulari
  0 siblings, 0 replies; 10+ messages in thread
From: Leo Famulari @ 2016-02-12 22:10 UTC (permalink / raw)
  To: Tobias Geerinckx-Rice; +Cc: guix-devel

On Fri, Feb 12, 2016 at 05:03:16PM +0100, Tobias Geerinckx-Rice wrote:
> On 12 February 2016 at 03:41, Leo Famulari <leo@famulari.name> wrote:
> > Thanks for the patch! Pushed as fc686f9a19.
> 
> \o/
> 
> > On Wed, Feb 10, 2016 at 05:01:45AM +0100, tobias.geerinckx.rice@gmail.com wrote:
> >> [1]: <http://thread.gmane.org/gmane.comp.gnu.guix.devel/12164>,
> >>      although this patch was not based on that one.
> 
> I should really stop hacking after 4am. For the record: [1], of course.
> 
> Kind regards,
> 
> T G-R
> 
> [1]: http://thread.gmane.org/gmane.comp.gnu.guix.devel/13164

Oh, now I get it :)

The INSTALL file in the btrfs-progs source distribution describes the
creation of static versions of btrfs utilities. I'm not an expert on
this stuff but I believe that is what is required in the initrd.

Do you think you could investigate this possibility? It's much easier to
do this stuff on GuixSD since you can always rollback (unless you break
GRUB).

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2016-02-12 22:10 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-10  4:01 Adding btrfs-progs tobias.geerinckx.rice
2016-02-10  4:01 ` [PATCH 1/2] gnu: Add btrfs-progs tobias.geerinckx.rice
2016-02-12  2:43   ` Leo Famulari
2016-02-10  4:01 ` [PATCH 2/2] install: Add btrfs-progs to the image tobias.geerinckx.rice
2016-02-12  2:44   ` Leo Famulari
2016-02-12  9:07     ` Ludovic Courtès
2016-02-12 21:47       ` Leo Famulari
2016-02-12  2:41 ` Adding btrfs-progs Leo Famulari
2016-02-12 16:03   ` Tobias Geerinckx-Rice
2016-02-12 22:10     ` Leo Famulari

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.