summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-07-08 17:26:51 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-07-08 17:31:07 +0200
commit592d0afcbafe9ae922fee4de2fd368e6cb43a4ff (patch)
tree66c1708e5aa828b28815e54253adbf0be1fc333c
parentf59b4e0786f11e2799990beeaf0e4a148c3572af (diff)
deploy: ISO rebuild: use -joliet-long names.
Armband adds similar files, which tend to have long names and only differ in suffixes (e.g. DEBs for amd64 vs arm64). Previous change [1] fixed ISO build errors, but failed to address the deploy.py ISO rebuild (which modifies and recreates the ISO, calling mkisofs, which complains about clashing file indexes). This works around ISO rebuild error(s) like: "genisoimage: Error: ./ubuntu/pool/main/g/golang-gogoprotobuf/golang-gogoprotobuf\ -dev_0.0~git20150828.0.6cab0cc-1~u14.04+mos1_arm64.deb and ./ubuntu/pool/main/g/golang-gogoprotobuf/golang-gogoprotobuf\ -dev_0.0~git20150828.0.6cab0cc-1~u14.04+mos1_amd64.deb have the same Joliet name" [1] https://gerrit.opnfv.org/gerrit/#/c/14973/ Change-Id: If58a18ba46343a52ce6e9a0a6a0482c1a3079451 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rwxr-xr-xdeploy/deploy.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/deploy/deploy.py b/deploy/deploy.py
index 8064af993..c3a69daa6 100755
--- a/deploy/deploy.py
+++ b/deploy/deploy.py
@@ -164,6 +164,7 @@ class AutoDeploy(object):
exec_cmd('mkisofs -quiet -r -J -R -b %s '
'-no-emul-boot -boot-load-size 4 '
'-boot-info-table -hide-rr-moved '
+ '-joliet-long '
'-x "lost+found:" -V %s -o %s .'
% (iso_linux_bin, iso_label, new_iso))