In order to allow sync'ing the kmod dir against arbitrary kernels trees,
extend the sync script to accept alternative paths and adjust the
Makefile accordingly.
Signed-off-by: Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
---
Makefile | 3 ++-
sync | 14 +++++++++++---
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 1e0420e..dad5f0b 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ ORIGMODDIR = $(patsubst %/build,%/kernel,$(KERNELDIR))
rpmrelease = devel
+KVM_VERSION = kvm-devel
LINUX = ./linux-2.6
ifeq ($(EXT_CONFIG_KVM_TRACE),y)
@@ -38,7 +39,7 @@ include $(MAKEFILE_PRE)
.PHONY: sync
sync:
- ./sync $(KVM_VERSION)
+ ./sync -v $(KVM_VERSION) -l $(LINUX)
install:
mkdir -p $(DESTDIR)/$(INSTALLDIR)
diff --git a/sync b/sync
index 4a89296..2e53a31 100755
--- a/sync
+++ b/sync
@@ -1,6 +1,7 @@
#!/usr/bin/python
import sys, os, glob, os.path, shutil, re
+from optparse import OptionParser
glob = glob.glob
@@ -8,12 +9,19 @@ def cmd(c):
if os.system(c) != 0:
raise Exception('command execution failed: ' + c)
-version = 'kvm-devel'
-if len(sys.argv) >= 2:
- version = sys.argv[1]
+parser = OptionParser(usage='usage: %prog [-v version][-l linuxkernel]')
+parser.add_option('-v', action='store', type='string', dest='version')
+parser.add_option('-l', action='store', type='string', dest='linux')
+(options, args) = parser.parse_args()
+version = 'kvm-devel'
linux = 'linux-2.6'
+if options.version:
+ version = options.version
+if options.linux:
+ linux = options.linux
+
_re_cache = {}
def re_cache(regexp):
Attachment:
signature.asc
Description: OpenPGP digital signature
