Update btrfs-progs once again and add static output

Update btrfs-progs once again and add static output

[Tobias Geerinckx-Rice]

Hullo Guix,

Some simple patches to add a ‘static’ output to the btrfs-progs
package, containing statically linked versions of all the tools.

It's an eventual requirement for btrfs multi-device root support (the
initrd needs to ‘btrfs scan’), but even without that I like to keep
a copy of the static binaries around Just In Case. It would be nice
if Guix could take care of them.

The static versions are all suffixed with ‘.static’ by upstream, so
no collisions & no ugly renaming.

Together with the util-linux:static dependency, this adds some 18 (!)
MiB of binaries—but unless I'm horribly mistaken they should never be
installed by default, right? The overhead in build time is negligible.

Kind regards,

T G-R

[PATCH 1/3] gnu: btrfs-progs: Update to 4.5.1.

[Tobias Geerinckx-Rice]

* gnu/packages/linux.scm (btrfs-progs): Update to 4.5.1.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 3a4c9f1..917a4d2 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2487,7 +2487,7 @@ and copy/paste text in the console and in xterm.")
 (define-public btrfs-progs
   (package
     (name "btrfs-progs")
-    (version "4.4.1")
+    (version "4.5.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kernel.org/linux/kernel/"
@@ -2495,7 +2495,7 @@ and copy/paste text in the console and in xterm.")
                                   "btrfs-progs-v" version ".tar.xz"))
               (sha256
                (base32
-                "1z5882zx9jx02vyg067siws0irsl8pg37myx17hr4imn9ypf6r4r"))))
+                "1znf2zhb56zbmdjk3lq107678xwsqwc5gczspypmc5i31qnppy7f"))))
     (build-system gnu-build-system)
     (arguments
      '(#:test-target "test"
-- 
2.7.0

Re: [PATCH 1/3] gnu: btrfs-progs: Update to 4.5.1.

[Leo Famulari]

On Sat, Apr 02, 2016 at 03:29:32PM +0200, Tobias Geerinckx-Rice wrote:
> * gnu/packages/linux.scm (btrfs-progs): Update to 4.5.1.

Thanks, looks good!

> ---
>  gnu/packages/linux.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
> index 3a4c9f1..917a4d2 100644
> --- a/gnu/packages/linux.scm
> +++ b/gnu/packages/linux.scm
> @@ -2487,7 +2487,7 @@ and copy/paste text in the console and in xterm.")
>  (define-public btrfs-progs
>    (package
>      (name "btrfs-progs")
> -    (version "4.4.1")
> +    (version "4.5.1")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append "mirror://kernel.org/linux/kernel/"
> @@ -2495,7 +2495,7 @@ and copy/paste text in the console and in xterm.")
>                                    "btrfs-progs-v" version ".tar.xz"))
>                (sha256
>                 (base32
> -                "1z5882zx9jx02vyg067siws0irsl8pg37myx17hr4imn9ypf6r4r"))))
> +                "1znf2zhb56zbmdjk3lq107678xwsqwc5gczspypmc5i31qnppy7f"))))
>      (build-system gnu-build-system)
>      (arguments
>       '(#:test-target "test"
> -- 
> 2.7.0
> 
> 

[PATCH 2/3] gnu: util-linux: Add "static" output.

[Tobias Geerinckx-Rice]

* gnu/packages/linux.scm: (util-linux)[outputs]: New field.
  [arguments]: Remove "--disable-static" configure flag.
  Add 'move-static-libraries phase.
---
 gnu/packages/linux.scm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 917a4d2..0260b0e 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -464,12 +464,11 @@ providing the system administrator with some help in common tasks.")
                     (("build_kill=yes") "build_kill=no"))
                   #t))))
     (build-system gnu-build-system)
+    (outputs '("out"           ; everything
+               "static"))      ; >2 MiB of static .a libraries
     (arguments
      `(#:configure-flags (list "--disable-use-tty-group"
 
-                               ;; Do not build .a files to save 2 MiB.
-                               "--disable-static"
-
                                ;; Install completions where our
                                ;; bash-completion package expects them.
                                (string-append "--with-bashcompletiondir="
@@ -494,6 +493,17 @@ providing the system administrator with some help in common tasks.")
                        (substitute* "tests/ts/misc/mcookie"
                          (("/etc/services")
                           (string-append net "/etc/services")))
+                       #t)))
+                  (add-after
+                   'install 'move-static-libraries
+                   (lambda* (#:key outputs #:allow-other-keys)
+                     (let ((out    (assoc-ref outputs "out"))
+                           (static (assoc-ref outputs "static")))
+                       (mkdir-p (string-append static "/lib"))
+                       (with-directory-excursion out
+                         (for-each (lambda (f)
+                                     (rename-file f (string-append static "/" f)))
+                                   (find-files "lib" "\\.a$")))
                        #t))))))
     (inputs `(("zlib" ,zlib)
               ("ncurses" ,ncurses)))
-- 
2.7.0

Re: [PATCH 2/3] gnu: util-linux: Add "static" output.

[Leo Famulari]

On Sat, Apr 02, 2016 at 03:29:33PM +0200, Tobias Geerinckx-Rice wrote:
> * gnu/packages/linux.scm: (util-linux)[outputs]: New field.
>   [arguments]: Remove "--disable-static" configure flag.
>   Add 'move-static-libraries phase.

Cool, it's always interesting to see how someone else implements the
same change as you :)

