From: Richard W.M. Jones <rjones@redhat.com>
Date: Tue, 26 Oct 2010 09:03:50 +0000 (+0100)
Subject: appliance: Remove repo from appliance filename (RHBZ#638901).
X-Git-Tag: 1.5.24~7
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=f1930720d96d4a601f1ff63e6ce50da23b90188c;p=libguestfs.git

appliance: Remove repo from appliance filename (RHBZ#638901).

There's no need to have the appliance filename contain the
repository name it was built from, and this change gives
downstream users more freedom to mix and match libraries
and appliances if they want to.
---

diff --git a/appliance/Makefile.am b/appliance/Makefile.am
index 172f0cf..0abd698 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -47,8 +47,8 @@ superminfs_DATA = \
 endif
 
 # Don't change these names - they must be the same as in '*.sh' scripts.
-INITRAMFSIMG = initramfs.$(REPO).$(host_cpu).img
-VMLINUZ = vmlinuz.$(REPO).$(host_cpu)
+INITRAMFSIMG = initramfs.$(host_cpu).img
+VMLINUZ = vmlinuz.$(host_cpu)
 
 # This is for building the normal appliance:
 $(INITRAMFSIMG) $(VMLINUZ): $(top_builddir)/initramfs/fakeroot.log
diff --git a/appliance/make.sh.in b/appliance/make.sh.in
index efd1f46..36bcd6c 100755
--- a/appliance/make.sh.in
+++ b/appliance/make.sh.in
@@ -26,8 +26,8 @@ set -x
 if [ "@DIST@" = "REDHAT" ]; then
   cd @top_builddir@
   # Decide on names for the final output.  These have to match Makefile.am.
-  output=appliance/initramfs.@REPO@.@host_cpu@.img
-  koutput=appliance/vmlinuz.@REPO@.@host_cpu@
+  output=appliance/initramfs.@host_cpu@.img
+  koutput=appliance/vmlinuz.@host_cpu@
   rm -f $output
   rm -f $koutput
 
diff --git a/appliance/update.sh.in b/appliance/update.sh.in
index 90d6394..98d785e 100755
--- a/appliance/update.sh.in
+++ b/appliance/update.sh.in
@@ -25,7 +25,7 @@ set -e
 
 if [ "@DIST@" = "REDHAT" ]; then
   cd @top_builddir@
-  output=appliance/initramfs.@REPO@.@host_cpu@.img
+  output=appliance/initramfs.@host_cpu@.img
 
   # Create the init script.
   @FEBOOTSTRAP_INSTALL@ initramfs appliance/@top_srcdir@/appliance/init /init 0755 root.root
@@ -40,8 +40,8 @@ if [ "@DIST@" = "REDHAT" ]; then
 elif [ "@DIST@" = "DEBIAN" ]; then
   cd @top_builddir@/appliance
 
-  output=initramfs.@REPO@.@host_cpu@.img
-  vmlinuz=vmlinuz.@REPO@.@host_cpu@
+  output=initramfs.@host_cpu@.img
+  vmlinuz=vmlinuz.@host_cpu@
 
   rm -f debian/debirf-libguestfs_@REPO@_.cgz
   ln -sf debian/debirf-libguestfs_@REPO@*.cgz $output
diff --git a/src/appliance.c b/src/appliance.c
index 28f1595..80f0f46 100644
--- a/src/appliance.c
+++ b/src/appliance.c
@@ -39,8 +39,8 @@
 #include "guestfs-internal-actions.h"
 #include "guestfs_protocol.h"
 
-static const char *kernel_name = "vmlinuz." REPO "." host_cpu;
-static const char *initrd_name = "initramfs." REPO "." host_cpu ".img";
+static const char *kernel_name = "vmlinuz." host_cpu;
+static const char *initrd_name = "initramfs." host_cpu ".img";
 
 static int find_path (guestfs_h *g, int (*pred) (guestfs_h *g, const char *pelem, void *data), void *data, char **pelem);
 static int dir_contains_file (const char *dir, const char *file);