]> xenbits.xen.org Git - xenclient/build.git/commitdiff
projects / xenclient / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25f459b c47e68f)
Merge branch 'master' of git://git.xci-test.com/xenclient/build
authorJean Guyader <jean.guyader@eu.citrix.com>
Wed, 27 Jan 2010 11:08:44 +0000 (11:08 +0000)
committerJean Guyader <jean.guyader@eu.citrix.com>
Wed, 27 Jan 2010 11:08:44 +0000 (11:08 +0000)
Conflicts:
package/xenclient/ioemu/ioemu.mk

1  2 
package/xenclient/ioemu/ioemu.mk patch | diff1 | diff2 | blob | history

diff --cc package/xenclient/ioemu/ioemu.mk
index be6c87c56ce85c1ec079dbfbb86dec0b68aebe86,d1c8d84e6546e181de52dd38ed047b76237056ba..feefeb488a539750afe7744e4fa5e6f2751ed2f4
--- 1/package/xenclient/ioemu/ioemu.mk
--- 2/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
 -      cp $(XENCLIENT_IOEMU_DIR)/i386-dm/qemu-ifup $(TARGET_DIR)/etc/xen
+       mkdir -p $(TARGET_DIR)/etc/xen
 +      install -m 755 $(XENCLIENT_IOEMU_DIR)/i386-dm/qemu-ifup $(TARGET_DIR)/etc/xen
  
  xenclient-ioemu-source: $(XENCLIENT_IOEMU_DIR)
  
xenclient build repository