> ---
>  gnu/packages/linux.scm | 16 +++++++++++++---
>  1 file changed, 13 insertions(+), 3 deletions(-)
> 
> diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
> index 917a4d2..0260b0e 100644
> --- a/gnu/packages/linux.scm
> +++ b/gnu/packages/linux.scm
> @@ -464,12 +464,11 @@ providing the system administrator with some help in common tasks.")
>                      (("build_kill=yes") "build_kill=no"))
>                    #t))))
>      (build-system gnu-build-system)
> +    (outputs '("out"           ; everything

"out" is not everything, since it doesn't include the static libraries.
How about just leaving "out" unlabeled? Or putting it 2nd in the list,
and labelling it "everything else"?

> +               "static"))      ; >2 MiB of static .a libraries
>      (arguments
>       `(#:configure-flags (list "--disable-use-tty-group"
>  
> -                               ;; Do not build .a files to save 2 MiB.
> -                               "--disable-static"
> -
>                                 ;; Install completions where our
>                                 ;; bash-completion package expects them.
>                                 (string-append "--with-bashcompletiondir="
> @@ -494,6 +493,17 @@ providing the system administrator with some help in common tasks.")
>                         (substitute* "tests/ts/misc/mcookie"
>                           (("/etc/services")
>                            (string-append net "/etc/services")))
> +                       #t)))
> +                  (add-after
> +                   'install 'move-static-libraries
> +                   (lambda* (#:key outputs #:allow-other-keys)
> +                     (let ((out    (assoc-ref outputs "out"))
> +                           (static (assoc-ref outputs "static")))
> +                       (mkdir-p (string-append static "/lib"))
> +                       (with-directory-excursion out
> +                         (for-each (lambda (f)
> +                                     (rename-file f (string-append static "/" f)))
> +                                   (find-files "lib" "\\.a$")))

How about using something like "file" instead of "f", just to help the
Scheme neophytes get their bearings while reading the code? ;)

>                         #t))))))
>      (inputs `(("zlib" ,zlib)
>                ("ncurses" ,ncurses)))
> -- 
> 2.7.0
> 
> 

Re: [PATCH 2/3] gnu: util-linux: Add "static" output.

[Leo Famulari]

On Sat, Apr 02, 2016 at 03:29:33PM +0200, Tobias Geerinckx-Rice wrote:
> * gnu/packages/linux.scm: (util-linux)[outputs]: New field.
>   [arguments]: Remove "--disable-static" configure flag.
>   Add 'move-static-libraries phase.
> ---
>  gnu/packages/linux.scm | 16 +++++++++++++---
>  1 file changed, 13 insertions(+), 3 deletions(-)
> 
> diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
> index 917a4d2..0260b0e 100644
> --- a/gnu/packages/linux.scm
> +++ b/gnu/packages/linux.scm
> @@ -464,12 +464,11 @@ providing the system administrator with some help in common tasks.")
>                      (("build_kill=yes") "build_kill=no"))
>                    #t))))
>      (build-system gnu-build-system)
> +    (outputs '("out"           ; everything
> +               "static"))      ; >2 MiB of static .a libraries
>      (arguments
>       `(#:configure-flags (list "--disable-use-tty-group"
>  
> -                               ;; Do not build .a files to save 2 MiB.
> -                               "--disable-static"
> -
>                                 ;; Install completions where our
>                                 ;; bash-completion package expects them.
>                                 (string-append "--with-bashcompletiondir="
> @@ -494,6 +493,17 @@ providing the system administrator with some help in common tasks.")
>                         (substitute* "tests/ts/misc/mcookie"
>                           (("/etc/services")
>                            (string-append net "/etc/services")))
> +                       #t)))
> +                  (add-after
> +                   'install 'move-static-libraries

How about calling the phase 'install-static' as in your btrfs-progs
patch?

> +                   (lambda* (#:key outputs #:allow-other-keys)
> +                     (let ((out    (assoc-ref outputs "out"))
> +                           (static (assoc-ref outputs "static")))
> +                       (mkdir-p (string-append static "/lib"))
> +                       (with-directory-excursion out
> +                         (for-each (lambda (f)
> +                                     (rename-file f (string-append static "/" f)))
> +                                   (find-files "lib" "\\.a$")))
>                         #t))))))
>      (inputs `(("zlib" ,zlib)
>                ("ncurses" ,ncurses)))
> -- 
> 2.7.0
> 
> 

Re: [PATCH 2/3] gnu: util-linux: Add "static" output.

[Tobias Geerinckx-Rice]

