[Pkg-libvirt-commits] [libguestfs] 48/59: Ship libguestfs0 with supermin 5 appliance in /usr/lib/<multiarch> -- no more update-libguestfs-appliance
Hilko Bengen
bengen at moszumanska.debian.org
Thu Mar 20 23:05:40 UTC 2014
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to branch experimental
in repository libguestfs.
commit 7c484a069b88d7119c0924bb9dce196e61eea114
Author: Hilko Bengen <bengen at debian.org>
Date: Sat Mar 15 19:34:54 2014 +0100
Ship libguestfs0 with supermin 5 appliance in /usr/lib/<multiarch> -- no more update-libguestfs-appliance
---
debian/control | 62 ++++++++++++++++++++++
debian/libguestfs-tools.README | 9 ----
debian/libguestfs-tools.config | 8 ---
debian/libguestfs-tools.dirs | 1 -
debian/libguestfs-tools.install | 3 --
debian/libguestfs-tools.manpages | 1 -
debian/libguestfs-tools.postinst | 6 +--
debian/libguestfs-tools.postrm | 24 ---------
debian/libguestfs-tools.templates | 22 --------
debian/libguestfs0.install | 1 +
debian/libguestfs0.lintian-overrides | 5 ++
.../0001-Fix-guestfs-supermin-appliance-path.patch | 38 -------------
...failed-attempt-at-building-out-of-tree-s.patch} | 0
...> 0002-golang-Fix-for-out-of-tree-builds.patch} | 0
debian/patches/series | 5 +-
debian/rules | 45 ++--------------
debian/update-guestfs-appliance | 13 -----
debian/update-guestfs-appliance.8 | 37 -------------
18 files changed, 75 insertions(+), 205 deletions(-)
diff --git a/debian/control b/debian/control
index cfc8eec..659e3c9 100644
--- a/debian/control
+++ b/debian/control
@@ -38,6 +38,68 @@ Build-Depends: debhelper (>= 9),
curl,
flex, bison,
golang-go [i386 amd64 armel armhf],
+# for appliance
+ linux-image-versatile [armel armhf],
+ linux-image-4kc-malta [mips mipsel] | linux-image-5kc-malte [mips mipsel],
+ linux-image-s390x [s390x],
+ linux-image-powerpc [powerpc],
+ linux-image-sparc64 [sparc],
+ linux-image-amd64 [amd64], linux-image-486 [i386] | linux-image-686-pae [i386],
+ acl,
+ attr,
+ binutils,
+ bsdmainutils,
+ btrfs-tools,
+ bzip2,
+ cpio,
+ cryptsetup,
+ dosfstools,
+ extlinux,
+ file,
+ gawk,
+ gdisk,
+ genisoimage,
+ gfs2-utils,
+# gfs-tools,
+ grub-pc,
+ hfsplus,
+ iproute,
+ jfsutils,
+ kmod,
+ less,
+ libaugeas0,
+ libcap2,
+ libhivex0,
+ libpcre3,
+ libsystemd-id128-0, libsystemd-journal0,
+ libxml2,
+ libyajl2,
+ lsof,
+ lsscsi,
+ lvm2,
+ lzop,
+ mdadm,
+ module-init-tools,
+ mtools,
+ nilfs-tools,
+ ntfs-3g,
+# ocfs2-tools,
+ openssh-client,
+ parted,
+ procps,
+ psmisc,
+ reiserfsprogs,
+ rsync,
+ scrub,
+ strace,
+ syslinux,
+ udev,
+# ufsutils,
+ vim-tiny,
+ xfsprogs,
+ xz-utils,
+ zerofree,
+ zfs-fuse,
Homepage: http://libguestfs.org
Standards-Version: 3.9.5
Vcs-Git: git://git.debian.org/git/pkg-libvirt/libguestfs.git
diff --git a/debian/libguestfs-tools.README b/debian/libguestfs-tools.README
deleted file mode 100644
index 1b19d4d..0000000
--- a/debian/libguestfs-tools.README
+++ /dev/null
@@ -1,9 +0,0 @@
-libguestfs for Debian
-=====================
-
-libguestfs needs a supermin appliance to perform its work. To generate
-or update it, simply run:
-
-# update-guestfs-appliance
-
- -- Hilko Bengen <bengen at debian.org>, Sun, 7 Aug 2011 13:34:13 +0200
diff --git a/debian/libguestfs-tools.config b/debian/libguestfs-tools.config
deleted file mode 100755
index 689a17a..0000000
--- a/debian/libguestfs-tools.config
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-db_input high libguestfs/update-appliance || true
-db_go || true
diff --git a/debian/libguestfs-tools.dirs b/debian/libguestfs-tools.dirs
index 917b410..98d1583 100644
--- a/debian/libguestfs-tools.dirs
+++ b/debian/libguestfs-tools.dirs
@@ -1,3 +1,2 @@
usr/bin
usr/share/man/man1
-usr/lib/guestfs/supermin.d
diff --git a/debian/libguestfs-tools.install b/debian/libguestfs-tools.install
index 6843d34..adbe0c9 100644
--- a/debian/libguestfs-tools.install
+++ b/debian/libguestfs-tools.install
@@ -15,9 +15,6 @@ usr/bin/libguestfs-test-tool
usr/share/man/man1/libguestfs-test-tool*
usr/share/man/*/man1/libguestfs-test-tool*
-usr/lib/guestfs
-debian/update-guestfs-appliance usr/sbin
-
usr/share/doc/libguestfs/example-*.xml
usr/share/doc/libguestfs/virt-inspector.rng
diff --git a/debian/libguestfs-tools.manpages b/debian/libguestfs-tools.manpages
deleted file mode 100644
index 403f4f7..0000000
--- a/debian/libguestfs-tools.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/update-guestfs-appliance.8
diff --git a/debian/libguestfs-tools.postinst b/debian/libguestfs-tools.postinst
index cda6b23..f90e676 100755
--- a/debian/libguestfs-tools.postinst
+++ b/debian/libguestfs-tools.postinst
@@ -4,11 +4,7 @@ set -e
case "$1" in
configure|reconfigure)
- . /usr/share/debconf/confmodule
- db_get libguestfs/update-appliance
- if [ "$RET" = true ]; then
- update-guestfs-appliance >&2 || true
- fi
+ rm -f /usr/lib/guestfs/supermin.d/base.img.gz
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/libguestfs-tools.postrm b/debian/libguestfs-tools.postrm
deleted file mode 100755
index e4e40b7..0000000
--- a/debian/libguestfs-tools.postrm
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- purge)
- rm -f \
- /usr/lib/guestfs/supermin.d/hostfiles \
- /usr/lib/guestfs/supermin.d/hostfiles-t \
- /usr/lib/guestfs/supermin.d/base.img
- ;;
-
- remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/libguestfs-tools.templates b/debian/libguestfs-tools.templates
deleted file mode 100644
index c969916..0000000
--- a/debian/libguestfs-tools.templates
+++ /dev/null
@@ -1,22 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: libguestfs/update-appliance
-Type: boolean
-Default: false
-_Description: Create or update supermin appliance now?
- A "supermin appliance" is mandatory for libguestfs.
- It contains lists of files and directories. These will be
- copied into an ad-hoc file system whenever libguestfs starts
- a virtual machine.
- .
- To generate or update a supermin appliance, network access to a
- package repository is needed.
- .
- This can be done later by using the update-guestfs-appliance(8) utility.
diff --git a/debian/libguestfs0.install b/debian/libguestfs0.install
index e137637..9e0bffb 100644
--- a/debian/libguestfs0.install
+++ b/debian/libguestfs0.install
@@ -1,4 +1,5 @@
usr/lib/*-*/libguestfs.so.*
+usr/lib/*-*/guestfs/*
usr/share/man/man1/guestfs-*
usr/share/man/*/man1/guestfs-*
usr/share/locale/*/LC_MESSAGES/libguestfs.mo
diff --git a/debian/libguestfs0.lintian-overrides b/debian/libguestfs0.lintian-overrides
new file mode 100644
index 0000000..cb24c8b
--- /dev/null
+++ b/debian/libguestfs0.lintian-overrides
@@ -0,0 +1,5 @@
+# Lintian should not complain about files in arch-specific directories.
+libguestfs0: gzip-file-is-not-multi-arch-same-safe usr/lib/x86_64-linux-gnu/guestfs/supermin.d/base.tar.gz
+libguestfs0: gzip-file-is-not-multi-arch-same-safe usr/lib/x86_64-linux-gnu/guestfs/supermin.d/daemon.tar.gz
+libguestfs0: gzip-file-is-not-multi-arch-same-safe usr/lib/x86_64-linux-gnu/guestfs/supermin.d/init.tar.gz
+libguestfs0: gzip-file-is-not-multi-arch-same-safe usr/lib/x86_64-linux-gnu/guestfs/supermin.d/udev-rules.tar.gz
diff --git a/debian/patches/0001-Fix-guestfs-supermin-appliance-path.patch b/debian/patches/0001-Fix-guestfs-supermin-appliance-path.patch
deleted file mode 100644
index 6dd64dc..0000000
--- a/debian/patches/0001-Fix-guestfs-supermin-appliance-path.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Thu, 19 Jul 2012 17:27:35 +0200
-Subject: Fix guestfs, supermin appliance path
-
-The supermin appliance files are not installed to the multiarch lib directory.
----
- appliance/Makefile.am | 4 ++--
- src/Makefile.am | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/appliance/Makefile.am b/appliance/Makefile.am
-index 7077d37..ef8af5e 100644
---- a/appliance/Makefile.am
-+++ b/appliance/Makefile.am
-@@ -28,8 +28,8 @@ EXTRA_DIST = \
- make.sh.in \
- packagelist.in
-
--fsdir = $(libdir)/guestfs
--superminfsdir = $(libdir)/guestfs/supermin.d
-+fsdir = $(prefix)/lib/guestfs
-+superminfsdir = $(prefix)/lib/guestfs/supermin.d
-
- fs_DATA =
- superminfs_DATA = \
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 10f5203..6d217b0 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -130,7 +130,7 @@ libguestfs_la_SOURCES = \
- libguestfs.syms
-
- libguestfs_la_CPPFLAGS = \
-- -DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \
-+ -DGUESTFS_DEFAULT_PATH='"$(prefix)/lib/guestfs"' \
- -DGUESTFS_WARN_DEPRECATED=1 \
- -DGUESTFS_PRIVATE=1 \
- -DLIBOSINFO_DB_PATH='"$(datadir)/libosinfo/db"' \
diff --git a/debian/patches/0002-perl-revert-failed-attempt-at-building-out-of-tree-s.patch b/debian/patches/0001-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
similarity index 100%
rename from debian/patches/0002-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
rename to debian/patches/0001-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
diff --git a/debian/patches/0003-golang-Fix-for-out-of-tree-builds.patch b/debian/patches/0002-golang-Fix-for-out-of-tree-builds.patch
similarity index 100%
rename from debian/patches/0003-golang-Fix-for-out-of-tree-builds.patch
rename to debian/patches/0002-golang-Fix-for-out-of-tree-builds.patch
diff --git a/debian/patches/series b/debian/patches/series
index 708b7d4..4574a17 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-0001-Fix-guestfs-supermin-appliance-path.patch
-0002-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
-0003-golang-Fix-for-out-of-tree-builds.patch
+0001-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
+0002-golang-Fix-for-out-of-tree-builds.patch
diff --git a/debian/rules b/debian/rules
index 1da2130..211c26e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,31 +18,21 @@ QEMU_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU \
| sed -e 's,i[456]86,i386,;s,sparc,sparc64,;s,powerpc,ppc,;s,arm.*,arm,')
DEFAULT_CONFIG_FLAGS = \
- --disable-appliance \
--disable-gnulib-tests \
--with-readline \
--disable-haskell \
--disable-php \
--enable-gtk-doc \
- --with-qemu=qemu-system-$(QEMU_CPU)
+ --with-qemu=qemu-system-$(QEMU_CPU) \
+ --with-supermin-extra-options='--use-installed'
BARE_CONFIG_FLAGS = \
$(DEFAULT_CONFIG_FLAGS) \
- --disable-daemon --disable-fuse \
+ --disable-fuse \
--disable-ocaml --disable-perl \
--disable-erlang --with-java=no \
--disable-gobject --without-java
-# needed as input for supermin(8)
-APPLIANCE_PREREQ = make.sh packagelist
-# added after supermin --prepare
-APPLIANCE_EXTRA = \
- hostfiles excludefiles \
- daemon.tar.gz \
- init.tar.gz \
- udev-rules.tar.gz
-APPLIANCE = $(APPLIANCE_PREREQ) $(APPLIANCE_EXTRA)
-
override_dh_auto_clean:
set -e; for p in $(BUILDS); do \
dh_auto_clean --builddir=$(CURDIR)/debian/build-$$p ; \
@@ -103,16 +93,9 @@ override_dh_auto_build:
EXTRA_JAVAC_FLAGS+="-source 1.6 -target 1.6" ; \
done
- # also build part of appliance
- $(MAKE) -C $(CURDIR)/debian/build-default/appliance \
- $(APPLIANCE) \
- libguestfs-make-fixed-appliance \
- libguestfs-make-fixed-appliance.1
-
override_dh_auto_test:
set -e; for p in $(BUILDS); do \
- dh_auto_test --builddir=$(CURDIR)/debian/build-$$p \
- -- CFLAGS="$(filter-out -Werror=format-security,$(CFLAGS))"; \
+ make -C $(CURDIR)/debian/build-$$p quickcheck; \
done
override_dh_auto_install:
@@ -125,26 +108,6 @@ override_dh_auto_install:
done
override_dh_install:
-# We do not install supermin.d/base.*, but ship make.sh which can be
-# used to build it.
- mkdir -p debian/tmp/usr/lib/guestfs \
- debian/tmp/usr/sbin/ \
- debian/tmp/usr/share/man/man1 \
- debian/tmp/lib/udev/rules.d/appliance/
- install -m644 \
- $(patsubst %,debian/build-default/appliance/%,$(APPLIANCE)) \
- debian/tmp/usr/lib/guestfs/
- chmod 755 debian/tmp/usr/lib/guestfs/make.sh
- install -m755 \
- debian/build-default/appliance/libguestfs-make-fixed-appliance \
- debian/tmp/usr/sbin/
- install -m644 \
- debian/build-default/appliance/libguestfs-make-fixed-appliance.1 \
- debian/tmp/usr/share/man/man1/
- install -m644 \
- appliance/99-guestfs-serial.rules \
- debian/tmp/lib/udev/rules.d/
-
erlang-depends -perlang-guestfs
dh_install -X.la -X.so.owner -Xbindtests -X/usr/lib/go/ \
diff --git a/debian/update-guestfs-appliance b/debian/update-guestfs-appliance
deleted file mode 100755
index b74461e..0000000
--- a/debian/update-guestfs-appliance
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd /usr/lib/guestfs
-umask 022
-./make.sh
-cd supermin.d && ln -st . \
- ../daemon.tar.gz \
- ../excludefiles \
- ../hostfiles \
- ../init.tar.gz \
- ../udev-rules.tar.gz
diff --git a/debian/update-guestfs-appliance.8 b/debian/update-guestfs-appliance.8
deleted file mode 100644
index b034604..0000000
--- a/debian/update-guestfs-appliance.8
+++ /dev/null
@@ -1,37 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.TH LIBGUESTFS 8 "August 2011"
-.SH NAME
-update-guestfs-appliance \- update the supermin appliance used by
-libguestfs
-.SH SYNOPSIS
-.B update-guestfs-appliance
-.SH DESCRIPTION
-\fBupdate-guestfs-appliance\fP creates or updates the supermin
-appliance for use with libguestfs. It uses \fBfebootstrap\fP for this,
-therefore access to the package repository is needed.
-.PP
-A supermin appliance contains only lists of files and directories. The
-contents of the referenced files are only copied into an ad-hoc
-filesystem whenever libguestfs starts a virtual machine. Therefore,
-calling \fBupdate-guestfs-appliance\fP is only needed after libguestfs
-has been installed or when the filesystem layouts or dependencies of
-needed packages on the host system have been changed.
-.PP
-.SH FILES
-.BR /usr/lib/guestfs/make.sh
-(the script that does the actual work),
-.nh
-.nf
-.BR /usr/lib/guestfs/supermin.d/hostfiles
-.BR /usr/lib/guestfs/supermin.d/base.img
-.fi
-.hy
-.SH SEE ALSO
-.BR guestfish (1),
-.BR guestmount (1),
-.BR febootstrap (8),
-.BR febootstrap-supermin-helper (8).
-.SH AUTHOR
-\fBupdate-guestfs-appliance\fP and this manual page were written by
-Hilko Bengen <bengen at debian.org>, for the Debian project (and may be
-used by others).
--
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