[syslinux:firmware] Revert "Makefile.private: only delete mk/ devel.mk for production releases"

syslinux-bot for Matt Fleming matt.fleming at intel.com
Fri Jul 19 10:21:06 PDT 2013


Commit-ID:  56973f80f2728d3418b09047a7b023aa3c46e6e2
Gitweb:     http://www.syslinux.org/commit/56973f80f2728d3418b09047a7b023aa3c46e6e2
Author:     Matt Fleming <matt.fleming at intel.com>
AuthorDate: Fri, 19 Jul 2013 18:11:01 +0100
Committer:  Matt Fleming <matt.fleming at intel.com>
CommitDate: Fri, 19 Jul 2013 18:11:01 +0100

Revert "Makefile.private: only delete mk/devel.mk for production releases"

This reverts commit 8dc346bfdc871329624378d4b48db94b40d0b2a4.

Users are reporting a regression caused by this commit, as unlikely as
it seems. Revert in the hope that things will begin working for them
again.

Signed-off-by: Matt Fleming <matt.fleming at intel.com>

---
 Makefile.private | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile.private b/Makefile.private
index a0b3c2a..24905eb 100644
--- a/Makefile.private
+++ b/Makefile.private
@@ -18,8 +18,7 @@
 .PHONY: official release
 
 # These files are removed when tarballs are generated.
-PRE_PRIVATE = Makefile.private
-REL_PRIVATE = $(PRE_PRIVATE) mk/devel.mk
+PRIVATE = Makefile.private mk/devel.mk
 
 GIT_DIR ?= .git
 ABS_GIT_DIR := $(shell cd '$(GIT_DIR)' 2>/dev/null && pwd)
@@ -59,7 +58,7 @@ release:
 	rm -f release/syslinux-$(VERSION)/syslinux.spec.in
 	$(MAKE) -C release/syslinux-$(VERSION) official DATE=`date +%Y-%m-%d`
 
-	cd release/syslinux-$(VERSION) && rm -rf $(REL_PRIVATE)
+	cd release/syslinux-$(VERSION) && rm -rf $(PRIVATE)
 	cd release && tar cvvf - syslinux-$(VERSION) | \
 		gzip -9 > syslinux-$(VERSION).tar.gz
 	cd release/syslinux-$(VERSION) && \
@@ -88,7 +87,7 @@ prerel:
 		> $(PRERELDIR)/$(PREREL)/syslinux.spec
 	rm -f $(PRERELDIR)/$(PREREL)/syslinux.spec.in
 	$(MAKE) -C $(PRERELDIR)/$(PREREL) official DATE=`printf '%s-pre%d          ' $(VERSION) $(PRERELNO) | dd bs=10 count=1 2>/dev/null`
-	cd $(PRERELDIR)/$(PREREL) && rm -rf $(PRE_PRIVATE)
+	cd $(PRERELDIR)/$(PREREL) && rm -rf $(PRIVATE)
 	cd $(PRERELDIR) && tar cvvf - $(PREREL) | \
 		gzip -9 > $(PREREL).tar.gz
 	cd $(PRERELDIR)/$(PREREL) && \


More information about the Syslinux-commits mailing list