[-- Attachment #1.1: Type: text/plain, Size: 814 bytes --]

Hullo Leo,

Thanks, as always, for the review!

On 03/04/16 02:53, Leo Famulari wrote:
> On Sat, Apr 02, 2016 at 03:29:33PM +0200, Tobias Geerinckx-Rice wrote:
>> +                  (add-after
>> +                   'install 'move-static-libraries
> 
> How about calling the phase 'install-static' as in your btrfs-progs
> patch?

The two phases do subtly (?) different things. INSTALL-STATIC calls an
additional ‘make install-static’ target that wouldn't be run otherwise.
MOVE-STATIC-LIBRARIES moves some static files already installed to OUT
by the default 'install phase to a different output, STATIC.

I don't think drawing explicit parallels between the two (by choosing
identical names) makes anything any clearer, but have no strong feelings
either way.

Kind regards,

T G-R


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

Re: [PATCH 2/3] gnu: util-linux: Add "static" output.

[Leo Famulari]

On Sun, Apr 03, 2016 at 08:29:22PM +0200, Tobias Geerinckx-Rice wrote:
> Hullo Leo,
> 
> Thanks, as always, for the review!
> 
> On 03/04/16 02:53, Leo Famulari wrote:
> > On Sat, Apr 02, 2016 at 03:29:33PM +0200, Tobias Geerinckx-Rice wrote:
> >> +                  (add-after
> >> +                   'install 'move-static-libraries
> > 
> > How about calling the phase 'install-static' as in your btrfs-progs
> > patch?
> 
> The two phases do subtly (?) different things. INSTALL-STATIC calls an
> additional ‘make install-static’ target that wouldn't be run otherwise.
> MOVE-STATIC-LIBRARIES moves some static files already installed to OUT
> by the default 'install phase to a different output, STATIC.
> 
> I don't think drawing explicit parallels between the two (by choosing
> identical names) makes anything any clearer, but have no strong feelings
> either way.

Okay, that makes sense.

> 
> Kind regards,
> 
> T G-R
> 

Re: [PATCH 2/3] gnu: util-linux: Add "static" output.

[Thompson, David]

Leo, I had to revert this patch as it caused a rebuild of over 700
packages.  We should target core-updates instead.

Building the following 358 packages would ensure 737 dependent
packages are rebuilt: smproxy-1.0.6 xinit-1.3.4 lsh-2.1 xkill-1.0.4
xrdb-1.1.0 xsetroot-1.1.1 x11perf-1.6.0 xhost-1.0.7 wmctrl-1.07
windowmaker-0.95.6 wmnd-0.4.17 wmclock-1.0.16 wmcpuload-1.0.1
xboing-2.4 xkbutils-1.0.4 clusterssh-3.28 guix-0.10.0-0.7611
skribilo-0.9.3 emacs-w3m-1.4.538+0.20141022 hydra-20150407.4c0e3e4
libstdc++-doc-5.3.0 libstdc++-doc-4.9.3 singular-4.0.3 xwd-1.0.6
xosd-2.2.14 xeyes-1.0.1 assword-0.8 shroud-0.1.1 xlockmore-5.46
tvtime-1.0.2 r-dt-0.1 r-ztable-0.1.5 r-servr-0.2 r-doparallel-1.0.10
r-lattice-0.20-33 r-dplyr-0.4.3 r-devtools-1.10.0 r-plotly-2.0.3
r-rmarkdown-0.8.1 python2-rpy2-2.7.6 python-rpy2-2.7.6 r-pracma-1.8.8
r-adaptivesparsity-1.4 rsem-1.2.20 r-dnacopy-1.44.0 r-qtl-1.38-4
r-acsnminer-0.15.11 r-org-dm-eg-db-3.2.3 r-org-hs-eg-db-3.2.3
r-org-mm-eg-db-3.2.3 r-org-ce-eg-db-3.2.3
r-bsgenome-celegans-ucsc-ce6-1.4.0 r-motifrg-1.14.0
r-bsgenome-dmelanogaster-ucsc-dm3-1.4.0
r-bsgenome-mmusculus-ucsc-mm9-1.4.0 r-variantannotation-1.16.4
r-genomation-1.2.2 r-topgo-2.22.0 ratpoison-1.4.8 plotutils-2.6
procmail-3.22 links-2.12 xpdf-3.04 a2ps-4.14 xboard-4.8.0 fvwm-2.6.5
sawfish-1.11 pidgin-otr-4.0.2 ruby-atoulme-antwrap-0.7.5 htsjdk-1.129
icedtea-1.13.10 fluxbox-1.3.7 sxiv-1.3.2 openbox-3.6.1 scrot-0.8
feh-2.14.1 gkrellm-2.3.5 emacs-no-x-toolkit-24.5
guile-toxcore-0.1-6a9fbe0 i3-wm-4.12 colordiff-1.0.16 perf-4.5.1
taskwarrior-2.4.3 mu-0.9.13 qemu-minimal-2.5.0 password-store-1.6.5
node-5.10.0 man-db-2.7.1 aegis-4.24 extundelete-0.2.4 zerofree-1.0.3
ripperx-2.8.0 abcde-2.7.1 orpheus-1.6 emms-4.0 mpc123-0.2.4 xmp-4.0.10
mdadm-3.3.2 libcanberra-gtk2-0.30 wmbattery-2.50 xdriinfo-1.0.5
xf86-video-r128-6.10.1 xf86-video-cirrus-1.5.3 xf86-input-mouse-1.9.1
xf86-input-joystick-1.6.2 xf86-video-mach64-6.9.5
xf86-video-voodoo-1.2.5 xf86-video-sis-0.10.8 xf86-video-savage-2.3.8
xf86-input-evdev-2.10.1 xf86-video-vesa-2.3.4 xf86-video-tga-1.2.2
xf86-video-sunffb-1.2.2 xf86-video-nouveau-1.0.12 xf86-video-ark-0.7.5
xf86-video-glint-1.2.8 xf86-video-neomagic-1.2.9
xf86-input-synaptics-1.8.3 xf86-video-openchrome-0.3.3
xf86-video-ati-7.6.1 xf86-input-keyboard-1.8.1 xf86-video-fbdev-0.4.4
xf86-video-siliconmotion-1.7.8 xf86-video-suncg6-1.1.2
xf86-video-i128-1.3.6 xf86-video-trident-1.3.7 xf86-video-nv-2.1.20
xf86-video-modesetting-0.9.0 xf86-input-void-1.4.1
xf86-video-geode-2.11.18 xf86-video-mga-1.6.4
xf86-video-intel-2.99.917-1-d167280 xf86-video-vmware-13.1.0
xf86-video-tdfx-1.4.6 scribus-1.5.1 python-pyqt-5.5
owncloud-client-2.1.1 lxqt-session-0.9.0 lxqt-common-0.9.1
quassel-0.12.3 gpsbabel-1.5.2 tiled-0.15.1 librecad-2.0.9
fritzing-0.9.2b gecode-4.4.0 pumpa-0.9.2 frescobaldi-2.18.2
keepassx-2.0.2 wine-1.9.4 vtk-6.1.0 sdl2-ttf-2.0.14 sdl2-mixer-2.0.1
gst-plugins-ugly-1.8.0 sdl-gfx-2.0.24 qemu-2.5.0 agg-2.5 fizmo-0.7.9
gzochi-0.9 desmume-0.9.11 mplayer-1.3.0 pianobar-2015.11.22
mpd-0.19.14 gst-libav-1.8.0 guile-gnunet-0.0.383eac2 slim-1.3.6
asymptote-2.35 sdl2-image-2.0.1 wesnoth-1.12.4 gourmet-0.17.4
calibre-2.51.0 raincat-1.1.1.3 guile-sly-0.1 xscreensaver-5.34
wxmaxima-15.04.0 python-h5py-2.6.0 python-numexpr-2.4.4
python-biopython-1.66 python-ipython-3.2.1 python-statsmodels-0.6.1
python-scikit-image-0.11.3 python-scikit-learn-0.16.1
python-seaborn-0.5.1 idr-2.0.0 python2-numexpr-2.4.4
python2-ipython-3.2.1 python2-scikit-image-0.11.3
python2-statsmodels-0.6.1 enblend-enfuse-4.1.3 rseqc-2.6.1
seqmagick-0.6.1 grit-2.0.2 macs-2.1.0.20151222 crossmap-0.2.1
pbtranscript-tofu-2.2.3.8f5467fe6 pepr-1.0.9 python2-seaborn-0.5.1
miso-0.5.3 couger-1.8.2 python2-warpedlmm-0.21 pyicoteo-2.0.7
deeptools-2.1.1 clipper-0.3.0 mate-icon-theme-1.12.0 gmtp-1.3.10
tuxguitar-1.2 conkeror-1.0pre1.20150730 lablgtk-2.18.3
inklingreader-0.8 gxmessage-3.4.3 zathura-djvu-0.2.4 zathura-cb-0.1.4
zathura-ps-0.2.2 zathura-pdf-poppler-0.2.5 pspp-0.10.1 pavucontrol-3.0
gnunet-gtk-0.10.1 baobab-3.18.1 libmateweather-1.12.1
mate-desktop-1.12.1 byzanz-0.2-1.f7af3a5 gnome-screenshot-3.18.0
vte-0.36.5 gnome-sudoku-3.18.2 gsegrafix-1.0.6 gnumeric-1.12.24
gnome-mines-3.18.2 aisleriot-3.18.2 d-feet-0.3.10 gnucash-2.6.12
devhelp-3.18.1 libzapojit-0.0.3 hexchat-2.12.0 claws-mail-3.13.2
ibus-libpinyin-1.7.2 ibus-anthy-1.5.8 file-roller-3.16.4 tilda-1.3.1
gtk-vnc-0.5.4 gnome-klotski-3.18.2 dconf-editor-3.18.2 seahorse-3.18.0
pioneers-15.3 sfxr-1.2.1 fcitx-4.2.8.6 hop-2.4.0 proof-general-4.2
emacs-undo-tree-0.6.4 emacs-popup-0.5.3 emacs-slime-2.15
emacs-constants-2.2 emacs-mit-scheme-doc-20140203 emacs-auctex-11.88.6
emacs-god-mode-20151005.925.1-6cf0807b6
emacs-scheme-complete-20151223.9b5cf224 emacs-butler-0.2.4
emacs-debbugs-0.9 emacs-flycheck-0.23 magit-svn-2.1.1
emacs-ob-ipython-20150704.8807064693 emacs-typo-1.1
guile-emacs-20150512.41120e0 transmission-2.84 abiword-3.0.1
maim-3.4.47 libreoffice-5.0.5.2 brdf-explorer-17 pinball-0.3.1
gnujump-1.0.8 extremetuxracer-0.6.0 mupen64plus-video-z64-2.0.0
mupen64plus-rsp-z64-2.0.0 dosbox-0.74.svn3947 gnubg-1.02 pingus-0.7.6
nestopia-ue-1.46.2 emulation-station-2.0.1
mupen64plus-video-arachnoid-2.0.0 minetest-0.4.13
mupen64plus-ui-console-2.5 gnubik-2.4.2 manaplus-1.6.3.12
aseprite-1.1.1 love-0.10.0 gmsh-2.11.0 flann-1.8.4 shogun-4.0.0
giac-xcas-1.2.2-37 dolphin-emu-4.0.2 retroarch-1.3.1
mars-0.7.5.1.c855d04409 polkit-qt-1-0.112.0 simple-scan-3.19.91
xfce-4.12.0 geda-gaf-1.8.2 btrfs-progs-4.5.1 attic-0.16 borg-1.0.1
python2-llfuse-1.0 sshfs-fuse-2.5 unionfs-fuse-0.26 fuse-exfat-1.1.0
sra-tools-2.5.7 kodi-16.0 artanis-0.1.2 gvfs-1.26.2
bitcoin-core-0.11.2 emotion-generic-players-1.17.0
evas-generic-loaders-1.17.0 rage-0.1.4 enlightenment-0.20.6
python2-efl-1.16.0 python-efl-1.16.0 terminology-0.9.1 fdisk-2.0.0a
recutils-1.7 cryptsetup-1.6.1 patches-0.0.26d7dbc
notmuch-addrlookup-c-7 libchop-0.5.2 duplicity-0.6.26 avidemux-2.6.10
obs-0.13.2 synfigstudio-1.0.2 non-sequencer-1.9.5-1d9bd576
zynaddsubfx-2.5.3 bristol-0.60.11 gtklick-0.6.4 pd-0.45.4
milkytracker-0.90.86 cmus-2.7.1 yoshimi-1.3.8.2 setbfree-0.8.0
qtractor-0.7.5 shotwell-0.22.0 rhythmbox-3.2.1 gnome-3.18.3 gamine-1.4
blender-2.76b guitarix-0.34.0 jalv-1.4.6 ardour-4.7 solfege-3.22.2
mpv-0.16.0 xjackfreak-1.0 patchage-1.0.0 rakarrack-0.6.1
alsa-modular-synth-2.1.2 powertabeditor-2.0.0-alpha8 hydrogen-0.9.6.1
vmpk-0.6.2a gst-plugins-bad-1.6.3 qsynth-0.4.1 calf-0.0.60 azr3-1.2.3
audacity-2.1.0 jack2-1.9.10 rottlog-0.72.2 testdisk-6.14

- Dave

[PATCH 3/3] gnu: btrfs-progs: Add "static" output.

[Tobias Geerinckx-Rice]

* gnu/packages/linux.scm (btrfs-progs)[outputs]: New field.
  [inputs]: Add "static" outputs of util-linux for libuuid and libblkid.
  [arguments]: Add 'build-static and 'install-static phases.
---
 gnu/packages/linux.scm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 0260b0e..a3f61c2 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2507,12 +2507,26 @@ and copy/paste text in the console and in xterm.")
                (base32
                 "1znf2zhb56zbmdjk3lq107678xwsqwc5gczspypmc5i31qnppy7f"))))
     (build-system gnu-build-system)
