[PATCH] kdump-anaconda-addon: makefile cleanup

Dave Young dyoung at redhat.com
Mon Sep 1 03:00:18 UTC 2014


There's several wrong dependency issues in kdump addon makefiles, fix
them so that we can correctly update pot files before generating po files.

Signed-off-by: Dave Young <dyoung at redhat.com>
---
 kdump-anaconda-addon-003-Makefile-cleanup.patch | 55 +++++++++++++++++++++++++
 kexec-tools.spec                                |  7 ++++
 2 files changed, 62 insertions(+)
 create mode 100644 kdump-anaconda-addon-003-Makefile-cleanup.patch

diff --git a/kdump-anaconda-addon-003-Makefile-cleanup.patch b/kdump-anaconda-addon-003-Makefile-cleanup.patch
new file mode 100644
index 0000000..99c0054
--- /dev/null
+++ b/kdump-anaconda-addon-003-Makefile-cleanup.patch
@@ -0,0 +1,55 @@
+From f507b2d38a5de8eb75cfd288601943448dcd33e6 Mon Sep 17 00:00:00 2001
+From: Dave Young <dyoung at redhat.com>
+Date: Fri, 29 Aug 2014 17:38:13 +0800
+Subject: [PATCH] Makefile: cleanup
+
+po/Makefile:
+1. make all: not necessary to update po file, only update po files when you
+explictly "make update-po"
+2. makefile dependency fixes
+Makefile:
+make dist: not necessary to make update-po
+---
+ Makefile    | 1 -
+ po/Makefile | 6 ++----
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/kdump-anaconda-addon/Makefile b/kdump-anaconda-addon/Makefile
+index 8d0c5c1..f7c2fa8 100644
+--- a/kdump-anaconda-addon/Makefile
++++ b/kdump-anaconda-addon/Makefile
+@@ -36,7 +36,6 @@ uninstall:
+ 	rm -rfv $(DESTDIR)$(ADDONDIR)
+ 
+ dist: version.sh
+-	make -C po update-po
+ 	rm -rf $(NAME)
+ 	mkdir -p $(NAME)
+ 	@if test -d ".git"; \
+diff --git a/kdump-anaconda-addon/po/Makefile b/kdump-anaconda-addon/po/Makefile
+index b82cca4..5aa9042 100644
+--- a/kdump-anaconda-addon/po/Makefile
++++ b/kdump-anaconda-addon/po/Makefile
+@@ -26,7 +26,7 @@ MOFILES		= $(patsubst %.po,%.mo,$(POFILES))
+ PYSRC		= $(wildcard ../com_redhat_kdump/*.py ../com_redhat_kdump/*/*.py ../com_redhat_kdump/*/*/*.py)
+ GLADEFILES = $(wildcard ../com_redhat_kdump/gui/spokes/*.glade)
+ 
+-all::  update-po $(MOFILES)
++all: $(MOFILES)
+ 
+ potfile: $(PYSRC) glade-po
+ 	$(XGETTEXT) -L Python --keyword=_ --keyword=N_ $(PYSRC) tmp/*.h
+@@ -43,9 +43,7 @@ glade-po: $(GLADEFILES)
+ 		intltool-extract --type=gettext/glade -l $$f ;\
+ 	done
+ 
+-update-po: Makefile refresh-po potfile
+-
+-refresh-po: Makefile 
++update-po: potfile
+ 	for cat in $(POFILES); do \
+ 		if $(MSGMERGE) $$cat $(POTFILE)  --out=$$cat ; then \
+ 			echo "$(MSGMERGE) of $$cat succeeded" ; \
+-- 
+1.8.3.1
+
diff --git a/kexec-tools.spec b/kexec-tools.spec
index af0b898..b1e731a 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -85,6 +85,12 @@ Patch605: kexec-tools-2.0.4-makedumpfile-Remove-the-1st-bitmap-buffer-from-the-E
 Patch606: kexec-tools-2.0.4-makedumpfile-Move-counting-pfn_memhole-for-cyclic-mode.patch
 Patch607: kexec-tools-2.0.4-makedumpfile-Stop-maximizing-the-bitmap-buffer-to-reduc.patch
 
+#
+# Patch 701 through 800 are meant for kdump anaconda addon
+#
+
+Patch701: kdump-anaconda-addon-003-Makefile-cleanup.patch
+
 %description
 kexec-tools provides /sbin/kexec binary that facilitates a new
 kernel to boot using the kernel's kexec feature either on a
@@ -126,6 +132,7 @@ tar -z -x -v -f %{SOURCE23}
 %patch605 -p1
 %patch606 -p1
 %patch607 -p1
+%patch701 -p1
 
 %ifarch ppc
 %define archdef ARCH=ppc
-- 
1.8.3.1



More information about the kexec mailing list