Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Avoid cleaning too much

main build system write some file to main output directory.
Here OUTPUT_SDK_DIR point to the main directory so every files is
wiped out. OUTPUT_SDK_DIR is used only for tmp subdirectory so
clean only this directory
  • Loading branch information...
commit ca0e79487455b9dceec59e014171ef7dbc01a787 1 parent 0a40866
@freddy77 freddy77 authored
Showing with 4 additions and 3 deletions.
  1. +4 −3 mk/Makefile
View
7 mk/Makefile
@@ -80,7 +80,7 @@ $(OUTPUT_CLI_RT) $(OUTPUT_SDK): $(MY_MAIN_PACKAGES)/.dirstamp $(RPM_DIRECTORIES)
rm -rf $(OUTPUT_DATAMODEL_DIR)/tmp
# Make sure the right RPMs appear on the install CD
- mkdir $(MY_MAIN_PACKAGES)
+ mkdir -p $(MY_MAIN_PACKAGES)
cp $(RPM_RPMSDIR)/$(DOMAIN0_ARCH_OPTIMIZED)/xapi-core-*.rpm $(MY_MAIN_PACKAGES)
cp $(RPM_RPMSDIR)/noarch/xapi-noarch-backend-udev-*.rpm $(MY_MAIN_PACKAGES)
cp $(RPM_RPMSDIR)/$(DOMAIN0_ARCH_OPTIMIZED)/xapi-networkd-*.rpm $(MY_MAIN_PACKAGES)
@@ -92,11 +92,12 @@ $(OUTPUT_CLI_RT) $(OUTPUT_SDK): $(MY_MAIN_PACKAGES)/.dirstamp $(RPM_DIRECTORIES)
cp $(RPM_RPMSDIR)/$(DOMAIN0_ARCH_OPTIMIZED)/xapi-xe-*.rpm $(MY_MAIN_PACKAGES)
cp $(RPM_RPMSDIR)/$(DOMAIN0_ARCH_OPTIMIZED)/xapi-xenops-*.rpm $(MY_MAIN_PACKAGES)
cp $(RPM_RPMSDIR)/$(DOMAIN0_ARCH_OPTIMIZED)/xapi-xenopsd-*.rpm $(MY_MAIN_PACKAGES)
- mkdir $(MY_XCP_PACKAGES)
+ mkdir -p $(MY_XCP_PACKAGES)
cp $(RPM_RPMSDIR)/$(DOMAIN0_ARCH_OPTIMIZED)/xapi-v6d-*.rpm $(MY_XCP_PACKAGES)
.PHONY: clean
clean:
rm -f $(OUTPUT_XAPI) $(OUTPUT_XAPI_DEVEL) $(OUTPUT_XAPI_SRC) $(OUTPUT_CLI_RT) $(OUTPUT_WEBZIP) $(OUTPUT_SDK)
- rm -rf $(OUTPUT_DATAMODEL_DIR) $(OUTPUT_DOCS) $(OUTPUT_SDK_DIR)
+ rm -rf $(OUTPUT_DATAMODEL_DIR) $(OUTPUT_DOCS) $(OUTPUT_SDK_DIR)/tmp \
+ $(MY_OUTPUT_DIR)/SRPMS $(RPM_RPMSDIR) $(MY_MAIN_PACKAGES) $(MY_XCP_PACKAGES)
$(MAKE) -C $(REPO) clean
Please sign in to comment.
Something went wrong with that request. Please try again.