+    (outputs '("out"
+               "static"))      ; static versions of binaries in "out" (~16MiB!)
     (arguments
-     '(#:test-target "test"
+     '(#:phases (modify-phases %standard-phases
+                 (add-after 'build 'build-static
+                   (lambda _ (zero? (system* "make" "static"))))
+                 (add-after 'install 'install-static
+                   (let ((staticbin (string-append (assoc-ref %outputs "static")
+                                                  "/bin")))
+                     (lambda _
+                       (zero? (system* "make"
+                                       (string-append "bindir=" staticbin)
+                                       "install-static"))))))
+       #:test-target "test"
        #:parallel-tests? #f)) ; tests fail when run in parallel
     (inputs `(("e2fsprogs" ,e2fsprogs)
               ("libblkid" ,util-linux)
+              ("libblkid:static" ,util-linux "static")
               ("libuuid" ,util-linux)
+              ("libuuid:static" ,util-linux "static")
               ("zlib" ,zlib)
               ("lzo" ,lzo)))
     (native-inputs `(("pkg-config" ,pkg-config)
-- 
2.7.0

Re: [PATCH 3/3] gnu: btrfs-progs: Add "static" output.

[Leo Famulari]

On Sat, Apr 02, 2016 at 03:29:34PM +0200, Tobias Geerinckx-Rice wrote:
> * gnu/packages/linux.scm (btrfs-progs)[outputs]: New field.
>   [inputs]: Add "static" outputs of util-linux for libuuid and libblkid.
>   [arguments]: Add 'build-static and 'install-static phases.
> ---
>  gnu/packages/linux.scm | 16 +++++++++++++++-
>  1 file changed, 15 insertions(+), 1 deletion(-)
> 
> diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
> index 0260b0e..a3f61c2 100644
> --- a/gnu/packages/linux.scm
> +++ b/gnu/packages/linux.scm
> @@ -2507,12 +2507,26 @@ and copy/paste text in the console and in xterm.")
>                 (base32
>                  "1znf2zhb56zbmdjk3lq107678xwsqwc5gczspypmc5i31qnppy7f"))))
>      (build-system gnu-build-system)
> +    (outputs '("out"
> +               "static"))      ; static versions of binaries in "out" (~16MiB!)
>      (arguments
> -     '(#:test-target "test"
> +     '(#:phases (modify-phases %standard-phases
> +                 (add-after 'build 'build-static
> +                   (lambda _ (zero? (system* "make" "static"))))
> +                 (add-after 'install 'install-static
> +                   (let ((staticbin (string-append (assoc-ref %outputs "static")
> +                                                  "/bin")))
> +                     (lambda _
> +                       (zero? (system* "make"
> +                                       (string-append "bindir=" staticbin)
> +                                       "install-static"))))))
> +       #:test-target "test"
>         #:parallel-tests? #f)) ; tests fail when run in parallel
>      (inputs `(("e2fsprogs" ,e2fsprogs)
>                ("libblkid" ,util-linux)
> +              ("libblkid:static" ,util-linux "static")
>                ("libuuid" ,util-linux)
> +              ("libuuid:static" ,util-linux "static")

I really like giving a descriptive name to uses of "grab-bag" packages
like util-linux. LGTM!

>                ("zlib" ,zlib)
>                ("lzo" ,lzo)))
>      (native-inputs `(("pkg-config" ,pkg-config)
> -- 
> 2.7.0
> 
> 

Re: Update btrfs-progs once again and add static output

[Leo Famulari]

On Sat, Apr 02, 2016 at 03:29:31PM +0200, Tobias Geerinckx-Rice wrote:
> Hullo Guix,
> 
> Some simple patches to add a ‘static’ output to the btrfs-progs
> package, containing statically linked versions of all the tools.
> 
> It's an eventual requirement for btrfs multi-device root support (the
> initrd needs to ‘btrfs scan’), but even without that I like to keep
> a copy of the static binaries around Just In Case. It would be nice
> if Guix could take care of them.

Thanks for working on this!

> The static versions are all suffixed with ‘.static’ by upstream, so
> no collisions & no ugly renaming.
> 
> Together with the util-linux:static dependency, this adds some 18 (!)
> MiB of binaries—but unless I'm horribly mistaken they should never be
> installed by default, right? The overhead in build time is negligible.

They will always be built when building from source, but they will only
be installed (or downloaded from a substitutes server) if the user
requests them specifically.

Re: Update btrfs-progs once again and add static output

[Leo Famulari]

On Sat, Apr 02, 2016 at 03:29:31PM +0200, Tobias Geerinckx-Rice wrote:
> Hullo Guix,
> 
> Some simple patches to add a ‘static’ output to the btrfs-progs
> package, containing statically linked versions of all the tools.

Thanks again for working on this!

I've applied your patches (with some very minor edits to the commit
messages), bringing HEAD to 5f3f3ac2874.

