summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD9
-rw-r--r--cli.patch24
-rw-r--r--emulator.patch12
4 files changed, 38 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cb815fa894a4..27e95e7e92f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = webos-sdk
- pkgver = 6.0.0
+ pkgver = 6.0.1
pkgrel = 1
url = http://webostv.developer.lge.com/sdk/installation/
arch = x86_64
@@ -14,8 +14,8 @@ pkgbase = webos-sdk
source = webOSIDE TV.desktop
source = ide-launcher.sh
sha512sums = SKIP
- sha512sums = 18e071d96b0e4cc57f4f51818cd2919b916551b5a3353fa69c0f966246dddcd1c17347932d3350f608554a1f10cd88b1d84d80bd1cbdfccfc2011cafe3f5ea78
- sha512sums = 0eacf0a1f121f71df8fed007392d139d96817d18234026e6e2347d20e99ad0e4e5d1c9a8d31e2badef45ccf8f0d961d762f442da3aa8f98b74d23b8661525259
+ sha512sums = d2587eb95877c20ad37eb43147c4ce8538d9d3061b2b4b4ce5118a27880cbafcba8c3c0268865f47510f8a85b7d50a62e9978714e1ace78d8ec79862b5903d7b
+ sha512sums = 7a7128a88ce824a7e4afb8b6590002cbb58655db8389b4c7535ef3645edae1f0c84ca628a86f0663a44ee96c6e448f1f4a5f53545ece3ad36115662ca6e029c3
sha512sums = d71730e1463e08ac018c5d4782f36df9d6b93decfe823441e9836b51443a4c9ef473f3be931febc72c9c875539b5f79a1ca90a5539585c5f7067cc144e173cb4
sha512sums = 60655118d3880b07ea19af1a316ecfc4b649cdd2b9672db5c8ce5c32cb246b8ff3cc4ec82b176b042c3622f3897e6702e8e30c060576869b826f25d2d5a472f1
sha512sums = 62d6de217f9a02deda2b945793a9a4df56264688c32406e5962336b8c4a00d74d84dfd14f86a8651d1ffc4cccecf50b6f3e3ead34bc9033eea27b60f2643568f
diff --git a/PKGBUILD b/PKGBUILD
index 7b8fe6612604..86379101bc4d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgbase=webos-sdk
pkgname=('webos-cli' 'webos-emulator' 'webos-ide')
-pkgver=6.0.0
+pkgver=6.0.1
pkgrel=1
arch=('x86_64')
url='http://webostv.developer.lge.com/sdk/installation/'
@@ -18,8 +18,8 @@ source=(
'ide-launcher.sh'
)
sha512sums=('SKIP'
- '18e071d96b0e4cc57f4f51818cd2919b916551b5a3353fa69c0f966246dddcd1c17347932d3350f608554a1f10cd88b1d84d80bd1cbdfccfc2011cafe3f5ea78'
- '0eacf0a1f121f71df8fed007392d139d96817d18234026e6e2347d20e99ad0e4e5d1c9a8d31e2badef45ccf8f0d961d762f442da3aa8f98b74d23b8661525259'
+ 'd2587eb95877c20ad37eb43147c4ce8538d9d3061b2b4b4ce5118a27880cbafcba8c3c0268865f47510f8a85b7d50a62e9978714e1ace78d8ec79862b5903d7b'
+ '7a7128a88ce824a7e4afb8b6590002cbb58655db8389b4c7535ef3645edae1f0c84ca628a86f0663a44ee96c6e448f1f4a5f53545ece3ad36115662ca6e029c3'
'd71730e1463e08ac018c5d4782f36df9d6b93decfe823441e9836b51443a4c9ef473f3be931febc72c9c875539b5f79a1ca90a5539585c5f7067cc144e173cb4'
'60655118d3880b07ea19af1a316ecfc4b649cdd2b9672db5c8ce5c32cb246b8ff3cc4ec82b176b042c3622f3897e6702e8e30c060576869b826f25d2d5a472f1'
'62d6de217f9a02deda2b945793a9a4df56264688c32406e5962336b8c4a00d74d84dfd14f86a8651d1ffc4cccecf50b6f3e3ead34bc9033eea27b60f2643568f')
@@ -37,9 +37,9 @@ package_webos-cli() {
cp -dr --no-preserve='ownership' CLI/LICENSE.txt "${pkgdir}"/usr/share/licenses/webos-sdk/
cp -dr --no-preserve='ownership' CLI "${pkgdir}"/usr/share/webOS_TV_SDK/
chmod +x "${pkgdir}"/usr/share/webOS_TV_SDK/CLI/bin/node
- chmod +x "${pkgdir}"/usr/share/webOS_TV_SDK/CLI/bin/node
chmod +x "${pkgdir}"/usr/share/webOS_TV_SDK/CLI/bin/ares
chmod +x "${pkgdir}"/usr/share/webOS_TV_SDK/CLI/bin/ares-device-info
+ chmod +x "${pkgdir}"/usr/share/webOS_TV_SDK/CLI/bin/ares-extend-dev
chmod +x "${pkgdir}"/usr/share/webOS_TV_SDK/CLI/bin/ares-generate
chmod +x "${pkgdir}"/usr/share/webOS_TV_SDK/CLI/bin/ares-inspect
chmod +x "${pkgdir}"/usr/share/webOS_TV_SDK/CLI/bin/ares-install
@@ -50,6 +50,7 @@ package_webos-cli() {
chmod +x "${pkgdir}"/usr/share/webOS_TV_SDK/CLI/bin/ares-setup-device
ln -sf /usr/share/webOS_TV_SDK/CLI/bin/ares "${pkgdir}"/usr/bin/ares
ln -sf /usr/share/webOS_TV_SDK/CLI/bin/ares-device-info "${pkgdir}"/usr/bin/ares-device-info
+ ln -sf /usr/share/webOS_TV_SDK/CLI/bin/ares-extend-dev "${pkgdir}"/usr/bin/ares-extend-dev
ln -sf /usr/share/webOS_TV_SDK/CLI/bin/ares-generate "${pkgdir}"/usr/bin/ares-generate
ln -sf /usr/share/webOS_TV_SDK/CLI/bin/ares-inspect "${pkgdir}"/usr/bin/ares-inspect
ln -sf /usr/share/webOS_TV_SDK/CLI/bin/ares-install "${pkgdir}"/usr/bin/ares-install
diff --git a/cli.patch b/cli.patch
index 4cc7a483ccdb..cf7d2364fe99 100644
--- a/cli.patch
+++ b/cli.patch
@@ -22,6 +22,30 @@ diff --unified --recursive --text CLI/bin/ares "CLI (copy)/bin/ares"
# run node script with imported params
-PATH="$BIN_DIR:$PATH" node "$SCRIPT" "$@"
+$BIN_DIR/$CLI_ARCH/node "$SCRIPT" "$@"
+diff --unified --recursive --text CLI/bin/ares-extend-dev "CLI (copy)/bin/ares-extend-dev"
+--- CLI/bin/ares-extend-dev 2020-02-05 13:56:34.000000000 +0000
++++ "CLI (copy)/bin/ares-extend-dev" 2020-05-20 17:53:41.426428160 +0100
+@@ -1,7 +1,13 @@
+ #!/bin/bash
+
+ # the folder this script is in
+-BIN_DIR=$(cd "`dirname "$0"`" && pwd)
++SOURCE="${BASH_SOURCE[0]}"
++while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
++ DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
++ SOURCE="$(readlink "$SOURCE")"
++ [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
++done
++BIN_DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
+
+ # node script we are going to run
+ SCRIPT="${BIN_DIR}/ares-extend-dev.js"
+@@ -16,4 +19,4 @@
+ export NODE_PATH=$(cd "${BIN_DIR}/../lib" && pwd)
+
+ # run node script with imported params
+-PATH="$BIN_DIR:$PATH" node "$SCRIPT" "$@"
++$BIN_DIR/$ARCH/node "$SCRIPT" "$@"
diff --unified --recursive --text CLI/bin/ares-device-info "CLI (copy)/bin/ares-device-info"
--- CLI/bin/ares-device-info 2020-02-05 13:56:34.000000000 +0000
+++ "CLI (copy)/bin/ares-device-info" 2020-05-20 17:53:41.426428160 +0100
diff --git a/emulator.patch b/emulator.patch
index 691de94a42ae..3b56bedbd334 100644
--- a/emulator.patch
+++ b/emulator.patch
@@ -2,20 +2,20 @@ diff --unified --recursive --text Emulator/v6.0.0/AppManager.sh "Emulator (copy)
--- Emulator/v6.0.0/AppManager.sh 2020-02-11 15:09:50.000000000 +0000
+++ "Emulator (copy)/v6.0.0/AppManager.sh" 2020-05-20 21:54:03.378154488 +0100
@@ -1 +1,4 @@
--"$LG_WEBOS_TV_SDK_HOME/Resources/Jre/bin/java" -jar "$LG_WEBOS_TV_SDK_HOME/Emulator/v6.0.0/AppManager-1.0.jar" 9e8b9f29-44b2-4b6e-3053-2058a70342cb
+-"$LG_WEBOS_TV_SDK_HOME/Resources/Jre/bin/java" -jar "$LG_WEBOS_TV_SDK_HOME/Emulator/v6.0.0/AppManager-1.0.jar" 9e8b9f29-44b2-4b6e-3053-3058a70342cb
+#!/bin/bash
+export LG_WEBOS_TV_SDK_HOME=/usr/share/webOS_TV_SDK
+export WEBOS_CLI_TV=/usr/share/webOS_TV_SDK/CLI/bin
-+java -jar "$LG_WEBOS_TV_SDK_HOME/Emulator/v6.0.0/AppManager-1.0.jar" 9e8b9f29-44b2-4b6e-3053-2058a70342cb
++java -jar "$LG_WEBOS_TV_SDK_HOME/Emulator/v6.0.0/AppManager-1.0.jar" 9e8b9f29-44b2-4b6e-3053-3058a70342cb
diff --unified --recursive --text Emulator/v6.0.0/LG_webOS_TV_Emulator.sh "Emulator (copy)/v6.0.0/LG_webOS_TV_Emulator.sh"
--- Emulator/v6.0.0/LG_webOS_TV_Emulator.sh 2020-02-11 15:09:50.000000000 +0000
+++ "Emulator (copy)/v6.0.0/LG_webOS_TV_Emulator.sh" 2020-05-20 21:53:32.861986893 +0100
@@ -1 +1,4 @@
--"$LG_WEBOS_TV_SDK_HOME/Resources/Jre/bin/java" -jar "$LG_WEBOS_TV_SDK_HOME/Emulator/v6.0.0/LG_webOS_TV_Emulator_linux.jar" 9e8b9f29-44b2-4b6e-3053-2058a70342cb
+-"$LG_WEBOS_TV_SDK_HOME/Resources/Jre/bin/java" -jar "$LG_WEBOS_TV_SDK_HOME/Emulator/v6.0.0/LG_webOS_TV_Emulator_linux.jar" 9e8b9f29-44b2-4b6e-3053-3058a70342cb
+#!/bin/bash
+export LG_WEBOS_TV_SDK_HOME=/usr/share/webOS_TV_SDK
+export WEBOS_CLI_TV=/usr/share/webOS_TV_SDK/CLI/bin
-+java -jar "$LG_WEBOS_TV_SDK_HOME/Emulator/v6.0.0/LG_webOS_TV_Emulator_linux.jar" 9e8b9f29-44b2-4b6e-3053-2058a70342cb
++java -jar "$LG_WEBOS_TV_SDK_HOME/Emulator/v6.0.0/LG_webOS_TV_Emulator_linux.jar" 9e8b9f29-44b2-4b6e-3053-3058a70342cb
diff --unified --recursive --text Emulator/v6.0.0/vm_register.sh "Emulator (copy)/v5.0.0/vm_register.sh"
--- Emulator/v6.0.0/vm_register.sh 2020-02-11 15:09:50.000000000 +0000
+++ "Emulator (copy)/v6.0.0/vm_register.sh" 2020-05-20 21:56:28.742383887 +0100
@@ -35,6 +35,6 @@ diff --unified --recursive --text Emulator/v6.0.0/vm_remove.sh "Emulator (copy)/
# remove emulator
+export LG_WEBOS_TV_SDK_HOME=/usr/share/webOS_TV_SDK
- vboxmanage controlvm 9e8b9f29-44b2-4b6e-3053-2058a70342cb pause
- vboxmanage controlvm 9e8b9f29-44b2-4b6e-3053-2058a70342cb poweroff
+ vboxmanage controlvm 9e8b9f29-44b2-4b6e-3053-3058a70342cb pause
+ vboxmanage controlvm 9e8b9f29-44b2-4b6e-3053-3058a70342cb poweroff
sleep 3