aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzangrc <zangrc.fnst@fujitsu.com>2021-04-16 09:41:04 +0800
committerBruce Ashfield <bruce.ashfield@gmail.com>2021-04-18 23:03:55 -0400
commit5a018a7a4fb788819aac35897b258c26fb2fc2da (patch)
tree70c7e9ec90b131db42d52722061411776985af8b
parenteb1ad5403e7572abfe21c62616e78c66e3da7131 (diff)
downloadmeta-cloud-services-master.tar.gz
meta-cloud-services-master.tar.bz2
meta-cloud-services-master.zip
novnc: upgrade 0.4 -> 1.2.0HEADmaster
Refer to Fedora's style and upgrade to the latest version. -License-Update: Copyright year updated to 2019. Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--meta-openstack/recipes-extended/novnc/novnc_git.bb51
1 files changed, 16 insertions, 35 deletions
diff --git a/meta-openstack/recipes-extended/novnc/novnc_git.bb b/meta-openstack/recipes-extended/novnc/novnc_git.bb
index 7099d85..53a7056 100644
--- a/meta-openstack/recipes-extended/novnc/novnc_git.bb
+++ b/meta-openstack/recipes-extended/novnc/novnc_git.bb
@@ -1,52 +1,33 @@
DESCRIPTION = "HTML5 VNC client"
HOMEPAGE = "https://github.com/kanaka/noVNC"
SECTION = "web"
-
-PR = "r0"
-
LICENSE = "MPL-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ac06308a999996ffc2d24d81b3a39f1b"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b428e7772bf00c07fb7b863b80358adf"
-SRCREV = "8f12ca7a5a64144fe548cada332d5d19ef26a1fe"
-PV = "0.4+git${SRCPV}"
+SRCREV = "9142f8f0f7b4a53447f5cfec3a797cbf0d6204a9"
+PV = "1.2.0+git${SRCPV}"
SRC_URI = "git://github.com/kanaka/noVNC.git"
S = "${WORKDIR}/git"
-RDEPENDS_${PN} += "python-numpy"
-RDEPENDS_${PN} += "python-novnc"
-RDEPENDS_${PN} += "python-websockify"
-
do_compile() {
:
}
+RDEPENDS_${PN} += " \
+ bash \
+"
+
do_install() {
- install -m 755 -d ${D}${bindir}/novnc
- install -m 755 -d ${D}${datadir}/novnc/include
-
- install -m 644 ${S}/vnc.html ${D}${datadir}/novnc
- install -m 644 ${S}/vnc_auto.html ${D}${datadir}/novnc
- install -m 644 ${S}/images/favicon.ico ${D}${datadir}/novnc
- install -m 644 ${S}/include/base64.js ${D}${datadir}/novnc/include
- install -m 644 ${S}/include/des.js ${D}${datadir}/novnc/include
- install -m 644 ${S}/include/display.js ${D}${datadir}/novnc/include
- install -m 644 ${S}/include/input.js ${D}${datadir}/novnc/include
- install -m 644 ${S}/include/logo.js ${D}${datadir}/novnc/include
- install -m 644 ${S}/include/base.css ${D}${datadir}/novnc/include
- install -m 644 ${S}/include/blue.css ${D}${datadir}/novnc/include
- install -m 644 ${S}/include/black.css ${D}${datadir}/novnc/include
- install -m 644 ${S}/include/playback.js ${D}${datadir}/novnc/include
- install -m 644 ${S}/include/rfb.js ${D}${datadir}/novnc/include
- install -m 644 ${S}/include/ui.js ${D}${datadir}/novnc/include
- install -m 644 ${S}/include/util.js ${D}${datadir}/novnc/include
- install -m 644 ${S}/include/websock.js ${D}${datadir}/novnc/include
- install -m 644 ${S}/include/webutil.js ${D}${datadir}/novnc/include
- install -m 644 ${S}/include/jsunzip.js ${D}${datadir}/novnc/include
-
- sed -i -e 's:#!/usr/bin/env bash:#!/bin/sh:' ${S}/utils/launch.sh
-
- install -m 755 ${S}/utils/launch.sh ${D}${bindir}/novnc-launch.sh
+ install -m 755 -d ${D}${datadir}/novnc
+
+ cp -R --no-dereference --preserve=mode,links ${S}/* ${D}${datadir}/novnc
+
+ install -m 444 ${S}/vnc.html ${D}${datadir}/novnc/index.html
+ install -m 444 ${S}/vnc_lite.html ${D}${datadir}/novnc/vnc_auto.html
+
+ install -m 755 -d ${D}${bindir}
+ install -m 644 ${S}/utils/launch.sh ${D}${bindir}/novnc_server
}