Sorry for the delay!

Re: Update btrfs-progs once again and add static output

[Leo Famulari]

On Mon, Apr 11, 2016 at 08:07:09PM -0400, Leo Famulari wrote:
> On Sat, Apr 02, 2016 at 03:29:31PM +0200, Tobias Geerinckx-Rice wrote:
> > Some simple patches to add a ‘static’ output to the btrfs-progs
> > package, containing statically linked versions of all the tools.
> 
> I've applied your patches (with some very minor edits to the commit
> messages), bringing HEAD to 5f3f3ac2874.

I forgot to check how many packages would be rebuilt by the change to
util-linux: 714.

Should I revert the change and put it on core-updates?

Building the following 344 packages would ensure 714 dependent packages
are rebuilt: xboing-2.4 xwd-1.0.6 xkbutils-1.0.4 clusterssh-3.28
guix-0.10.0-0.7611 skribilo-0.9.3 emacs-w3m-1.4.538+0.20141022
hydra-20150407.4c0e3e4 libstdc++-doc-5.3.0 libstdc++-doc-4.9.3
smproxy-1.0.6 xinit-1.3.4 lsh-2.1 x11perf-1.6.0 xhost-1.0.7 xkill-1.0.4
xsetroot-1.1.1 xrdb-1.1.0 wmctrl-1.07 windowmaker-0.95.6 assword-0.8
shroud-0.1.1 xlockmore-5.46 xeyes-1.0.1 xosd-2.2.14 tvtime-1.0.2
r-ztable-0.1.5 r-lattice-0.20-33 r-dt-0.1 r-servr-0.2
r-doparallel-1.0.10 r-rmarkdown-0.8.1 r-devtools-1.10.0 r-plotly-2.0.3
r-dplyr-0.4.3 python2-rpy2-2.7.6 python-rpy2-2.7.6
r-adaptivesparsity-1.4 rsem-1.2.20 r-qtl-1.38-4 r-dnacopy-1.44.0
r-acsnminer-0.15.11 r-org-ce-eg-db-3.2.3 r-org-dm-eg-db-3.2.3
r-topgo-2.22.0 r-org-hs-eg-db-3.2.3 r-org-mm-eg-db-3.2.3
r-genomicfeatures-1.22.13 r-genomation-1.2.2 ratpoison-1.4.8
plotutils-2.6 procmail-3.22 links-2.12 xpdf-3.04 a2ps-4.14 xboard-4.8.0
fvwm-2.6.5 sawfish-1.11 pidgin-otr-4.0.2 ruby-atoulme-antwrap-0.7.5
htsjdk-1.129 icedtea-1.13.10 fluxbox-1.3.7 sxiv-1.3.2 openbox-3.6.1
scrot-0.8 feh-2.14.1 gkrellm-2.3.5 emacs-no-x-toolkit-24.5 i3-wm-4.12
colordiff-1.0.16 perf-4.5 perf-nonfree-4.0 taskwarrior-2.4.3 mu-0.9.13
qemu-minimal-2.5.0 password-store-1.6.5 node-0.12.7 man-db-2.7.1
python2-llfuse-1.0 attic-0.16 borg-1.0.0 fuse-exfat-1.1.0
unionfs-fuse-0.26 sshfs-fuse-2.5 sra-tools-2.5.7 ripperx-2.8.0
abcde-2.7.1 orpheus-1.6 emms-4.0 mpc123-0.2.4 xmp-4.0.10 mdadm-3.3.2
libcanberra-gtk2-0.30 xdriinfo-1.0.5 xf86-video-vesa-2.3.4
xf86-video-fbdev-0.4.4 xf86-video-ati-7.6.1 xf86-video-mach64-6.9.5
xf86-video-neomagic-1.2.9 xf86-input-joystick-1.6.2
xf86-video-suncg6-1.1.2 xf86-video-siliconmotion-1.7.8
xf86-video-vmware-13.1.0 xf86-video-openchrome-0.3.3
xf86-video-nv-2.1.20 xf86-video-savage-2.3.8 xf86-input-keyboard-1.8.1
xf86-video-trident-1.3.7 xf86-video-i128-1.3.6 xf86-video-glint-1.2.8
xf86-video-tdfx-1.4.6 xf86-video-modesetting-0.9.0
xf86-video-cirrus-1.5.3 xf86-video-sis-0.10.8 xf86-video-geode-2.11.18
xf86-video-mga-1.6.4 xf86-video-ark-0.7.5 xf86-video-nouveau-1.0.12
xf86-input-void-1.4.1 xf86-input-mouse-1.9.1 xf86-video-tga-1.2.2
xf86-video-voodoo-1.2.5 xf86-video-sunffb-1.2.2 xf86-input-evdev-2.10.1
xf86-input-synaptics-1.8.3 xf86-video-r128-6.10.1
xf86-video-intel-2.99.917-1-d167280 frescobaldi-2.18.2 keepassx-2.0.2
kccmp-0.3 scribus-1.5.1 python-pyqt-5.5 pumpa-0.9.2
owncloud-client-2.1.1 lxqt-session-0.9.0 lxqt-common-0.9.1
quassel-0.12.3 gpsbabel-1.5.2 tiled-0.15.1 fritzing-0.9.2b
librecad-2.0.9 wine-1.9.4 vtk-6.1.0 sdl2-ttf-2.0.14 sdl2-mixer-2.0.1
gst-plugins-ugly-1.8.0 sdl-gfx-2.0.24 qemu-2.5.0 agg-2.5 fizmo-0.7.9
gzochi-0.9 desmume-0.9.11 soil-1.0.7 mplayer-1.2.1 pianobar-2015.11.22
mpd-0.19.12 gst-libav-1.6.3 guile-gnunet-0.0.383eac2 slim-1.3.6
asymptote-2.35 sdl2-image-2.0.1 wesnoth-1.12.4 gourmet-0.17.4
calibre-2.51.0 raincat-1.1.1.3 brdf-explorer-17 wxmaxima-15.04.0
python2-ipython-3.2.1 python2-numexpr-2.4.4 enblend-enfuse-4.1.3
libreoffice-5.0.5.2 crossmap-0.2.1 seqmagick-0.6.1 macs-2.1.0.20151222
rseqc-2.6.1 python2-statsmodels-0.6.1 python2-seaborn-0.5.1 pepr-1.0.9
grit-2.0.2 pbtranscript-tofu-2.2.3.8f5467fe6 python2-scikit-image-0.11.3
miso-0.5.3 pyicoteo-2.0.7 python2-warpedlmm-0.21 couger-1.8.2
clipper-0.3.0 deeptools-2.1.1 python-ipython-3.2.1 python-numexpr-2.4.4
python-h5py-2.4.0 python-biopython-1.66 python-statsmodels-0.6.1
python-seaborn-0.5.1 python-scikit-learn-0.16.1
python-scikit-image-0.11.3 idr-2.0.0 mate-icon-theme-1.12.0 gmtp-1.3.10
tuxguitar-1.2 conkeror-1.0pre1.20150730 lablgtk-2.18.3 inklingreader-0.8
gxmessage-3.4.3 zathura-cb-0.1.4 zathura-djvu-0.2.4
zathura-pdf-poppler-0.2.5 zathura-ps-0.2.2 pspp-0.10.1 pavucontrol-3.0
vte-0.36.5 devhelp-3.18.1 libzapojit-0.0.3 hexchat-2.10.1
claws-mail-3.13.2 tilda-1.3.1 gnucash-2.6.12 gtk-vnc-0.5.4
gnumeric-1.12.24 gnome-mines-3.18.2 file-roller-3.16.4 baobab-3.18.1
gnunet-gtk-0.10.1 seahorse-3.18.0 byzanz-0.2-1.f7af3a5
gnome-screenshot-3.18.0 aisleriot-3.18.2 d-feet-0.3.10
mate-desktop-1.12.1 libmateweather-1.12.1 ibus-libpinyin-1.7.2
dconf-editor-3.18.2 gnome-klotski-3.18.2 libchamplain-0.12.12
gsegrafix-1.0.6 pioneers-15.3 sfxr-1.2.1 fcitx-4.2.8.6
guile-emacs-20150512.41120e0 hop-2.4.0 proof-general-4.2
emacs-popup-0.5.3 emacs-mit-scheme-doc-20140203 emacs-slime-2.15
emacs-constants-2.2 emacs-butler-0.2.4 emacs-debbugs-0.9
emacs-god-mode-20151005.925.1-6cf0807b6 emacs-typo-1.1 magit-svn-2.1.1
emacs-flycheck-0.23 emacs-ob-ipython-20150704.8807064693
emacs-scheme-complete-20151223.9b5cf224 emacs-undo-tree-0.6.4
emacs-auctex-11.88.6 transmission-2.84 guile-sly-0.1
mupen64plus-rsp-z64-2.0.0 mupen64plus-video-z64-2.0.0 nestopia-ue-1.46.2
emulation-station-2.0.1 pingus-0.7.6 gnubik-2.4.2 pinball-0.3.1
minetest-0.4.13 gnujump-1.0.8 extremetuxracer-0.6.0 dosbox-0.74.svn3947
mupen64plus-ui-console-2.5 mupen64plus-video-arachnoid-2.0.0 gnubg-1.02
manaplus-1.6.3.12 aseprite-1.1.1 love-0.10.0 gmsh-2.11.0 flann-1.8.4
shogun-4.0.0 retroarch-1.3.1 mars-0.7.5.1.c855d04409 xfce-4.12.0
polkit-qt-1-0.112.0 simple-scan-3.19.91 pcb-20140316 aegis-4.24
extundelete-0.2.4 btrfs-progs-4.4.1 zerofree-1.0.3 tarsnap-1.0.37
kodi-16.0 artanis-0.1.2 gvfs-1.26.2 bitcoin-core-0.11.2
emotion-generic-players-1.17.0 evas-generic-loaders-1.17.0
terminology-0.9.1 python2-efl-1.16.0 python-efl-1.16.0 rage-0.1.4
enlightenment-0.20.6 fdisk-2.0.0a recutils-1.7 cryptsetup-1.6.1
patches-0.0.26d7dbc notmuch-addrlookup-c-7 duplicity-0.6.26
libchop-0.5.2 jack2-1.9.10 avidemux-2.6.10 obs-0.13.2 synfigstudio-1.0.2
milkytracker-0.90.86 setbfree-0.8.0 yoshimi-1.3.8.2 cmus-2.7.1 pd-0.45.4
zynaddsubfx-2.5.3 qtractor-0.7.5 bristol-0.60.11 gtklick-0.6.4
non-sequencer-1.9.5-1d9bd576 shotwell-0.22.0 rhythmbox-3.2.1
gnome-3.18.3 gamine-1.4 blender-2.76b hydrogen-0.9.6.1 rakarrack-0.6.1
azr3-1.2.3 patchage-1.0.0 jalv-1.4.6 solfege-3.22.2
powertabeditor-2.0.0-alpha8 guitarix-0.34.0 xjackfreak-1.0 ardour-4.7
vmpk-0.6.2a gst-plugins-bad-1.6.3 qsynth-0.4.0 calf-0.0.60
alsa-modular-synth-2.1.2 mpv-0.16.0 audacity-2.1.0 testdisk-6.14
rottlog-0.72.2

