From: Jean Guyader Date: Wed, 27 Jan 2010 11:08:44 +0000 (+0000) Subject: Merge branch 'master' of git://git.xci-test.com/xenclient/build X-Git-Url: http://xenbits.xen.org/gitweb?a=commitdiff_plain;h=2b47037e30d17cb2bf0a37a293b97a071f0bfeb6;p=xenclient%2Fbuild.git Merge branch 'master' of git://git.xci-test.com/xenclient/build Conflicts: package/xenclient/ioemu/ioemu.mk --- 2b47037e30d17cb2bf0a37a293b97a071f0bfeb6 diff --cc package/xenclient/ioemu/ioemu.mk index be6c87c,d1c8d84..feefeb4 --- a/package/xenclient/ioemu/ioemu.mk +++ b/package/xenclient/ioemu/ioemu.mk @@@ -24,7 -24,8 +24,8 @@@ $(XENCLIENT_IOEMU_DIR): $(XENCLIENT_IOE xenclient-ioemu-install: mkdir -p $(TARGET_DIR)/usr/lib/xen/bin cp $(XENCLIENT_IOEMU_DIR)/i386-dm/qemu-dm $(TARGET_DIR)/usr/lib/xen/bin/qemu-dm + mkdir -p $(TARGET_DIR)/etc/xen - cp $(XENCLIENT_IOEMU_DIR)/i386-dm/qemu-ifup $(TARGET_DIR)/etc/xen + install -m 755 $(XENCLIENT_IOEMU_DIR)/i386-dm/qemu-ifup $(TARGET_DIR)/etc/xen xenclient-ioemu-source: $(XENCLIENT_IOEMU_DIR)