summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
99dc2a9)
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.
endif
# Don't change these names - they must be the same as in '*.sh' scripts.
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
# This is for building the normal appliance:
$(INITRAMFSIMG) $(VMLINUZ): $(top_builddir)/initramfs/fakeroot.log
if [ "@DIST@" = "REDHAT" ]; then
cd @top_builddir@
# Decide on names for the final output. These have to match Makefile.am.
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
rm -f $output
rm -f $koutput
if [ "@DIST@" = "REDHAT" ]; then
cd @top_builddir@
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
# Create the init script.
@FEBOOTSTRAP_INSTALL@ initramfs appliance/@top_srcdir@/appliance/init /init 0755 root.root
elif [ "@DIST@" = "DEBIAN" ]; then
cd @top_builddir@/appliance
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
rm -f debian/debirf-libguestfs_@REPO@_.cgz
ln -sf debian/debirf-libguestfs_@REPO@*.cgz $output
#include "guestfs-internal-actions.h"
#include "guestfs_protocol.h"
#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);
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);