[Pkg-libvirt-commits] [libguestfs] 25/34: Fixed installation

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch experimental
in repository libguestfs.

commit 22f75ac470203923d938f4f0d98af9ad6882c9f8
Author: Hilko Bengen <bengen at debian.org>
Date:   Mon Mar 3 23:54:23 2014 +0100

    Fixed installation
---
 debian/libguestfs-tools.install |  3 +++
 debian/rules                    | 43 ++++++++++++++++++++++++++++-------------
 debian/update-guestfs-appliance |  6 ++++++
 3 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/debian/libguestfs-tools.install b/debian/libguestfs-tools.install
index bcae1f0..6843d34 100644
--- a/debian/libguestfs-tools.install
+++ b/debian/libguestfs-tools.install
@@ -5,6 +5,9 @@ usr/share/man/*/man1/virt-*
 usr/share/bash-completion/completions/virt-*
 
 etc/libguestfs-tools.conf
+etc/xdg/virt-builder
+etc/virt-builder
+
 usr/share/man/man5/libguestfs-tools.conf*
 usr/share/man/*/man5/libguestfs-tools.conf*
 
diff --git a/debian/rules b/debian/rules
index 683d2cb..6adb5cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,16 @@ BARE_CONFIG_FLAGS = \
 	--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 ; \
@@ -94,11 +104,9 @@ override_dh_auto_build:
 
 	# also build part of appliance
 	$(MAKE) -C $(CURDIR)/debian/build-default/appliance \
-		make.sh \
-		packagelist excludelist \
-		supermin.d/daemon.img.gz \
-		supermin.d/init.img \
-		supermin.d/udev-rules.img
+		$(APPLIANCE)                      \
+		libguestfs-make-fixed-appliance   \
+		libguestfs-make-fixed-appliance.1
 
 override_dh_auto_test:
 	set -e; for p in $(BUILDS); do \
@@ -116,16 +124,25 @@ override_dh_auto_install:
 	done
 
 override_dh_install:
-# We do not install supermin.d/base.img, but ship make.sh which can be
+# 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/supermin.d
-	install -m755 debian/build-default/appliance/make.sh \
-		debian/tmp/usr/lib/guestfs
-	install -m644 debian/build-default/appliance/*list \
-		debian/tmp/usr/lib/guestfs
+	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 \
-		debian/build-default/appliance/supermin.d/*.img* \
-		debian/tmp/usr/lib/guestfs/supermin.d/
+		appliance/99-guestfs-serial.rules \
+		debian/tmp/lib/udev/rules.d/
 
 	erlang-depends -perlang-guestfs
 
diff --git a/debian/update-guestfs-appliance b/debian/update-guestfs-appliance
index 3c7652d..b74461e 100755
--- a/debian/update-guestfs-appliance
+++ b/debian/update-guestfs-appliance
@@ -5,3 +5,9 @@ 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git