git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
init: Check that start_udev succeeded
[libguestfs.git]
/
appliance
/
Makefile.am
diff --git
a/appliance/Makefile.am
b/appliance/Makefile.am
index
e2b0b31
..
d1338bf
100644
(file)
--- a/
appliance/Makefile.am
+++ b/
appliance/Makefile.am
@@
-16,9
+16,7
@@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
EXTRA_DIST = \
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
EXTRA_DIST = \
- make.sh update.sh supermin-split.sh supermin-make.sh \
libguestfs-supermin-helper \
libguestfs-supermin-helper \
- kmod.whitelist \
kmod.whitelist.in \
packagelist.in \
init \
kmod.whitelist.in \
packagelist.in \
init \
@@
-59,8
+57,8
@@
endif
$(INITRAMFSIMG) $(VMLINUZ): $(top_builddir)/initramfs/fakeroot.log
$(top_builddir)/initramfs/fakeroot.log: make.sh kmod.whitelist packagelist
$(INITRAMFSIMG) $(VMLINUZ): $(top_builddir)/initramfs/fakeroot.log
$(top_builddir)/initramfs/fakeroot.log: make.sh kmod.whitelist packagelist
- -mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak
- -mv $(VMLINUZ) $(VMLINUZ).bak
+ mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak 2>/dev/null; :
+ mv $(VMLINUZ) $(VMLINUZ).bak 2>/dev/null; :
if ! bash make.sh; then rm -f $@; exit 1; fi
$(INITRAMFSIMG): $(top_builddir)/initramfs/fakeroot.log $(top_builddir)/daemon/guestfsd init update.sh
if ! bash make.sh; then rm -f $@; exit 1; fi
$(INITRAMFSIMG): $(top_builddir)/initramfs/fakeroot.log $(top_builddir)/daemon/guestfsd init update.sh
@@
-105,6
+103,7
@@
debirf_symlinks = \
noinst_DATA = $(debirf_symlinks:%=debian/modules/%)
$(debirf_symlinks:%=debian/modules/%): stamp-debirf-modules
stamp-debirf-modules:
noinst_DATA = $(debirf_symlinks:%=debian/modules/%)
$(debirf_symlinks:%=debian/modules/%): stamp-debirf-modules
stamp-debirf-modules:
+ mkdir -p debian/modules
for f in $(debirf_symlinks); do \
ln -sf /usr/share/debirf/modules/$$f debian/modules/$$f; \
done
for f in $(debirf_symlinks); do \
ln -sf /usr/share/debirf/modules/$$f debian/modules/$$f; \
done
@@
-143,8
+142,7
@@
test-boot-realistic: emptydisk
# Make clean.
# Make clean.
-CLEANFILES = $(APPLIANCE_FILES)
+CLEANFILES = $(APPLIANCE_FILES)
packagelist kmod.whitelist supermin.incfiles
clean-local:
rm -rf $(top_builddir)/initramfs
clean-local:
rm -rf $(top_builddir)/initramfs
-