Merge pull request #478 from euanh/fix-ln-race

makesrpm: Avoid unlink races in ln -sf

planex/Makefile.rules

@@ -68,9 +68,15 @@ endif
 .DELETE_ON_ERROR:
 
 .PHONY: all rpms
-all: $(TOPDIR) $(RPMS)
+all: $(RPMS)
 
-$(RPMS): $(MOCK_CONFIGDIR)/$(MOCK_ROOT).cfg
+$(RPMS): RPMS MANIFESTS $(MOCK_CONFIGDIR)/$(MOCK_ROOT).cfg
+
+RPMS:
+	ln -s $(TOPDIR)/RPMS RPMS
+
+MANIFESTS:
+	ln -s $(TOPDIR)/MANIFESTS MANIFESTS
 
 $(TOPDIR)/RPMS/repodata/repomd.xml: $(RPMS)
 	$(AT)$(CREATEREPO) $(CREATEREPO_FLAGS) $(TOPDIR)/RPMS
@@ -92,7 +98,6 @@ clean:
 $(TOPDIR)/MANIFESTS/%.json:
 	@echo [MANIFEST] $@
 	$(AT) mkdir -p $(@D)
-	$(AT) ln -sf $(@D)
 	$(AT)$(MANIFEST) $(MANIFEST_FLAGS) $^ > $@
 
 
@@ -140,7 +145,6 @@ $(TOPDIR)/SOURCES/%/patches.tar: $(PINSDIR)/%.pin FORCE
 %.rpm:
 	@echo [MOCK] $<
 	$(AT) mkdir -p $(@D)
-	$(AT) ln -sf $(TOPDIR)/RPMS
 	$(AT)$(MOCK) $(MOCK_FLAGS) --rebuild $<