diff options
| author |   Michal Skalski <mskalski@mirantis.com> | 2015-05-18 14:57:00 +0000 |
|---|---|---|
| committer | Michal Skalski <mskalski@mirantis.com> | 2015-05-18 16:04:42 +0000 |
| commit | cae1a185c6d66f34b1f16f9f0e20f55e8d330346 (patch) | |
| tree | 2b98d45fe8487e8a774bfaf2903cd7a609bdc88b /fuel | |
| parent | 2debee7a4f97a6a9d90aa55877264b3c62e3e2df (diff) | |
Patch novnc ubuntu package
Patch novnc ubuntu package by adding missing files.
Related bug: https://bugs.launchpad.net/fuel/+bug/1433894
Change-Id: Iba413c664bb93dea26245c9ed4471fff30e43968
Jira: -
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
Diffstat (limited to 'fuel')
| -rw-r--r-- | fuel/build/patch-packages/Makefile | 2 | ||||
| -rw-r--r-- | fuel/build/patch-packages/novnc/Makefile | 22 | ||||
| -rwxr-xr-x | fuel/build/patch-packages/novnc/fix-missing.sh | 9 | ||||
| -rwxr-xr-x | fuel/build/patch-packages/tools/deb_pack | 2 |
4 files changed, 33 insertions, 2 deletions
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 |