[bug#38385] [PATCH 0/2] gnu: qemu: Build with vde2 support.

[bug#38385] [PATCH 0/2] gnu: qemu: Build with vde2 support.

[Diego Nicola Barbato]

Hello Guix,

The following two patches add vde2 (Virtual Distributed Ethernet) and
modify QEMU so that it supports vde netdevs.

The latest release of vde2 (2.3.2) is rather old (from 2011) and there
have been quite a few changes on their github repository (e.g. they
switched from openssl to wolfssl), which might qualify it for an
exception to our rule to use only official releases.  Nevertheless, I
have decided to stick with that old release for now (as do Nix and
Debian), because I haven't been able to package the git version due to
their configure script checking for something which is true for
openssl-1.0 but not wolfssl (even though they've switched to the
latter), which probably hasn't been noticed yet as nobody has tried to
build it in a pure environment until now.

Regards,

Diego

Diego Nicola Barbato (2):
  gnu: Add vde2.
  gnu: qemu: Build with vde2 support.

 gnu/packages/networking.scm     | 30 ++++++++++++++++++++++++++++++
 gnu/packages/virtualization.scm |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

-- 
2.24.0

[bug#38385] [PATCH 1/2] gnu: Add vde2.

[Diego Nicola Barbato]

* gnu/packages/networking.scm (vde2): New variable.
---
 gnu/packages/networking.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 87cabee645..95aca7f9d1 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -2717,3 +2717,33 @@ a service (such as an HTTP or SSH server) on localhost visible to the wider
 Internet, even behind NAT or restrictive firewalls.  A managed front-end relay
 service is available at @url{https://pagekite.net/}, or you can run your own.")
     (license license:agpl3+)))
+
+(define-public vde2
+  (package
+    (name "vde2")
+    (version "2.3.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri "mirror://sourceforge/vde/vde2/2.3.2/vde2-2.3.2.tar.gz")
+       (sha256
+        (base32 "14xga0ib6p1wrv3hkl4sa89yzjxv7f1vfqaxsch87j6scdm59pr2"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:parallel-build? #f))           ; Build fails if #t.
+    (inputs
+     `(("python" ,python)
+       ("libpcap" ,libpcap)
+       ("openssl" ,openssl-1.0)))       ; Build fails with 1.1.
+    (home-page "https://github.com/virtualsquare/vde-2")
+    (synopsis "Virtual Distributed Ethernet")
+    (description "VDE is a set of programs to provide virtual software-defined
+Ethernet network interface controllers across multiple virtual or
+physical, local or remote devices.  The VDE architecture provides
+virtual counterparts to hardware components such as switches and
+cables.")
+    (license (list license:gpl2
+                   license:lgpl2.1       ; libvdeplug
+                   (license:non-copyleft ; slirpvde
+                    "file://COPYING.slirpvde"
+                    "See COPYING.slirpvde in the distribution.")))))
-- 
2.24.0

[bug#38385] [PATCH 2/2] gnu: qemu: Build with vde2 support.

[Diego Nicola Barbato]

* gnu/packages/virtualization.scm (qemu)[inputs]: Add vde2.
---
 gnu/packages/virtualization.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index d9cda7696d..99b2e6623a 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -220,7 +220,7 @@ exec smbd $@")))
        ("spice" ,spice)
        ("usbredir" ,usbredir)
        ("util-linux" ,util-linux)
-       ;; ("vde2" ,vde2)
+       ("vde2" ,vde2)
        ("virglrenderer" ,virglrenderer)
        ("zlib" ,zlib)))
     (native-inputs `(("gettext" ,gettext-minimal)
-- 
2.24.0

[bug#38385] [PATCH v2 0/2] gnu: qemu: Build with vde2 support.

[Diego Nicola Barbato]

Hey Guix,

Here's version 2 of my patch series.

I've added a copyright line to networking.scm and removed vde from
qemu-minimal's inputs.

Regards,

Diego

Diego Nicola Barbato (2):
  gnu: Add vde2.
  gnu: qemu: Build with vde2 support.

 gnu/packages/networking.scm     | 31 +++++++++++++++++++++++++++++++
 gnu/packages/virtualization.scm |  4 ++--
 2 files changed, 33 insertions(+), 2 deletions(-)

-- 
2.24.0

[bug#38385] [PATCH v2 1/2] gnu: Add vde2.

[Diego Nicola Barbato]

* gnu/packages/networking.scm (vde2): New variable.
---
 gnu/packages/networking.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 3ab5e71828..5d5806e31f 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -33,6 +33,7 @@
 ;;; Copyright © 2019 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2019 Tonton <tonton@riseup.net>
 ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
+;;; Copyright © 2019 Diego N. Barbato <dnbarbato@posteo.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2717,3 +2718,33 @@ a service (such as an HTTP or SSH server) on localhost visible to the wider
 Internet, even behind NAT or restrictive firewalls.  A managed front-end relay
 service is available at @url{https://pagekite.net/}, or you can run your own.")
     (license license:agpl3+)))
+
+(define-public vde2
+  (package
+    (name "vde2")
+    (version "2.3.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri "mirror://sourceforge/vde/vde2/2.3.2/vde2-2.3.2.tar.gz")
+       (sha256
+        (base32 "14xga0ib6p1wrv3hkl4sa89yzjxv7f1vfqaxsch87j6scdm59pr2"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:parallel-build? #f))           ; Build fails if #t.
+    (inputs
+     `(("python" ,python)
+       ("libpcap" ,libpcap)
+       ("openssl" ,openssl-1.0)))       ; Build fails with 1.1.
+    (home-page "https://github.com/virtualsquare/vde-2")
+    (synopsis "Virtual Distributed Ethernet")
+    (description "VDE is a set of programs to provide virtual software-defined
+Ethernet network interface controllers across multiple virtual or
+physical, local or remote devices.  The VDE architecture provides
+virtual counterparts to hardware components such as switches and
+cables.")
+    (license (list license:gpl2
+                   license:lgpl2.1       ; libvdeplug
+                   (license:non-copyleft ; slirpvde
+                    "file://COPYING.slirpvde"
+                    "See COPYING.slirpvde in the distribution.")))))
-- 
2.24.0

[bug#38385] [PATCH v2 2/2] gnu: qemu: Build with vde2 support.

[Diego Nicola Barbato]

* gnu/packages/virtualization.scm (qemu)[inputs]: Add vde2.
* gnu/packages/virtualization.scm (qemu-minimal)[inputs]: Remove vde2 from
  inherited inputs.
---
 gnu/packages/virtualization.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index fa7b07e179..3a1b260cbf 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -220,7 +220,7 @@ exec smbd $@")))
        ("spice" ,spice)
        ("usbredir" ,usbredir)
        ("util-linux" ,util-linux)
-       ;; ("vde2" ,vde2)
+       ("vde2" ,vde2)
        ("virglrenderer" ,virglrenderer)
        ("zlib" ,zlib)))
     (native-inputs `(("gettext" ,gettext-minimal)
@@ -268,7 +268,7 @@ server and embedded PowerPC, and S390 guests.")
                   '("gettext")))
     (inputs (fold alist-delete (package-inputs qemu)
                   '("libusb" "mesa" "sdl2" "spice" "virglrenderer" "gtk+"
-                    "usbredir" "libdrm" "libepoxy" "pulseaudio")))))
+                    "usbredir" "libdrm" "libepoxy" "pulseaudio" "vde2")))))
 
 ;; The GRUB test suite fails with later versions of Qemu, so we
 ;; keep it at 2.10 for now.  See
-- 
2.24.0

[bug#38385] [PATCH v3 0/2] gnu: qemu: Build with vde2 support.

[Diego Nicola Barbato]

I've rebased the patches on current master.

Diego Nicola Barbato (2):
  gnu: Add vde2.
  gnu: qemu: Build with vde2 support.

 gnu/packages/networking.scm     | 31 +++++++++++++++++++++++++++++++
 gnu/packages/virtualization.scm |  4 ++--
 2 files changed, 33 insertions(+), 2 deletions(-)

-- 
2.24.0

[bug#38385] [PATCH v3 1/2] gnu: Add vde2.

[Diego Nicola Barbato]

* gnu/packages/networking.scm (vde2): New variable.
---
 gnu/packages/networking.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 05f348ad0f..0a9545c56d 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -35,6 +35,7 @@
 ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
 ;;; Copyright © 2019 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
 ;;; Copyright © 2019 Daniel Schaefer <git@danielschaefer.me>
+;;; Copyright © 2019 Diego N. Barbato <dnbarbato@posteo.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2822,3 +2823,33 @@ to be a teaching tool and presents the subnetting results as
 easy-to-understand binary values.")
     (home-page "http://jodies.de/ipcalc")
     (license license:gpl2+)))
+
+(define-public vde2
+  (package
+    (name "vde2")
+    (version "2.3.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri "mirror://sourceforge/vde/vde2/2.3.2/vde2-2.3.2.tar.gz")
+       (sha256
+        (base32 "14xga0ib6p1wrv3hkl4sa89yzjxv7f1vfqaxsch87j6scdm59pr2"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:parallel-build? #f))           ; Build fails if #t.
+    (inputs
+     `(("python" ,python)
+       ("libpcap" ,libpcap)
+       ("openssl" ,openssl-1.0)))       ; Build fails with 1.1.
+    (home-page "https://github.com/virtualsquare/vde-2")
+    (synopsis "Virtual Distributed Ethernet")
+    (description "VDE is a set of programs to provide virtual software-defined
+Ethernet network interface controllers across multiple virtual or
+physical, local or remote devices.  The VDE architecture provides
+virtual counterparts to hardware components such as switches and
+cables.")
+    (license (list license:gpl2
+                   license:lgpl2.1       ; libvdeplug
+                   (license:non-copyleft ; slirpvde
+                    "file://COPYING.slirpvde"
+                    "See COPYING.slirpvde in the distribution.")))))
-- 
2.24.0

[bug#38385] [PATCH v3 2/2] gnu: qemu: Build with vde2 support.

[Diego Nicola Barbato]

* gnu/packages/virtualization.scm (qemu)[inputs]: Add vde2.
* gnu/packages/virtualization.scm (qemu-minimal)[inputs]: Remove vde2 from
  inherited inputs.
---
 gnu/packages/virtualization.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index fa7b07e179..3a1b260cbf 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -220,7 +220,7 @@ exec smbd $@")))
        ("spice" ,spice)
        ("usbredir" ,usbredir)
        ("util-linux" ,util-linux)
-       ;; ("vde2" ,vde2)
+       ("vde2" ,vde2)
        ("virglrenderer" ,virglrenderer)
        ("zlib" ,zlib)))
     (native-inputs `(("gettext" ,gettext-minimal)
@@ -268,7 +268,7 @@ server and embedded PowerPC, and S390 guests.")
                   '("gettext")))
     (inputs (fold alist-delete (package-inputs qemu)
                   '("libusb" "mesa" "sdl2" "spice" "virglrenderer" "gtk+"
-                    "usbredir" "libdrm" "libepoxy" "pulseaudio")))))
+                    "usbredir" "libdrm" "libepoxy" "pulseaudio" "vde2")))))
 
 ;; The GRUB test suite fails with later versions of Qemu, so we
 ;; keep it at 2.10 for now.  See
-- 
2.24.0

bug#38385: [PATCH v3 1/2] gnu: Add vde2.

[Ludovic Courtès]

Hi,

Diego Nicola Barbato <dnbarbato@posteo.de> skribis:

> * gnu/packages/networking.scm (vde2): New variable.

[...]

> * gnu/packages/virtualization.scm (qemu)[inputs]: Add vde2.
> * gnu/packages/virtualization.scm (qemu-minimal)[inputs]: Remove vde2 from
>   inherited inputs.

Applied, thanks!

Ludo’.