* [bug#27688] [PATCH 1/2] gnu: Rename (gnu packages qemu) to (gnu packages virtualization).
@ 2017-07-13 11:31 宋文武
2017-07-13 11:31 ` [bug#27682] [PATCH 2/2] gnu: Add lxc 宋文武
2017-07-14 17:01 ` [bug#27688] [PATCH 1/2] gnu: Rename (gnu packages qemu) to (gnu packages virtualization) Marius Bakke
0 siblings, 2 replies; 7+ messages in thread
From: 宋文武 @ 2017-07-13 11:31 UTC (permalink / raw)
To: 27688; +Cc: 宋文武
* gnu/packages/qemu.scm: Rename this ...
* gnu/packages/virtualization.scm: ... to this.
* gnu/local.mk (GNU_SYSTEM_MODULES),
gnu/packages/bootloaders.scm, gnu/packages/debug.scm,
gnu/packages/gnome.scm, gnu/system/vm.scm,
gnu/tests/install.scm: Adjust accordingly.
---
gnu/local.mk | 2 +-
gnu/packages/bootloaders.scm | 2 +-
gnu/packages/debug.scm | 2 +-
gnu/packages/gnome.scm | 2 +-
gnu/packages/{qemu.scm => virtualization.scm} | 2 +-
gnu/system/vm.scm | 2 +-
gnu/tests/install.scm | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
rename gnu/packages/{qemu.scm => virtualization.scm} (99%)
diff --git a/gnu/local.mk b/gnu/local.mk
index 4da9cba27..27b02af4d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -327,7 +327,6 @@ GNU_SYSTEM_MODULES = \
%D%/packages/pv.scm \
%D%/packages/python.scm \
%D%/packages/tryton.scm \
- %D%/packages/qemu.scm \
%D%/packages/qt.scm \
%D%/packages/ragel.scm \
%D%/packages/rails.scm \
@@ -397,6 +396,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/version-control.scm \
%D%/packages/video.scm \
%D%/packages/vim.scm \
+ %D%/packages/virtualization.scm \
%D%/packages/vpn.scm \
%D%/packages/w3m.scm \
%D%/packages/wdiff.scm \
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 9ae617528..802e8ab8d 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -40,8 +40,8 @@
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
#:use-module (gnu packages python)
- #:use-module (gnu packages qemu)
#:use-module (gnu packages texinfo)
+ #:use-module (gnu packages virtualization)
#:use-module (guix build-system gnu)
#:use-module (guix download)
#:use-module (guix git-download)
diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index 27193c8bb..34c106141 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -32,7 +32,7 @@
#:use-module (gnu packages llvm)
#:use-module (gnu packages perl)
#:use-module (gnu packages pretty-print)
- #:use-module (gnu packages qemu)
+ #:use-module (gnu packages virtualization)
#:use-module (ice-9 match)
#:use-module (srfi srfi-1))
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 972f3ec15..02d444317 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -132,8 +132,8 @@
#:use-module (gnu packages samba)
#:use-module (gnu packages readline)
#:use-module (gnu packages fonts)
- #:use-module (gnu packages qemu)
#:use-module (gnu packages speech)
+ #:use-module (gnu packages virtualization)
#:use-module (srfi srfi-1))
(define-public brasero
diff --git a/gnu/packages/qemu.scm b/gnu/packages/virtualization.scm
similarity index 99%
rename from gnu/packages/qemu.scm
rename to gnu/packages/virtualization.scm
index 0bd314c66..79209c300 100644
--- a/gnu/packages/qemu.scm
+++ b/gnu/packages/virtualization.scm
@@ -19,7 +19,7 @@
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
-(define-module (gnu packages qemu)
+(define-module (gnu packages virtualization)
#:use-module (gnu packages)
#:use-module (gnu packages admin)
#:use-module (gnu packages attr)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 66a2448ce..dd9be2c6f 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -39,7 +39,7 @@
#:use-module (gnu packages gawk)
#:use-module (gnu packages bash)
#:use-module (gnu packages less)
- #:use-module (gnu packages qemu)
+ #:use-module (gnu packages virtualization)
#:use-module (gnu packages disk)
#:use-module (gnu packages zile)
#:use-module (gnu packages linux)
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index 7c5d48104..22e4181ab 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -27,8 +27,8 @@
#:use-module ((gnu build vm) #:select (qemu-command))
#:use-module (gnu packages bootloaders)
#:use-module (gnu packages ocr)
- #:use-module (gnu packages qemu)
#:use-module (gnu packages package-management)
+ #:use-module (gnu packages virtualization)
#:use-module (guix store)
#:use-module (guix monads)
#:use-module (guix packages)
--
2.12.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#27682] [PATCH 2/2] gnu: Add lxc.
2017-07-13 11:31 [bug#27688] [PATCH 1/2] gnu: Rename (gnu packages qemu) to (gnu packages virtualization) 宋文武
@ 2017-07-13 11:31 ` 宋文武
2017-07-14 17:09 ` Marius Bakke
2017-07-15 11:20 ` bug#27682: " 宋文武
2017-07-14 17:01 ` [bug#27688] [PATCH 1/2] gnu: Rename (gnu packages qemu) to (gnu packages virtualization) Marius Bakke
1 sibling, 2 replies; 7+ messages in thread
From: 宋文武 @ 2017-07-13 11:31 UTC (permalink / raw)
To: 27682; +Cc: 宋文武
* gnu/packages/virtualization.scm (lxc): New package.
---
gnu/packages/virtualization.scm | 47 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 79209c300..25abaaa88 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -42,6 +42,7 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages polkit)
#:use-module (gnu packages python)
+ #:use-module (gnu packages selinux)
#:use-module (gnu packages sdl)
#:use-module (gnu packages spice)
#:use-module (gnu packages texinfo)
@@ -266,6 +267,52 @@ all common programming languages. Vala bindings are also provided.")
;; files in the "tools" directory are released under GPLv2+.
(license (list lgpl2.1+ gpl2+))))
+(define-public lxc
+ (package
+ (name "lxc")
+ (version "2.0.8")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://linuxcontainers.org/downloads/lxc/lxc-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "15449r56rqg3487kzsnfvz0w4p5ajrq0krcsdh6c9r6g0ark93hd"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("gnutls" ,gnutls)
+ ("libcap" ,libcap)
+ ("libseccomp" ,libseccomp)
+ ("libselinux" ,libselinux)))
+ (arguments
+ '(#:configure-flags
+ '("--sysconfdir=/etc"
+ "--localstatedir=/var")
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bashcompdir (string-append out "/etc/bash_completion.d")))
+ (zero? (system*
+ "make" "install"
+ (string-append "bashcompdir=" bashcompdir)
+ ;; Thoses files will be handled by system services.
+ "LXCPATH=/tmp/var/lib/lxc"
+ "localstatedir=/tmp/var"
+ "sysconfdir=/tmp/etc"
+ "sysconfigdir=/tmp/etc/default"))))))))
+ (synopsis "Linux container tools")
+ (home-page "https://linuxcontainers.org/")
+ (description
+ "LXC is a userspace interface for the Linux kernel containment features.
+Through a powerful API and simple tools, it lets Linux users easily create and
+manage system or application containers.")
+ (license lgpl2.1+)))
+
(define-public libvirt
(package
(name "libvirt")
--
2.12.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#27682] [PATCH 2/2] gnu: Add lxc.
2017-07-13 11:31 ` [bug#27682] [PATCH 2/2] gnu: Add lxc 宋文武
@ 2017-07-14 17:09 ` Marius Bakke
2017-07-15 10:58 ` 宋文武
2017-07-15 11:20 ` bug#27682: " 宋文武
1 sibling, 1 reply; 7+ messages in thread
From: Marius Bakke @ 2017-07-14 17:09 UTC (permalink / raw)
To: 宋文武, 27682
[-- Attachment #1: Type: text/plain, Size: 1205 bytes --]
宋文武 <iyzsong@member.fsf.org> writes:
> * gnu/packages/virtualization.scm (lxc): New package.
Thanks!
[...]
> + (arguments
> + '(#:configure-flags
> + '("--sysconfdir=/etc"
> + "--localstatedir=/var")
> + #:phases
> + (modify-phases %standard-phases
> + (replace 'install
> + (lambda* (#:key outputs #:allow-other-keys)
> + (let* ((out (assoc-ref outputs "out"))
> + (bashcompdir (string-append out "/etc/bash_completion.d")))
> + (zero? (system*
> + "make" "install"
> + (string-append "bashcompdir=" bashcompdir)
> + ;; Thoses files will be handled by system services.
> + "LXCPATH=/tmp/var/lib/lxc"
> + "localstatedir=/tmp/var"
> + "sysconfdir=/tmp/etc"
> + "sysconfigdir=/tmp/etc/default"))))))))
If these are not important, why not set them to $out/etc, $out/var and
so on? /tmp seems like a dangerous default to me, since any unprivileged
user can populate these directories.
LGTM apart from that.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* [bug#27682] [PATCH 2/2] gnu: Add lxc.
2017-07-14 17:09 ` Marius Bakke
@ 2017-07-15 10:58 ` 宋文武
0 siblings, 0 replies; 7+ messages in thread
From: 宋文武 @ 2017-07-15 10:58 UTC (permalink / raw)
To: Marius Bakke; +Cc: 27682
Marius Bakke <mbakke@fastmail.com> writes:
> 宋文武 <iyzsong@member.fsf.org> writes:
>
>> * gnu/packages/virtualization.scm (lxc): New package.
>
> Thanks!
>
> [...]
>
>> + (arguments
>> + '(#:configure-flags
>> + '("--sysconfdir=/etc"
>> + "--localstatedir=/var")
>> + #:phases
>> + (modify-phases %standard-phases
>> + (replace 'install
>> + (lambda* (#:key outputs #:allow-other-keys)
>> + (let* ((out (assoc-ref outputs "out"))
>> + (bashcompdir (string-append out "/etc/bash_completion.d")))
>> + (zero? (system*
>> + "make" "install"
>> + (string-append "bashcompdir=" bashcompdir)
>> + ;; Thoses files will be handled by system services.
>> + "LXCPATH=/tmp/var/lib/lxc"
>> + "localstatedir=/tmp/var"
>> + "sysconfdir=/tmp/etc"
>> + "sysconfigdir=/tmp/etc/default"))))))))
>
> If these are not important, why not set them to $out/etc, $out/var and
> so on? /tmp seems like a dangerous default to me, since any unprivileged
> user can populate these directories.
Those paths are configured to '/var/lib/lxc', '/var' etc. The install
phase drop them to avoid touching system directories in the builder.
The effective paths are still '/var/lib/lxc', owned by root, which will
be handled by lxc-service-type and alike.
^ permalink raw reply [flat|nested] 7+ messages in thread
* bug#27682: [PATCH 2/2] gnu: Add lxc.
2017-07-13 11:31 ` [bug#27682] [PATCH 2/2] gnu: Add lxc 宋文武
2017-07-14 17:09 ` Marius Bakke
@ 2017-07-15 11:20 ` 宋文武
1 sibling, 0 replies; 7+ messages in thread
From: 宋文武 @ 2017-07-15 11:20 UTC (permalink / raw)
To: 27682-done
Pushed.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [bug#27688] [PATCH 1/2] gnu: Rename (gnu packages qemu) to (gnu packages virtualization).
2017-07-13 11:31 [bug#27688] [PATCH 1/2] gnu: Rename (gnu packages qemu) to (gnu packages virtualization) 宋文武
2017-07-13 11:31 ` [bug#27682] [PATCH 2/2] gnu: Add lxc 宋文武
@ 2017-07-14 17:01 ` Marius Bakke
2017-07-15 11:28 ` bug#27688: " 宋文武
1 sibling, 1 reply; 7+ messages in thread
From: Marius Bakke @ 2017-07-14 17:01 UTC (permalink / raw)
To: 宋文武, 27688
[-- Attachment #1: Type: text/plain, Size: 389 bytes --]
宋文武 <iyzsong@member.fsf.org> writes:
> * gnu/packages/qemu.scm: Rename this ...
> * gnu/packages/virtualization.scm: ... to this.
> * gnu/local.mk (GNU_SYSTEM_MODULES),
> gnu/packages/bootloaders.scm, gnu/packages/debug.scm,
> gnu/packages/gnome.scm, gnu/system/vm.scm,
> gnu/tests/install.scm: Adjust accordingly.
You'll also need to adjust POTFILES.in. Otherwise LGTM.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-07-16 0:15 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-13 11:31 [bug#27688] [PATCH 1/2] gnu: Rename (gnu packages qemu) to (gnu packages virtualization) 宋文武
2017-07-13 11:31 ` [bug#27682] [PATCH 2/2] gnu: Add lxc 宋文武
2017-07-14 17:09 ` Marius Bakke
2017-07-15 10:58 ` 宋文武
2017-07-15 11:20 ` bug#27682: " 宋文武
2017-07-14 17:01 ` [bug#27688] [PATCH 1/2] gnu: Rename (gnu packages qemu) to (gnu packages virtualization) Marius Bakke
2017-07-15 11:28 ` bug#27688: " 宋文武
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).