Re: Update btrfs-progs once again and add static output

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> On Mon, Apr 11, 2016 at 08:07:09PM -0400, Leo Famulari wrote:
>> On Sat, Apr 02, 2016 at 03:29:31PM +0200, Tobias Geerinckx-Rice wrote:
>> > Some simple patches to add a ‘static’ output to the btrfs-progs
>> > package, containing statically linked versions of all the tools.
>> 
>> I've applied your patches (with some very minor edits to the commit
>> messages), bringing HEAD to 5f3f3ac2874.
>
> I forgot to check how many packages would be rebuilt by the change to
> util-linux: 714.
>
> Should I revert the change and put it on core-updates?

That would have been the way to go, yes.

However, at this point I think it’s too late to revert.  Mark?

Ludo’.

Re: Update btrfs-progs once again and add static output

[Thompson, David]

On Thu, Apr 14, 2016 at 12:30 PM, Ludovic Courtès <ludo@gnu.org> wrote:
> Leo Famulari <leo@famulari.name> skribis:
>
>> On Mon, Apr 11, 2016 at 08:07:09PM -0400, Leo Famulari wrote:
>>> On Sat, Apr 02, 2016 at 03:29:31PM +0200, Tobias Geerinckx-Rice wrote:
>>> > Some simple patches to add a ‘static’ output to the btrfs-progs
>>> > package, containing statically linked versions of all the tools.
>>>
>>> I've applied your patches (with some very minor edits to the commit
>>> messages), bringing HEAD to 5f3f3ac2874.
>>
>> I forgot to check how many packages would be rebuilt by the change to
>> util-linux: 714.
>>
>> Should I revert the change and put it on core-updates?
>
> That would have been the way to go, yes.
>
> However, at this point I think it’s too late to revert.  Mark?

