summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Ranostay <matt.ranostay@konsulko.com>2019-11-12 07:26:31 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2019-11-19 16:41:30 +0000
commitd8222a239eb57a6a48cadb3f9385b0e5beba38f2 (patch)
tree05e8421960a210db9cd1907d2f0e792626df03e2
parent28ea9b9f75aa10624808bf376d77a992a48e7139 (diff)
navigation: remove deprecated package
navigation is no longer used, and will not work with agl-service-navigation rewrite so must be removed. Bug-AGL: SPEC-2880 Change-Id: Ifbd96abfba2c46b1b20180ca86d5fcef2b1d5aae Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
-rw-r--r--recipes-demo-hmi/navigation/navigation-maps-jp_1.0.bb14
-rw-r--r--recipes-demo-hmi/navigation/navigation-maps-uk_1.0.bb14
-rw-r--r--recipes-demo-hmi/navigation/navigation-maps.inc14
-rw-r--r--recipes-demo-hmi/navigation/navigation/0001-switch-to-pipewire-output.patch34
-rw-r--r--recipes-demo-hmi/navigation/navigation/0002-openssl-1.1-fixes.patch31
-rw-r--r--recipes-demo-hmi/navigation/navigation/0003-update-permissions.patch22
-rw-r--r--recipes-demo-hmi/navigation/navigation/download_mapdata_jp.sh61
-rw-r--r--recipes-demo-hmi/navigation/navigation/download_mapdata_uk.sh61
-rw-r--r--recipes-demo-hmi/navigation/navigation/org.agl.naviapi.conf15
-rw-r--r--recipes-demo-hmi/navigation/navigation_git.bb52
10 files changed, 0 insertions, 318 deletions
diff --git a/recipes-demo-hmi/navigation/navigation-maps-jp_1.0.bb b/recipes-demo-hmi/navigation/navigation-maps-jp_1.0.bb
deleted file mode 100644
index 27979b3d..00000000
--- a/recipes-demo-hmi/navigation/navigation-maps-jp_1.0.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SUMMARY = "AGL Reference Navigation application Japan maps"
-DESCRIPTION = "Preload the Japanese maps for the AGL Navigation application."
-HOMEPAGE = "http://agl.wismobi.com/"
-SECTION = "apps"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM="file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"
-
-SRC_URI = "http://agl.wismobi.com/data/japan_TR9/navi_data.tar.gz"
-SRC_URI[md5sum] = "4fd44b0633d44d41c07227d086cd299c"
-SRC_URI[sha256sum] = "ce39a36741baccd6b40277acb8c81ebc181997c75483dffb46ccd22f7877295a"
-
-require navigation-maps.inc
-
-RCONFLICTS_${PN} = "navigation-maps-uk"
diff --git a/recipes-demo-hmi/navigation/navigation-maps-uk_1.0.bb b/recipes-demo-hmi/navigation/navigation-maps-uk_1.0.bb
deleted file mode 100644
index 1718c36b..00000000
--- a/recipes-demo-hmi/navigation/navigation-maps-uk_1.0.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SUMMARY = "AGL Reference Navigation application UK maps"
-DESCRIPTION = "Preload the UK maps for the AGL Navigation application."
-HOMEPAGE = "http://agl.wismobi.com/"
-SECTION = "apps"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM="file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"
-
-SRC_URI = "http://agl.wismobi.com/data/UnitedKingdom_TR9/navi_data_UK.tar.gz"
-SRC_URI[md5sum] = "f711c6d2c88553a1de4db9f7e12f6e8e"
-SRC_URI[sha256sum] = "515bdc81ac0615d541e0d18c186ad5cd24de2d47b60e13079a918f6dec802fd7"
-
-require navigation-maps.inc
-
-RCONFLICTS_${PN} = "navigation-maps-jp"
diff --git a/recipes-demo-hmi/navigation/navigation-maps.inc b/recipes-demo-hmi/navigation/navigation-maps.inc
deleted file mode 100644
index 49b7ab49..00000000
--- a/recipes-demo-hmi/navigation/navigation-maps.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-DEPENDS = "tar-native"
-
-SRC_URI_append = ";downloadfilename=${BP}.tar.gz;unpack=0"
-
-do_compile[noexec] = "1"
-
-do_install () {
- install -d ${D}${localstatedir}/mapdata
- tar -C ${D}${localstatedir}/mapdata --no-same-owner -xf ${WORKDIR}/${BP}.tar.gz
-}
-
-FILES_${PN} += "${localstatedir}/mapdata/*"
-
-RDEPENDS_${PN} += "navigation"
diff --git a/recipes-demo-hmi/navigation/navigation/0001-switch-to-pipewire-output.patch b/recipes-demo-hmi/navigation/navigation/0001-switch-to-pipewire-output.patch
deleted file mode 100644
index 53c1165d..00000000
--- a/recipes-demo-hmi/navigation/navigation/0001-switch-to-pipewire-output.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-gpsnavi: Switch to pipewire output
-
-Update the talk scripts to use pipewire output via gst-launch-1.0
-instead of PulseAudio's paplay. gstreamer is used to allow using the
-pipewire output sink and set its media role property.
-
-Upstream-Status: Inappropriate [no upstream]
-
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
-
-diff --git a/flite_agl.in b/flite_agl.in
-index 28b512c..be41d66 100644
---- a/flite_agl.in
-+++ b/flite_agl.in
-@@ -1,6 +1,6 @@
- #!/bin/sh
- TMP=/tmp/navi.wav
- echo "$1" | flite_hts_engine -m @datadir@/Voice/us/cmu_us_arctic_slt.htsvoice -o $TMP
--paplay --property='media.role=Navi' $TMP
-+gst-launch-1.0 filesrc location=$TMP ! decodebin ! audioconvert ! audioresample ! pwaudiosink stream-properties="p,media.role=Navigation"
- rm -f $TMP
-
-diff --git a/jtalk_agl.in b/jtalk_agl.in
-index 76900f4..0ca6975 100644
---- a/jtalk_agl.in
-+++ b/jtalk_agl.in
-@@ -1,6 +1,6 @@
- #!/bin/sh
- TMP=/tmp/navi.wav
- echo "$1" | open_jtalk -ow $TMP -m @exec_prefix@/share/Voice/mei/mei_normal.htsvoice -x @exec_prefix@/share/dic/
--paplay --property='media.role=Navi' $TMP
-+gst-launch-1.0 filesrc location=$TMP ! decodebin ! audioconvert ! audioresample ! pwaudiosink stream-properties="p,media.role=Navigation"
- rm -f $TMP
-
diff --git a/recipes-demo-hmi/navigation/navigation/0002-openssl-1.1-fixes.patch b/recipes-demo-hmi/navigation/navigation/0002-openssl-1.1-fixes.patch
deleted file mode 100644
index 9506ce11..00000000
--- a/recipes-demo-hmi/navigation/navigation/0002-openssl-1.1-fixes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-gpsnavi: Fix compilation with OpenSSL 1.1
-
-Handle the ERR_load_crypto_strings and ERR_free_strings functions no
-longer being present in OpenSSL 1.1.
-
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
-
-diff --git a/src/sms/sms-core/SMCAL/SMCAL.c b/src/sms/sms-core/SMCAL/SMCAL.c
-index eadab8f..2dfe1f3 100755
---- a/src/sms/sms-core/SMCAL/SMCAL.c
-+++ b/src/sms/sms-core/SMCAL/SMCAL.c
-@@ -158,7 +158,9 @@ void SC_CAL_Initialize_OpenSSL() {
- // 初期化
- ERR_load_BIO_strings();
- SSL_load_error_strings();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- ERR_load_crypto_strings();
-+#endif
- OpenSSL_add_all_algorithms();
-
- // SSLの初期化(戻り値は常に1)
-@@ -542,7 +544,9 @@ E_SC_CAL_RESULT SC_CAL_DisConnect(SMCAL *cal)
- if (NULL != cal->ssl.ctx) {
- SSL_CTX_free((SSL_CTX*)cal->ssl.ctx);
- }
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- ERR_free_strings();
-+#endif
-
- cal->ssl.ssl = NULL;
- cal->ssl.ctx = NULL;
diff --git a/recipes-demo-hmi/navigation/navigation/0003-update-permissions.patch b/recipes-demo-hmi/navigation/navigation/0003-update-permissions.patch
deleted file mode 100644
index 1f1ee491..00000000
--- a/recipes-demo-hmi/navigation/navigation/0003-update-permissions.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-gpsnavi: Update permissions
-
-Add the new display and audio permissions required with the change to
-running as non-root.
-
-Upstream-Status: Inappropriate [no upstream]
-
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
-
-diff --git a/agl/config.xml b/agl/config.xml
-index 9d4c0ca..44de94a 100755
---- a/agl/config.xml
-+++ b/agl/config.xml
-@@ -8,6 +8,8 @@
- <feature name="urn:AGL:widget:required-permission">
- <param name="urn:AGL:permission::public:no-htdocs" value="required" />
- <param name="http://tizen.org/privilege/internal/dbus" value="required" />
-+ <param name="urn:AGL:permission::public:display" value="required" />
-+ <param name="urn:AGL:permission::public:audio" value="required" />
- </feature>
- <feature name="urn:AGL:widget:required-api">
- <param name="homescreen" value="ws" />
diff --git a/recipes-demo-hmi/navigation/navigation/download_mapdata_jp.sh b/recipes-demo-hmi/navigation/navigation/download_mapdata_jp.sh
deleted file mode 100644
index 15120f89..00000000
--- a/recipes-demo-hmi/navigation/navigation/download_mapdata_jp.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-#
-# AGL Navigation mapdata download scripts
-#
-
-#--------------------------------------------------------------
-help()
-{
-bn=`basename $0`
-cat << EOF
-usage
-host: sudo $bn 'target_rootfs_path/'
-target : $bn /
-EOF
-
-}
-#-check para-------------------------------------------------------
-shift `expr $OPTIND - 1`
-
-if [ $# != 1 ]; then
- help
- exit
-fi
-
-rootfs=$1
-
-#----------------------------------------------------------------
-
-# check the if root? ------------------------------
-userid=`id -u`
-if [ $userid -ne "0" ]; then
- echo "you're not root? run with sudo"
- exit
-fi
-
-if [ ! -e $1 ]; then
- echo "rootfs:$1 not found"
- exit
-fi
-
-if [ ! -f $HOME/navi_data.tar.gz ]; then
- echo "no map data"
- echo "start downloading..."
- wget --directory-prefix=$HOME http://agl.wismobi.com/data/japan_TR9/navi_data.tar.gz
-else
- echo "use downloaded map data"
-fi
-
-mapdatadir=$rootfs/var/mapdata
-
-if [ ! -d $mapdatadir ]; then
- echo "map data directory does not exist"
- echo "create a directory" $mapdatadir
- mkdir -p $mapdatadir
-else
- echo "map data directory exists"
-fi
-
-tar xvzf $HOME/navi_data.tar.gz -C $mapdatadir
-sync
-echo "done.."
diff --git a/recipes-demo-hmi/navigation/navigation/download_mapdata_uk.sh b/recipes-demo-hmi/navigation/navigation/download_mapdata_uk.sh
deleted file mode 100644
index d1f9a796..00000000
--- a/recipes-demo-hmi/navigation/navigation/download_mapdata_uk.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-#
-# AGL Navigation mapdata download scripts
-#
-
-#--------------------------------------------------------------
-help()
-{
-bn=`basename $0`
-cat << EOF
-usage
-host: sudo $bn 'target_rootfs_path/'
-target : $bn /
-EOF
-
-}
-#-check para-------------------------------------------------------
-shift `expr $OPTIND - 1`
-
-if [ $# != 1 ]; then
- help
- exit
-fi
-
-rootfs=$1
-
-#----------------------------------------------------------------
-
-# check the if root? ------------------------------
-userid=`id -u`
-if [ $userid -ne "0" ]; then
- echo "you're not root? run with sudo"
- exit
-fi
-
-if [ ! -e $1 ]; then
- echo "rootfs:$1 not found"
- exit
-fi
-
-if [ ! -f $HOME/navi_data_UK.tar.gz ]; then
- echo "no map data"
- echo "start downloading..."
- wget --directory-prefix=$HOME http://agl.wismobi.com/data/UnitedKingdom_TR9/navi_data_UK.tar.gz
-else
- echo "use downloaded map data"
-fi
-
-mapdatadir=$rootfs/var/mapdata
-
-if [ ! -d $mapdatadir ]; then
- echo "map data directory does not exist"
- echo "create a directory" $mapdatadir
- mkdir -p $mapdatadir
-else
- echo "map data directory exists"
-fi
-
-tar xvzf $HOME/navi_data_UK.tar.gz -C $mapdatadir
-sync
-echo "done.."
diff --git a/recipes-demo-hmi/navigation/navigation/org.agl.naviapi.conf b/recipes-demo-hmi/navigation/navigation/org.agl.naviapi.conf
deleted file mode 100644
index 7f4d85f0..00000000
--- a/recipes-demo-hmi/navigation/navigation/org.agl.naviapi.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE busconfig PUBLIC
-"-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
-"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
- <policy context="default">
- <!-- Allow everyone to talk to main service. We'll later add an agent to
- only share the location if user allows it. -->
- <allow send_interface="org.agl.naviapi"/>
- </policy>
-
- <policy user="root">
- <!-- Allow root to own the name on the bus -->
- <allow own="org.agl.naviapi"/>
- </policy>
-</busconfig>
diff --git a/recipes-demo-hmi/navigation/navigation_git.bb b/recipes-demo-hmi/navigation/navigation_git.bb
deleted file mode 100644
index fefc0584..00000000
--- a/recipes-demo-hmi/navigation/navigation_git.bb
+++ /dev/null
@@ -1,52 +0,0 @@
-SUMMARY = "AGL Reference Navigation application."
-DESCRIPTION = "This application provides the function of Navigation to AGL. "
-HOMEPAGE = "http://agl.wismobi.com/"
-SECTION = "apps"
-
-LICENSE="GPLv2"
-LIC_FILES_CHKSUM="file://LICENSE;md5=3595e9c703a847d990664d2b396a9df0 \
- file://COPYING;md5=947b2d60ca3872e172034438e9801200"
-
-DEPENDS = " \
- glib-2.0 freetype sqlite3 wayland zlib expat openssl virtual/libgles2 virtual/libgl virtual/egl \
- wayland libdbus-c++ af-main af-binder libwindowmanager libhomescreen gstreamer1.0 \
- "
-
-RDEPENDS_${PN} = " flite openjtalk glib-2.0 freetype sqlite3 wayland zlib expat openssl \
- wayland libdbus-c++ af-main gstreamer1.0"
-
-RDEPENDS_${PN} += " agl-service-navigation "
-
-SRCREV="89dc0052aced411ef09f8e0034fb5cf2c96ee637"
-SRC_URI="git://github.com/AGLExport/gpsnavi.git;branch=agl \
- file://0001-switch-to-pipewire-output.patch \
- file://0002-openssl-1.1-fixes.patch \
- file://0003-update-permissions.patch \
- file://download_mapdata_jp.sh \
- file://download_mapdata_uk.sh \
- file://org.agl.naviapi.conf \
-"
-
-RPROVIDES_${PN} = "virtual/navigation"
-
-# To avoid C++ library link failure
-SECURITY_CFLAGS = ""
-
-inherit autotools pkgconfig
-inherit aglwgt
-
-S = "${WORKDIR}/git"
-
-do_install_append() {
-# mapdata install scripts
- install -d ${D}/usr/AGL/apps
- install -m 0755 ${WORKDIR}/download_mapdata_jp.sh ${D}/usr/AGL/apps/
- install -m 0755 ${WORKDIR}/download_mapdata_uk.sh ${D}/usr/AGL/apps/
-
- install -d ${D}/etc/dbus-1/session.d/
- install -m 0644 ${WORKDIR}/org.agl.naviapi.conf ${D}/etc/dbus-1/session.d/
-
- install -d ${D}/var/mapdata
-}
-
-FILES_${PN} += " /usr/AGL/apps/*.sh /var/mapdata "