[WIP] Upgrade ONOS to karaf version 4.2.1
Change-Id: I7cd40c995bdf1c80f94b1895fb3344e32404c7fa
diff --git a/tools/package/onos_stage.py b/tools/package/onos_stage.py
index a9f519f..a6b46d4 100755
--- a/tools/package/onos_stage.py
+++ b/tools/package/onos_stage.py
@@ -27,6 +27,8 @@
written_files = set()
now = time.time()
+karaf_version = "4.2.1"
+karaf_system = "apache-karaf-" + karaf_version + "/system/"
def addFile(tar, dest, file, file_size):
if dest not in written_files:
@@ -69,7 +71,7 @@
for f in zip_part.infolist():
dest = f.filename
if base not in dest:
- dest = base + 'apache-karaf-3.0.8/system/' + f.filename
+ dest = base + karaf_system + f.filename
addFile(output, dest, zip_part.open(f), f.file_size)
elif '.oar' in file:
with ZipFile(file, 'r') as oar:
@@ -82,12 +84,12 @@
for f in oar.infolist():
filename = f.filename
if 'm2' in filename:
- dest = base + 'apache-karaf-3.0.8/system/' + filename[3:]
+ dest = base + karaf_system + filename[3:]
if dest not in written_files:
addFile(output, dest, oar.open(f), f.file_size)
written_files.add(dest)
elif 'features.xml' in file:
- dest = base + 'apache-karaf-3.0.8/system/org/onosproject/onos-features/%s/' % version
+ dest = base + karaf_system + 'org/onosproject/onos-features/%s/' % version
dest += 'onos-features-%s-features.xml' % version
with open(file, 'rb') as f:
addFile(output, dest, f, os.stat(file).st_size)