[DRBD-cvs] svn commit by lars - r2598 - trunk - improve error
messages for check_changelogs_up2date tar
drbd-cvs at lists.linbit.com
drbd-cvs at lists.linbit.com
Thu Nov 16 11:34:43 CET 2006
Author: lars
Date: 2006-11-16 11:34:43 +0100 (Thu, 16 Nov 2006)
New Revision: 2598
Modified:
trunk/Makefile
Log:
improve error messages for check_changelogs_up2date target
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2006-11-16 10:33:25 UTC (rev 2597)
+++ trunk/Makefile 2006-11-16 10:34:43 UTC (rev 2598)
@@ -46,13 +46,19 @@
LN_S = ln -s
RPMBUILD=rpmbuild
-all:
- @ set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i ; done
- @ echo -e "\n\tBuild successful."
+all: tools module
+module:
+ @if [ -z "$(KVER)" ]; then \
+ echo "Could not determine uts_release" ; \
+ false ; \
+ fi
+ @ $(MAKE) -C drbd
+ @ echo -e "\n\tModule build was successful."
+
tools:
@ set -e; for i in $(patsubst drbd,,$(SUBDIRS)); do $(MAKE) -C $$i ; done
- @ echo -e "\n\tBuild successful."
+ @ echo -e "\n\tUserland tools build was successful."
doc:
$(MAKE) -C documentation doc
@@ -87,15 +93,15 @@
-e '/^\*.* \['"$$dver_re"'-/p' < drbd.spec.in) ; \
if test -z "$$in_changelog" ; \
then \
- echo "You need to update the %changelog in drbd.spec.in"; \
+ echo -e "\n\t%changelog in drbd.spec.in needs update"; \
up2date=false; fi; \
if ! grep "^$$dver_re\>" >/dev/null 2>&1 ChangeLog; \
then \
- echo "You need to update ChangeLog"; \
+ echo -e "\n\tChangeLog needs update"; \
up2date=false; fi ; \
if ! grep "^drbd8 ($$dver_re-" >/dev/null 2>&1 debian/changelog; \
then \
- echo -e "\n\n\tdebian/changelog needs some update\n"; \
+ echo -e "\n\tdebian/changelog needs update [ignored]\n"; \
: do not fail the build because of outdated debian/changelog ; fi ; \
$$up2date
@@ -160,9 +166,6 @@
KDIR := $(shell echo /lib/modules/`uname -r`/build)
KVER := $(shell KDIR=$(KDIR) O=$(O) scripts/get_uts_release.sh)
-ifeq ($(KVER),)
-$(error "could not determine uts_release")
-endif
kernel-patch: drbd/drbd_buildtag.c
set -o errexit; \
More information about the drbd-cvs
mailing list