From: Daniel Smith <daniel.smith@ericsson.com>
Date: Mon, 18 May 2015 17:31:44 +0000 (+0000)
Subject: Merge "Patch novnc ubuntu package"
X-Git-Tag: arno.2015.1.0~44
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2c4721fe4bb0395304c7606a1d565a5019a0565d;hp=c2fd77b3d35cc10518445f5a08591b2c2cad3093;p=genesis.git

Merge "Patch novnc ubuntu package"
---

diff --git a/fuel/build/patch-packages/Makefile b/fuel/build/patch-packages/Makefile
index 5d7d200..4388677 100644
--- a/fuel/build/patch-packages/Makefile
+++ b/fuel/build/patch-packages/Makefile
@@ -8,7 +8,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-SUBDIRS := debootstrap
+SUBDIRS := debootstrap novnc
 SUBCLEAN = $(addsuffix .clean,$(SUBDIRS))
 
 .PHONY: $(SUBDIRS) $(SUBCLEAN) clean
diff --git a/fuel/build/patch-packages/novnc/Makefile b/fuel/build/patch-packages/novnc/Makefile
new file mode 100644
index 0000000..16c0196
--- /dev/null
+++ b/fuel/build/patch-packages/novnc/Makefile
@@ -0,0 +1,22 @@
+# This is a temporary patch which add missing files
+# inside novnc ubuntu package.
+# Related bug: https://bugs.launchpad.net/fuel/+bug/1433894
+TOP := $(shell pwd)
+
+.PHONY: all
+all:
+
+.PHONY: clean
+clean:
+	@rm -rf package
+	@rm -rf *.deb
+	@rm -rf patch-replacements
+	@rm -rf .package
+
+.PHONY: release
+release:
+	../tools/deb_unpack novnc_0.5.1*.deb $(ORIGISO)
+	./fix-missing.sh
+	../tools/deb_pack $(REVSTATE)
+	@cp *.deb ../release/packages
+	@cat patch-replacements >> ../release/patch-replacements
diff --git a/fuel/build/patch-packages/novnc/fix-missing.sh b/fuel/build/patch-packages/novnc/fix-missing.sh
new file mode 100755
index 0000000..61ef1db
--- /dev/null
+++ b/fuel/build/patch-packages/novnc/fix-missing.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+MISSING_FILES="keyboard.js keysymdef.js keysym.js"
+NOVNC_SOURCE="http://raw.githubusercontent.com/kanaka/noVNC/v0.5.1/include"
+
+for file in $MISSING_FILES
+do
+  wget -P package/usr/share/novnc/include/ "$NOVNC_SOURCE/$file"
+done
diff --git a/fuel/build/patch-packages/tools/deb_pack b/fuel/build/patch-packages/tools/deb_pack
index f07a15d..f5d42de 100755
--- a/fuel/build/patch-packages/tools/deb_pack
+++ b/fuel/build/patch-packages/tools/deb_pack
@@ -21,7 +21,7 @@ ME=$(basename $0)
 
 trap my_exit EXIT
 
-REV=$1
+REV="$(echo $1 | tr '_' '-')"
 if [ -z "$REV" ]; then
   echo "$ME: Error - no revision info provided"
   exit 1