X-Git-Url: https://oss.titaniummirror.com/gitweb?a=blobdiff_plain;f=Makefile;h=5ffcc6c4819f24ecf9bdab34d9479fffa273cabc;hb=a30cb143fe071853bbe524a8eab49b2fcbb99d02;hp=d4418cdd5710a9db9ebaa89faf56e574737d19bd;hpb=173a4fab89b786e9f6cc2474860592336cae5d71;p=cp210x.git

diff --git a/Makefile b/Makefile
index d4418cd..5ffcc6c 100644
--- a/Makefile
+++ b/Makefile
@@ -2,17 +2,31 @@
 # Essentially, it makes a debian source package which
 # then can be built by pbuilder, etc.
 
-DEBDIST = hardy
-BUILD = build
-KVER := $(shell uname -r)
-KSRCVER := $(shell echo $(KVER) | sed -e 's/-[0-9][^-]*-[a-zA-Z][^-]*$$//')
+# Change or override these values as necessary for each package release
+
 PKGVER  = 0.11
-SVNRELEASE := $(shell svn info | grep "Revision: " | sed -e s'/^[^0-9]*\([0-9]*\).*$$/\1/')
-DEBRELEASE := 0rsm$(SVNRELEASE)
+DEBDIST = hardy
+DEBRELEASE = 0tmi
+
+
+# No need to change anything below this line
+
+REPOID := $(shell svn info 2>/dev/null | grep "Revision: " | sed -e s'/^[^0-9]*\([0-9]*\).*$$/svn:revision \1/')
+ifeq (,$(REPOID))
+  REPOID := $(shell git svn info 2>/dev/null | grep "Revision: " | sed -e s'/^[^0-9]*\([0-9]*\).*$$/svn:revision \1/')
+ifeq (,$(REPOID))
+    REPOID := $(shell git log -n1 2>/dev/null | head -1 | sed -e s'/^/git:/')
+endif
+endif
+ifeq (,$(REPOID))
+  $(error You much check the code out via svn, git-svn, or git)
+endif
+
+BUILD := build
 DEBVER := $(PKGVER)-$(DEBRELEASE)
 RFC822DATE := $(shell date --rfc-822)
 ROOTNAME := cp210x
-PACKAGE := $(ROOTNAME)-module-$(KVER)
+PACKAGE := $(ROOTNAME)-module-dkms
 TARFILE := $(PACKAGE)_$(DEBVER).orig.tar.gz
 DEBSRC := $(PACKAGE)-$(PKGVER)
 ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -31,11 +45,14 @@ $(DEBFILE): $(BUILD)/debian-stamp
 	cd $(BUILD)/$(DEBSRC) && dpkg-buildpackage -sa -us -uc 
 
 
-$(BUILD)/src-stamp: $(wildcard src/*)
+$(BUILD)/src-stamp: $(wildcard src/*) dkms.conf
 	mkdir -p $(BUILD)
 	rm -rf $(BUILD)/$(DEBSRC)
 	cp -a src $(BUILD)/$(DEBSRC)
+	cp -a dkms.conf $(BUILD)/$(DEBSRC)
+	perl -i -pe 's/xxDEBVERxx/$(DEBVER)/g' $(BUILD)/$(DEBSRC)/dkms.conf
 	find $(BUILD)/$(DEBSRC) -name .svn -type d -exec rm -rf "{}" ";" 2>/dev/null || exit 0
+	rm -rf $(BUILD)/$(DEBSRC)/.git || exit 0
 	tar -C $(BUILD) -czf $(BUILD)/$(TARFILE) $(DEBSRC)
 	touch $@
 
@@ -43,15 +60,14 @@ $(BUILD)/src-stamp: $(wildcard src/*)
 configure: $(BUILD)/debian-stamp
 $(BUILD)/debian-stamp: $(BUILD)/src-stamp $(wildcard debian.in/*)
 	mkdir -p $(BUILD)/$(DEBSRC)/debian
-	rsync --quiet -avz --exclude=.svn/ debian.in/ $(BUILD)/$(DEBSRC)/debian/
+	rsync --quiet -avz --exclude=.svn/ --exclude=.git/ debian.in/ $(BUILD)/$(DEBSRC)/debian/
 	perl -i -pe 's/xxPACKAGExx/$(PACKAGE)/g' $(BUILD)/$(DEBSRC)/debian/*
 	perl -i -pe 's/xxROOTNAMExx/$(ROOTNAME)/g' $(BUILD)/$(DEBSRC)/debian/*
 	perl -i -pe 's/xxPKGVERxx/$(PKGVER)/g' $(BUILD)/$(DEBSRC)/debian/*
-	perl -i -pe 's/xxKVERxx/$(KVER)/g' $(BUILD)/$(DEBSRC)/debian/*
-	perl -i -pe 's/xxKSRCVERxx/$(KSRCVER)/g' $(BUILD)/$(DEBSRC)/debian/*
 	perl -i -pe 's/xxDEBVERxx/$(DEBVER)/g' $(BUILD)/$(DEBSRC)/debian/*
 	perl -i -pe 's/xxDEBDISTxx/$(DEBDIST)/g' $(BUILD)/$(DEBSRC)/debian/*
 	perl -i -pe 's/xxRFC822DATExx/$(RFC822DATE)/g' $(BUILD)/$(DEBSRC)/debian/*
+	perl -i -pe 's/xxREPOIDxx/$(REPOID)/g' $(BUILD)/$(DEBSRC)/debian/*
 	touch $@
 
 
@@ -61,9 +77,8 @@ clean:
 
 debug:
 	@echo "BUILD = $(BUILD)"
-	@echo "KVER = $(KVER)"
 	@echo "PKGVER = $(PKGVER)"
-	@echo "SVNRELEASE = |$(SVNRELEASE)|"
+	@echo "REPOID = $(REPOID)"
 	@echo "DEBRELEASE = $(DEBRELEASE)"
 	@echo "DEBVER = $(DEBVER)"
 	@echo "RFC822DATE = $(RFC822DATE)"