Attachment 825995 Details for Bug 1031929 – patch refine hwcert Makefile to make sure tests do necessary compilation work rather than cleaning/installing the files

[patch] patch refine hwcert Makefile to make sure tests do necessary compilation work rather than cleaning/installing the files

0001-1031929-Refine-hwcert-Makefile-to-make-sure-tests-do.patch (text/plain), 4.78 KB, created by Dong Zhu on 2013-11-19 10:11:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dong Zhu

Created: 2013-11-19 10:11:23 UTC

Size: 4.78 KB

patch

obsolete

>From fe2d3d7a18a3317186bf7ba15d7f2da71f952d55 Mon Sep 17 00:00:00 2001
>From: Dong Zhu <dzhu@redhat.com>
>Date: Tue, 19 Nov 2013 17:58:15 +0800
>Subject: [PATCH] 1031929 - Refine hwcert Makefile to make sure tests do
> necessary compilation work rather than cleaning/installing the files
>
>Signed-off-by: Dong Zhu <dzhu@redhat.com>
>---
> docs/Makefile               | 6 ++----
> docs/man/Makefile           | 7 ++-----
> hwcert/Makefile             | 4 ++--
> test-env/bin/Makefile       | 8 ++++++--
> test-env/init/Makefile      | 7 ++++---
> test-env/kickstart/Makefile | 4 ++--
> test-env/lib/Makefile       | 6 +-----
> tests/Makefile              | 4 +++-
> 8 files changed, 22 insertions(+), 24 deletions(-)
>
>diff --git a/docs/Makefile b/docs/Makefile
>index fb98e0d..023623d 100644
>--- a/docs/Makefile
>+++ b/docs/Makefile
>@@ -13,14 +13,12 @@
> #
> # Author: Greg Nichols
> 
>-.PHONY: clean install
>+.PHONY: install clean
> 
>+all: ;
> 
> install:
> 	make -C man DESTDIR=$(DESTDIR) HWCERT_VERSION=$(HWCERT_VERSION) HWCERT_RELEASE=$(HWCERT_RELEASE) install
> 
> clean: 
> 	make -C man clean
>-	
>-
>-	
>diff --git a/docs/man/Makefile b/docs/man/Makefile
>index 3990a36..0cc4f51 100644
>--- a/docs/man/Makefile
>+++ b/docs/man/Makefile
>@@ -13,8 +13,9 @@
> #
> # Author: Greg Nichols
> 
>-.PHONY: clean install install-server
>+.PHONY: clean install-noarch install install-server
> 
>+all: ;
> 
> clean:
> 	rm -f $(DESTDIR)/usr/share/man/man8/hwcert.8.gz
>@@ -37,7 +38,3 @@ install:
> install-server:
> 	mkdir -p $(DESTDIR)/var/hwcert/docs
> 	if test -s /usr/bin/man2html; then /usr/bin/man2html  hwcert-backend.8 > $(DESTDIR)/var/www/hwcert/docs/index.html; fi
>-
>-	
>-
>-
>diff --git a/hwcert/Makefile b/hwcert/Makefile
>index be8eb35..261f65b 100644
>--- a/hwcert/Makefile
>+++ b/hwcert/Makefile
>@@ -14,12 +14,13 @@
> # Author: YangKun <ykun@redhat.com>
> 
> 
>-.PHONY: clean install install-site-packages
>+.PHONY: install clean unit-test
> 
> HWCERT_CLASS_LIB := /usr/share/hwcert/lib
> 
> UNITS := redhatrelease.py 
> 
>+all: ; 
> 
> install:
> 	rm -rf $(DESTDIR)$(HWCERT_CLASS_LIB)/hwcert
>@@ -32,4 +33,3 @@ clean:
> 
> unit-test: install
> 	for unit in $(UNITS); do python $(DESTDIR)$(HWCERT_CLASS_LIB)/hwcert/$$unit > unit-test.log; done
>-    
>diff --git a/test-env/bin/Makefile b/test-env/bin/Makefile
>index 4537d54..525717a 100644
>--- a/test-env/bin/Makefile
>+++ b/test-env/bin/Makefile
>@@ -13,11 +13,15 @@
> #
> # Author: Bill Peck
> 
>-.PHONY: clean
>+.PHONY: install clean
> 
> 
> FILES := hwcert hwcert-backend
> 
>-all install:
>+all: ;
>+
>+install:
> 	mkdir -p $(DESTDIR)/usr/bin
> 	for file in $(FILES); do install -m 755 $$file $(DESTDIR)/usr/bin; done
>+clean:
>+	for file in $(FILES); do rm -f $(DESTDIR)/usr/bin/$$file; done
>diff --git a/test-env/init/Makefile b/test-env/init/Makefile
>index 5105594..426438c 100644
>--- a/test-env/init/Makefile
>+++ b/test-env/init/Makefile
>@@ -12,15 +12,16 @@
> # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
> #
> # Author: Greg Nichols
>-.PHONY: clean
>+.PHONY: install clean
> 
> 
> FILES := hwcert-backend
> 
>-all install:
>+all: ;
>+
>+install:
> 	mkdir -p $(DESTDIR)/etc/init.d
> 	for file in $(FILES); do install -m 755 $$file $(DESTDIR)/etc/init.d; done
> 
> clean:
> 	for file in $(FILES); do rm -f $(DESTDIR)/etc/init.d/$$file; done
>-	
>\ No newline at end of file
>diff --git a/test-env/kickstart/Makefile b/test-env/kickstart/Makefile
>index 844c033..7066a24 100644
>--- a/test-env/kickstart/Makefile
>+++ b/test-env/kickstart/Makefile
>@@ -14,10 +14,11 @@
> # Author: YangKun <ykun@redhat.com>
> 
> 
>-.PHONY: clean install
>+.PHONY: install clean
> 
> HWCERT_KICKSTART_LIB := /usr/share/hwcert/kickstart
> 
>+all: ;
> 
> install:
> 	rm -rf $(DESTDIR)$(HWCERT_KICKSTART_LIB)
>@@ -26,4 +27,3 @@ install:
> 	
> clean:
> 	rm -rf $(DESTDIR)$(HWCERT_KICKSTART_LIB)
>-
>diff --git a/test-env/lib/Makefile b/test-env/lib/Makefile
>index ed6d348..784646f 100644
>--- a/test-env/lib/Makefile
>+++ b/test-env/lib/Makefile
>@@ -13,12 +13,11 @@
> #
> # Author: Bill Peck
> 
>-.PHONY: clean install
>+.PHONY: install install-info clean
> 
> FILES := hwcert-make.include
> INFO-FILES := kernelInfo.xml
> 
>-
> install:
> 	mkdir -p $(DESTDIR)/usr/share/hwcert/lib
> 	for file in $(FILES); do cp $$file $(DESTDIR)/usr/share/hwcert/lib; done
>@@ -29,6 +28,3 @@ install-info:
> 
> clean:
> 	rm -rf $(DESTDIR)/usr/share/hwcert/lib
>-
>-
>-
>diff --git a/tests/Makefile b/tests/Makefile
>index 97d3226..a9026b9 100644
>--- a/tests/Makefile
>+++ b/tests/Makefile
>@@ -13,10 +13,12 @@
> #
> # Author: Greg Nichols
> 
>-.PHONY: clean install
>+.PHONY: all clean install
> 
> SUBDIRS := audio bluray cdrom dvd core info memory network pccard storage tape usb video battery suspend lid expresscard cpuscaling profiler fv_core fv_memory fv_network fv_storage realtime reboot fencing wlan kdump infiniband
> 
>+all:
>+	for i in $(SUBDIRS); do $(MAKE) -C $$i; done
> clean:
> 	for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done
> 	rm -rf $(DESTDIR)/usr/share/hwcert/tests
>-- 
>1.8.3.1
>

Flags:

gnichols: review+

Actions: View | Diff

Attachments on bug 1031929: 825995