[Pkg-libvirt-commits] [libguestfs] 58/66: Split off specific dependencies from libguestfs0 (Closes: #648291, #681889, #736597, #742944)
Hilko Bengen
bengen at moszumanska.debian.org
Fri May 9 12:56:35 UTC 2014
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to branch master
in repository libguestfs.
commit e6e032711a5fced1f42d9b5311df79ba1298fccd
Author: Hilko Bengen <bengen at debian.org>
Date: Wed May 7 22:48:36 2014 +0200
Split off specific dependencies from libguestfs0 (Closes: #648291, #681889, #736597, #742944)
---
debian/control | 132 ++++++++++++++++++++++++++++++++++++-
debian/libguestfs-gfs2.install | 1 +
debian/libguestfs-hfsplus.install | 1 +
debian/libguestfs-jfs.install | 1 +
debian/libguestfs-nilfs.install | 1 +
debian/libguestfs-reiserfs.install | 1 +
debian/libguestfs-rescue.install | 1 +
debian/libguestfs-rsync.install | 2 +
debian/libguestfs-xfs.install | 1 +
debian/libguestfs-zfs.install | 1 +
debian/libguestfs0.install | 8 ++-
debian/rules | 34 +++++++---
12 files changed, 174 insertions(+), 10 deletions(-)
diff --git a/debian/control b/debian/control
index 8368c95..369ad3b 100644
--- a/debian/control
+++ b/debian/control
@@ -161,7 +161,16 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
qemu-system-ppc [powerpc],
qemu-system-sparc [sparc],
qemu-system-x86 [i386 amd64],
- ${appliance:Depends}
+ ${appliance:Depends},
+Recommends: libguestfs-gfs2,
+ libguestfs-hfsplus,
+ libguestfs-jfs,
+ libguestfs-nilfs,
+ libguestfs-reiserfs,
+ libguestfs-rescue,
+ libguestfs-rsync,
+ libguestfs-xfs,
+ libguestfs-zfs,
Description: guest disk image management system - shared library
The libguestfs library allows accessing and modifying guest disk
images. It offers the following features, among many others:
@@ -182,6 +191,127 @@ Description: guest disk image management system - shared library
what file system is in each LV, etc.); to run commands in the context of the
guest; and to upload and download files and directories.
+Package: libguestfs-gfs2
+Section: libs
+Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libguestfs0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends},
+ ${appliance:Depends},
+Description: guest disk image management system - GFS2 support
+ The libguestfs library allows accessing and modifying guest disk
+ images.
+ .
+ This package contains appliance fragments for Global Filesystem
+ (GFS2) support.
+
+Package: libguestfs-hfsplus
+Section: libs
+Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libguestfs0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends},
+ ${appliance:Depends},
+Description: guest disk image management system - HFS+ support
+ The libguestfs library allows accessing and modifying guest disk
+ images.
+ .
+ This package contains appliance fragments for HFS+ support.
+
+Package: libguestfs-jfs
+Section: libs
+Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libguestfs0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends},
+ ${appliance:Depends},
+Description: guest disk image management system - JFS support
+ The libguestfs library allows accessing and modifying guest disk
+ images.
+ .
+ This package contains appliance fragments for JFS support.
+
+Package: libguestfs-nilfs
+Section: libs
+Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libguestfs0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends},
+ ${appliance:Depends},
+Description: guest disk image management system - NILFS v2 support
+ The libguestfs library allows accessing and modifying guest disk
+ images.
+ .
+ This package contains appliance fragments for NILFS v2 support.
+
+Package: libguestfs-reiserfs
+Section: libs
+Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libguestfs0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends},
+ ${appliance:Depends},
+Description: guest disk image management system - ReiserFS support
+ The libguestfs library allows accessing and modifying guest disk
+ images.
+ .
+ This package contains appliance fragments for ReiserFS support.
+
+Package: libguestfs-rescue
+Section: libs
+Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libguestfs0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends},
+ ${appliance:Depends},
+Description: guest disk image management system - virt-rescue enhancements
+ The libguestfs library allows accessing and modifying guest disk
+ images.
+ .
+ This package contains additional tools to use inside the virt-rescue
+ shell, such as ssh, network utilities, editors and debugging
+ utilities.
+
+Package: libguestfs-rsync
+Section: libs
+Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libguestfs0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends},
+ ${appliance:Depends},
+Description: guest disk image management system - rsync support
+ The libguestfs library allows accessing and modifying guest disk
+ images.
+ .
+ This package contains appliance fragments for using rsync to/from
+ guest filesystems.
+
+Package: libguestfs-xfs
+Section: libs
+Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libguestfs0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends},
+ ${appliance:Depends},
+Description: guest disk image management system - XFS support
+ The libguestfs library allows accessing and modifying guest disk
+ images.
+ .
+ This package contains appliance fragments for XFS support.
+
+Package: libguestfs-zfs
+Section: libs
+Architecture: i386 amd64 powerpc sparc
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libguestfs0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends},
+ ${appliance:Depends},
+Description: guest disk image management system - ZFS support
+ The libguestfs library allows accessing and modifying guest disk
+ images.
+ .
+ This package contains appliance fragments for ZFS support.
+
Package: libguestfs-tools
Section: admin
Architecture: linux-any
diff --git a/debian/libguestfs-gfs2.install b/debian/libguestfs-gfs2.install
new file mode 100644
index 0000000..faf4454
--- /dev/null
+++ b/debian/libguestfs-gfs2.install
@@ -0,0 +1 @@
+/usr/lib/*-*/guestfs/supermin.d/packages-gfs2
diff --git a/debian/libguestfs-hfsplus.install b/debian/libguestfs-hfsplus.install
new file mode 100644
index 0000000..4513fb4
--- /dev/null
+++ b/debian/libguestfs-hfsplus.install
@@ -0,0 +1 @@
+/usr/lib/*-*/guestfs/supermin.d/packages-hfsplus
diff --git a/debian/libguestfs-jfs.install b/debian/libguestfs-jfs.install
new file mode 100644
index 0000000..4859605
--- /dev/null
+++ b/debian/libguestfs-jfs.install
@@ -0,0 +1 @@
+/usr/lib/*-*/guestfs/supermin.d/packages-jfs
diff --git a/debian/libguestfs-nilfs.install b/debian/libguestfs-nilfs.install
new file mode 100644
index 0000000..5369184
--- /dev/null
+++ b/debian/libguestfs-nilfs.install
@@ -0,0 +1 @@
+/usr/lib/*-*/guestfs/supermin.d/packages-nilfs
diff --git a/debian/libguestfs-reiserfs.install b/debian/libguestfs-reiserfs.install
new file mode 100644
index 0000000..0706e58
--- /dev/null
+++ b/debian/libguestfs-reiserfs.install
@@ -0,0 +1 @@
+/usr/lib/*-*/guestfs/supermin.d/packages-reiserfs
diff --git a/debian/libguestfs-rescue.install b/debian/libguestfs-rescue.install
new file mode 100644
index 0000000..c0603ae
--- /dev/null
+++ b/debian/libguestfs-rescue.install
@@ -0,0 +1 @@
+/usr/lib/*-*/guestfs/supermin.d/packages-rescue
diff --git a/debian/libguestfs-rsync.install b/debian/libguestfs-rsync.install
new file mode 100644
index 0000000..e5a015e
--- /dev/null
+++ b/debian/libguestfs-rsync.install
@@ -0,0 +1,2 @@
+/usr/lib/*-*/guestfs/supermin.d/packages-rsync
+/usr/lib/*-*/guestfs/supermin.d/packages-rsync
diff --git a/debian/libguestfs-xfs.install b/debian/libguestfs-xfs.install
new file mode 100644
index 0000000..42e10eb
--- /dev/null
+++ b/debian/libguestfs-xfs.install
@@ -0,0 +1 @@
+/usr/lib/*-*/guestfs/supermin.d/packages-xfs
diff --git a/debian/libguestfs-zfs.install b/debian/libguestfs-zfs.install
new file mode 100644
index 0000000..14a8b08
--- /dev/null
+++ b/debian/libguestfs-zfs.install
@@ -0,0 +1 @@
+/usr/lib/*-*/guestfs/supermin.d/packages-zfs
diff --git a/debian/libguestfs0.install b/debian/libguestfs0.install
index 9e0bffb..0660bd1 100644
--- a/debian/libguestfs0.install
+++ b/debian/libguestfs0.install
@@ -1,5 +1,11 @@
usr/lib/*-*/libguestfs.so.*
-usr/lib/*-*/guestfs/*
+usr/lib/*-*/guestfs/supermin.d/base.tar.gz
+usr/lib/*-*/guestfs/supermin.d/daemon.tar.gz
+usr/lib/*-*/guestfs/supermin.d/excludefiles
+usr/lib/*-*/guestfs/supermin.d/hostfiles
+usr/lib/*-*/guestfs/supermin.d/init.tar.gz
+usr/lib/*-*/guestfs/supermin.d/packages
+usr/lib/*-*/guestfs/supermin.d/udev-rules.tar.gz
usr/share/man/man1/guestfs-*
usr/share/man/*/man1/guestfs-*
usr/share/locale/*/LC_MESSAGES/libguestfs.mo
diff --git a/debian/rules b/debian/rules
index 41a8515..e71b02b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -108,10 +108,34 @@ override_dh_auto_install:
done
override_dh_install:
+# Split the supermin appliance packages list into subpackages, so the
+# main libguestfs0 can avoid depending on everything.
+ cd $(CURDIR)/debian/tmp/usr/lib/*-*/guestfs/supermin.d && \
+ cp -n packages packages.orig; \
+ for f in gfs2 hfsplus jfs nilfs reiserfs rsync xfs zfs; do \
+ sed -i -e "/$$f/d" packages; \
+ grep -F "$$f" < packages.orig > packages-$$f; \
+ done ; \
+ sed -i -e "/^\(iputils\|lsof\|openssh-server\|strace\|vim\)/d" packages; \
+ grep "^\(iputils\|lsof\|openssh-server\|strace\|vim\)" \
+ < packages.orig > packages-rescue
+
erlang-depends -perlang-guestfs
- dh_install -X.la -X.so.owner -Xbindtests -X/usr/lib/go/ \
- --fail-missing
+ dh_install -X.la -X.so.owner -Xbindtests -X/usr/lib/go/ -Xpackages.orig \
+ --fail-missing
+
+# Add packages (except essential packages) from appliance packagelist
+# to libguestfs0 dependencies
+ for p in libguestfs0 \
+ $(patsubst %,libguestfs-%,gfs2 hfsplus jfs nilfs reiserfs rescue rsync xfs zfs); \
+ do \
+ echo "appliance for $$p..."; \
+ echo -n 'appliance:Depends=' >> debian/$$p.substvars; \
+ cat debian/$$p/usr/lib/*-*/guestfs/supermin.d/*packages* | \
+ grep -v '^\(bash\|coreutils\|e2fsprogs\|findutils\|grep\|gzip\|sed\|sysvinit\|tar\|util\-linux\)' | \
+ tr '\n' ',' >> debian/$$p.substvars; \
+ done
override_dh_python3:
dh_python3 -p python3-guestfs
@@ -121,12 +145,6 @@ override_dh_shlibdeps:
dh_shlibdeps
# Add libraries needed by guestfsd to libguestfs0 dependencies
dh_shlibdeps -p libguestfs0 -- -e debian/guestfsd/usr/sbin/guestfsd
-# Add packages (except essential packages) from appliance packagelist
-# to libguestfs0 dependencies
- echo -n 'appliance:Depends=' >> debian/libguestfs0.substvars
- cat debian/libguestfs0/usr/lib/*/guestfs/supermin.d/packages | \
- sed -e '/^\(bash\|coreutils\|e2fsprogs\|findutils\|grep\|gzip\|sed\|sysvinit\|tar\|util-linux\)$$/d' | \
- tr '\n' ',' >> debian/libguestfs0.substvars
# Workaround for Lintian warning
# "{pre,post}inst-has-useless-call-to-ldconfig"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git
More information about the Pkg-libvirt-commits
mailing list