From a87f6bd7d0259024c8f8307e16e311508202380d Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 10 Apr 2014 21:44:59 +0200
Subject: gnu: qemu: Remove 'qemu-with-multiple-smb-shares' package.

* gnu/packages/qemu.scm (qemu/smb-shares): Remove.
* gnu/packages/patches/qemu-multiple-smb-shares.patch: Remove.
* gnu-system.am (dist_patch_DATA): Adjust accordingly.
---
 gnu/packages/patches/qemu-multiple-smb-shares.patch | 20 --------------------
 gnu/packages/qemu.scm                               | 13 -------------
 2 files changed, 33 deletions(-)
 delete mode 100644 gnu/packages/patches/qemu-multiple-smb-shares.patch

(limited to 'gnu')

diff --git a/gnu/packages/patches/qemu-multiple-smb-shares.patch b/gnu/packages/patches/qemu-multiple-smb-shares.patch
deleted file mode 100644
index 8e3c6ffe1c..0000000000
--- a/gnu/packages/patches/qemu-multiple-smb-shares.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-This file extends `-smb' to add a share for the Nix store, and changes
-the name of the default share.
-
---- a/net/slirp.c
-+++ b/net/slirp.c
-@@ -515,8 +515,12 @@ static int slirp_smb(SlirpState* s, const char *exported_dir,
-             "log file=%s/log.smbd\n"
-             "smb passwd file=%s/smbpasswd\n"
-             "security = share\n"
--            "[qemu]\n"
--            "path=%s\n"
-+            "[store]\n"
-+            "path=/gnu/store\n"
-+            "read only=yes\n"
-+            "guest ok=yes\n"
-+            "[xchg]\n"
-+            "path=%s/xchg\n"
-             "read only=no\n"
-             "guest ok=yes\n",
-             s->smb_dir,
diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm
index 4567373aa9..b02998392e 100644
--- a/gnu/packages/qemu.scm
+++ b/gnu/packages/qemu.scm
@@ -132,19 +132,6 @@ server and embedded PowerPC, and S390 guests.")
     ;; Many files are GPLv2+, but some are GPLv2-only---e.g., `memory.c'.
     (license gpl2)))
 
-(define-public qemu/smb-shares
-  ;; A patched QEMU where `-net smb' yields two shares instead of one: one for
-  ;; the store, and another one for exchanges with the host.
-
-  ;; TODO: Use 9p/-virtfs instead of this SMB hack:
-  ;; <http://wiki.qemu.org/Documentation/9psetup>.
-  (package (inherit qemu-headless)
-    (name "qemu-with-multiple-smb-shares")
-    (source (origin (inherit (package-source qemu-headless))
-              (patches
-               (cons (search-patch "qemu-multiple-smb-shares.patch")
-                     (origin-patches (package-source qemu-headless))))))))
-
 (define-public qemu
   ;; QEMU with GUI support.
   (package (inherit qemu-headless)
-- 
cgit v1.2.3