I reverted it, as discussed on IRC.

- Dave

Re: Update btrfs-progs once again and add static output

[Leo Famulari]

On Thu, Apr 14, 2016 at 06:30:18PM +0200, Ludovic Courtès wrote:
> Leo Famulari <leo@famulari.name> skribis:
> 
> > On Mon, Apr 11, 2016 at 08:07:09PM -0400, Leo Famulari wrote:
> >> On Sat, Apr 02, 2016 at 03:29:31PM +0200, Tobias Geerinckx-Rice wrote:
> >> > Some simple patches to add a ‘static’ output to the btrfs-progs
> >> > package, containing statically linked versions of all the tools.
> >> 
> >> I've applied your patches (with some very minor edits to the commit
> >> messages), bringing HEAD to 5f3f3ac2874.
> >
> > I forgot to check how many packages would be rebuilt by the change to
> > util-linux: 714.
> >
> > Should I revert the change and put it on core-updates?
> 
> That would have been the way to go, yes.

Okay, thanks to Dave and Mark for doing the necessary reversions.

Hopefully I won't forget to check this again, but if I do it would be
good for me to know what happens when changes are pushed the master
branch on Savannah.

Does hydra start building the changes immediately? If so, and I had
reverted the change, would that have stopped the ongoing build?

Re: Update btrfs-progs once again and add static output

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> On Thu, Apr 14, 2016 at 06:30:18PM +0200, Ludovic Courtès wrote:
>> Leo Famulari <leo@famulari.name> skribis:
>> 
>> > On Mon, Apr 11, 2016 at 08:07:09PM -0400, Leo Famulari wrote:
>> >> On Sat, Apr 02, 2016 at 03:29:31PM +0200, Tobias Geerinckx-Rice wrote:
>> >> > Some simple patches to add a ‘static’ output to the btrfs-progs
>> >> > package, containing statically linked versions of all the tools.
>> >> 
>> >> I've applied your patches (with some very minor edits to the commit
>> >> messages), bringing HEAD to 5f3f3ac2874.
>> >
>> > I forgot to check how many packages would be rebuilt by the change to
>> > util-linux: 714.
>> >
>> > Should I revert the change and put it on core-updates?
>> 
>> That would have been the way to go, yes.
>
> Okay, thanks to Dave and Mark for doing the necessary reversions.
>
> Hopefully I won't forget to check this again, but if I do it would be
> good for me to know what happens when changes are pushed the master
> branch on Savannah.
>
> Does hydra start building the changes immediately? If so, and I had
> reverted the change, would that have stopped the ongoing build?

Hydra picks up the changes “after some time”, it basically polls the Git
repo (though nowadays we often disable automatic polling to reduce load
on the server…)

“Obsolete” builds that are queued have to be stopped explicitly through
the web interface at hydra.gnu.org by one of the authorized people
(currently one of Mark, Andreas, or myself.)

HTH!

Ludo’.

Re: Update btrfs-progs once again and add static output

[Leo Famulari]

On Fri, Apr 15, 2016 at 11:00:10PM +0200, Ludovic Courtès wrote:
> “Obsolete” builds that are queued have to be stopped explicitly through
> the web interface at hydra.gnu.org by one of the authorized people
> (currently one of Mark, Andreas, or myself.)

Thanks for the information!