pool/libguestfs
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 329577 from home:cbosdonnat:branches:Virtualization

Browse Source 
- Add opensuse images source for virt-builder.
  fate#318952.

OBS-URL: https://build.opensuse.org/request/show/329577
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=343
This commit is contained in:
Olaf Hering 2015-09-07 18:30:32 +00:00 committed by Git OBS Bridge
parent b57c032050
commit 7e157ec941
3 changed files with 109 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
0000-hotfix.patch
View File

@ -9,18 +9,17 @@ Signed-off-by: Olaf Hering <olaf@aepfle.de>
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
create mode 100644 pkg-hotfix.txt create mode 100644 pkg-hotfix.txt
diff --git a/pkg-hotfix.txt b/pkg-hotfix.txt Index: libguestfs-1.26.10/pkg-hotfix.txt
new file mode 100644 ===================================================================
index 0000000..8b13789
--- /dev/null --- /dev/null
+++ b/pkg-hotfix.txt +++ libguestfs-1.26.10/pkg-hotfix.txt
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+ +
diff --git a/daemon/btrfs.c b/daemon/btrfs.c Index: libguestfs-1.26.10/daemon/btrfs.c
index 7a4d43d..ceea593 100644 ===================================================================
--- a/daemon/btrfs.c --- libguestfs-1.26.10.orig/daemon/btrfs.c
+++ b/daemon/btrfs.c +++ libguestfs-1.26.10/daemon/btrfs.c
@@ -356,6 +356,7 @@ do_btrfs_subvolume_list (const mountable_t *fs) @@ -356,6 +356,7 @@ do_btrfs_subvolume_list (const mountable
ADD_ARG (argv, i, str_btrfs); ADD_ARG (argv, i, str_btrfs);
ADD_ARG (argv, i, "subvolume"); ADD_ARG (argv, i, "subvolume");
ADD_ARG (argv, i, "list"); ADD_ARG (argv, i, "list");
@ -47,3 +46,97 @@ Index: libguestfs-1.26.10/customize/customize_run.ml
| "unknown" -> | "unknown" ->
eprintf (f_"%s: --install is not supported for this guest operating system\n") eprintf (f_"%s: --install is not supported for this guest operating system\n")
prog; prog;
Index: libguestfs-1.26.10/builder/downloader.ml
===================================================================
--- libguestfs-1.26.10.orig/builder/downloader.ml
+++ libguestfs-1.26.10/builder/downloader.ml
@@ -97,7 +97,7 @@ and download_to ~prog t ?(progress_bar =
)
| _ -> (* Any other protocol. *)
(* Get the status code first to ensure the file exists. *)
- let cmd = sprintf "%s%s -g -o /dev/null -I -w '%%{http_code}' %s"
+ let cmd = sprintf "%s%s -L -g -o /dev/null -I -w '%%{http_code}' %s"
t.curl
(if t.verbose then "" else " -s -S")
(quote uri) in
@@ -122,7 +122,7 @@ and download_to ~prog t ?(progress_bar =
);
(* Now download the file. *)
- let cmd = sprintf "%s%s -g -o %s %s"
+ let cmd = sprintf "%s%s -L -g -o %s %s"
t.curl
(if t.verbose then "" else if progress_bar then " -#" else " -s -S")
(quote filename_new) (quote uri) in
Index: libguestfs-1.26.10/builder/Makefile.am
===================================================================
--- libguestfs-1.26.10.orig/builder/Makefile.am
+++ libguestfs-1.26.10/builder/Makefile.am
@@ -261,7 +261,7 @@ DISTCLEANFILES = .depend
# virt-builder's default repository
repoconfdir = $(sysconfdir)/xdg/virt-builder/repos.d
-repoconf_DATA = libguestfs.conf libguestfs.gpg
+repoconf_DATA = libguestfs.conf libguestfs.gpg opensuse.conf opensuse.gpg
install-exec-hook:
$(LN_S) xdg/virt-builder $(DESTDIR)$(sysconfdir)/virt-builder
Index: libguestfs-1.26.10/builder/Makefile.in
===================================================================
--- libguestfs-1.26.10.orig/builder/Makefile.in
+++ libguestfs-1.26.10/builder/Makefile.in
@@ -1649,7 +1649,7 @@ DISTCLEANFILES = .depend
# virt-builder's default repository
repoconfdir = $(sysconfdir)/xdg/virt-builder/repos.d
-repoconf_DATA = libguestfs.conf libguestfs.gpg
+repoconf_DATA = libguestfs.conf libguestfs.gpg opensuse.conf opensuse.gpg
virt_index_validate_SOURCES = \
index-parse.y \
index-scan.l \
Index: libguestfs-1.26.10/builder/opensuse.conf.in
===================================================================
--- /dev/null
+++ libguestfs-1.26.10/builder/opensuse.conf.in
@@ -0,0 +1,3 @@
+[opensuse.org]
+uri=http://download.opensuse.org/repositories/Virtualization:/virt-builder-images/images/index
+gpgkey=file://@SYSCONFDIR@/xdg/virt-builder/repos.d/opensuse.gpg
Index: libguestfs-1.26.10/builder/opensuse.gpg
===================================================================
--- /dev/null
+++ libguestfs-1.26.10/builder/opensuse.gpg
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+mQENBFImAl0BCACkjaXGvVLHBGTVXVP0khtpUVHqFvCRtaIIMHaX/5oTr3nyehDQ
+Ex9VLsSRcNa0QxtnCHFRQzjWWqe+i6pBginnSjucgmjnIKyJsF4l6R+rwAiinHQX
+C4s6Lqg/wH9xDPRBrMYFqlc/7MVf0Glhk1+lAxgQjolMt+5AbbrWlBbwc/i+++zl
+ES3MaeH8aiwup/ogjhmk0SbCQQ/ib21p3XWBwx2oz/KM6Voq9tKDvMczjzNRY3ZT
+6Di3FsUSKI7kgljiNiuN+675YwqEqxWEJgdE5a7Zb67giH1Ik08b5wQiF5jSAICD
+DxW7/ibWBvZJnqhqQT2xJpLC5VaJqwkN8o83ABEBAAG0PlZpcnR1YWxpemF0aW9u
+IE9CUyBQcm9qZWN0IDxWaXJ0dWFsaXphdGlvbkBidWlsZC5vcGVuc3VzZS5vcmc+
+iQE7BBMBAgAmBQJSJgJdAhsDBQkEHrAABgsJCAcDAgQVAggDBBYCAwECHgECF4AA
+CgkQoZP7tXIXT8ITnwf3SVUUoVjVLFCjhIxdet8BL011cJDwr9TwKEQfq4Ybsq5L
+5Y1/Zk86rTzrVOZrODLwNRIC3fMuegZV5f85KMggXu37Di+UvX+dQW9v1hte+hAT
++gsqb60kOnE/Yacgkb6D3xIzRudAB2q/xfvHl/hgfn416yGI8NvntT7n4Hk9wT28
+9JSFkun0uaessg77aXlAdsqHwdugm9hELeva89OoYoiZ4d9r4ScTMSj0UkNgnh7g
+CyIScZHYqiiOeosUtAX9u1PyUFfFsg9s5snfud7aF48EfXU0RTtZAGKtG4GPDv3q
+bYc5TJ2pQzs9y5Bk/jAMR/QQw8CKglBsn1cjYkKViEYEExECAAYFAlImAl0ACgkQ
+OzARt2udZSO5yACgr6Ei7QZ+PAmg4Mr5db+4M3aepAEAniU33RaTKBCGkwQi6kHr
+4VaII2/E
+=l8DH
+-----END PGP PUBLIC KEY BLOCK-----
Index: libguestfs-1.26.10/configure.ac
===================================================================
--- libguestfs-1.26.10.orig/configure.ac
+++ libguestfs-1.26.10/configure.ac
@@ -1635,6 +1635,7 @@ AC_CONFIG_FILES([Makefile
bash/Makefile
builder/Makefile
builder/libguestfs.conf
+ builder/opensuse.conf
builder/test-config/virt-builder/repos.d/test-index.conf
builder/test-website/virt-builder/repos.d/libguestfs.conf
builder/website/Makefile

6
libguestfs.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Sep 7 13:39:57 UTC 2015 - cbosdonnat@suse.com
- Add opensuse images source for virt-builder.
fate#318952.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 28 13:53:53 UTC 2015 - cbosdonnat@suse.com Tue Jul 28 13:53:53 UTC 2015 - cbosdonnat@suse.com

2
libguestfs.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libguestfs # spec file for package libguestfs
# #
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2011 Michal Hrusecky <mhrusecky@novell.com> # Copyright (c) 2011 Michal Hrusecky <mhrusecky@novell.com>
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties