File xen-figlet-makefile.patch of Package xen.3680

Overview Repositories Revisions Requests Users Attributes Meta

File xen-figlet-makefile.patch of Package xen.3680

Index: xen-4.4.2-testing/xen/tools/Makefile
===================================================================
--- xen-4.4.2-testing.orig/xen/tools/Makefile
+++ xen-4.4.2-testing/xen/tools/Makefile
@@ -3,10 +3,12 @@ include $(XEN_ROOT)/Config.mk
 
 .PHONY: default
 default:
+	[ -d figlet ] && $(MAKE) -C figlet
 	$(MAKE) symbols
 
 .PHONY: clean
 clean:
+	[ -d figlet ] && $(MAKE) -C figlet clean
 	rm -f *.o symbols
 
 symbols: symbols.c
Index: xen-4.4.2-testing/xen/Makefile
===================================================================
--- xen-4.4.2-testing.orig/xen/Makefile
+++ xen-4.4.2-testing/xen/Makefile
@@ -114,12 +114,10 @@ delete-unfresh-files:
 	fi
 
 .banner: Makefile
-	@if which figlet >/dev/null 2>&1 ; then \
-		echo " Xen $(XEN_FULLVERSION)" | figlet -f tools/xen.flf > $@.tmp; \
-	else \
-		echo " Xen $(XEN_FULLVERSION)" > $@.tmp; \
-	fi
-	@mv -f $@.tmp $@
+	$(MAKE) -C tools
+	@tools/figlet/figlet -d tools/figlet Xen $(XEN_FULLVERSION) 2>$@2 >$@1
+	@cat $@1 $@2 >$@
+	@rm -f $@1 $@2
 
 # compile.h contains dynamic build info. Rebuilt on every 'make' invocation.
 include/xen/compile.h: include/xen/compile.h.in .banner
@@ -134,8 +132,8 @@ include/xen/compile.h: include/xen/compi
 	    -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \
 	    -e 's!@@changeset@@!$(shell tools/scmversion $(XEN_ROOT) || echo "unavailable")!g' \
 	    < include/xen/compile.h.in > $@.new
-	@cat .banner
-	@$(PYTHON) tools/fig-to-oct.py < .banner >> $@.new
+	@grep \" .banner >> $@.new
+	@grep -v \" .banner
 	@mv -f $@.new $@
 
 include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s

Places

File xen-figlet-makefile.patch of Package xen.3680

Places