Code Review / armband.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: fb79065)
Updated armband
authorMichal Skalski <mskalski@mirantis.com>
Fri, 8 Jul 2016 16:16:33 +0000 (16:16 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 8 Jul 2016 16:16:33 +0000 (16:16 +0000)
Project: fuel  16ea7e06170ba0bb62a164de5b33f19ccd1b1d12

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>
upstream/fuel patch | blob | history

diff --git a/upstream/fuel b/upstream/fuel
index 7c60084..16ea7e0 160000 (submodule)
--- a/upstream/fuel
+++ b/upstream/fuel
@@ -1 +1 @@
-Subproject commit 7c600840185d9b454c1995e35a9704db823fb5c6
+Subproject commit 16ea7e06170ba0bb62a164de5b33f19ccd1b1d12