From f0dcd3584751dd52d56c6bfa5d0ae70fcd53982a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan-Simon=20M=C3=B6ller?= <jsmoeller@linuxfoundation.org>
Date: Sat, 29 Oct 2016 14:24:34 +0200
Subject: [PATCH] Change /opt/AGL to /usr/AGL for ostree integration
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Ostree (sota) does not preserve /opt , so move /opt/AGL to /usr/AGL
for inclusion in the ota.

Fixes: SPEC-304

Change-Id: I1efcc9c0c2142e9b97f9dbd6b5972493ead8bebc
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---
 recipes-demo-hmi/ALS2016-demo/ALS2016-demo.bb   |  6 +++---
 recipes-demo-hmi/CES2016-demo/CES2016-demo.bb   |  6 +++---
 recipes-demo-hmi/HVAC/HVAC.bb                   |  4 ++--
 recipes-demo-hmi/HomeScreen/HomeScreen_0.3.3.bb | 20 ++++++++++----------
 recipes-demo-hmi/MediaPlayer/MediaPlayer.bb     |  4 ++--
 recipes-demo-hmi/Settings/Settings.bb           |  4 ++--
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/recipes-demo-hmi/ALS2016-demo/ALS2016-demo.bb b/recipes-demo-hmi/ALS2016-demo/ALS2016-demo.bb
index 8e43cfaa7..53ae931fc 100644
--- a/recipes-demo-hmi/ALS2016-demo/ALS2016-demo.bb
+++ b/recipes-demo-hmi/ALS2016-demo/ALS2016-demo.bb
@@ -31,8 +31,8 @@ do_configure() {
 
 # plain copy in own folder for now
 do_install() {
-    mkdir -p ${D}/opt/AGL/ALS2016/
-    cp -rf ./* ${D}/opt/AGL/ALS2016/
+    mkdir -p ${D}/usr/AGL/ALS2016/
+    cp -rf ./* ${D}/usr/AGL/ALS2016/
 }
 
-FILES_${PN} = "/opt/AGL/"
+FILES_${PN} = "/usr/AGL/"
diff --git a/recipes-demo-hmi/CES2016-demo/CES2016-demo.bb b/recipes-demo-hmi/CES2016-demo/CES2016-demo.bb
index 2a44b460d..c62460918 100644
--- a/recipes-demo-hmi/CES2016-demo/CES2016-demo.bb
+++ b/recipes-demo-hmi/CES2016-demo/CES2016-demo.bb
@@ -31,8 +31,8 @@ do_configure() {
 
 # plain copy in own folder for now
 do_install() {
-    mkdir -p ${D}/opt/AGL/CES2016/
-    cp -rf ./* ${D}/opt/AGL/CES2016/
+    mkdir -p ${D}/usr/AGL/CES2016/
+    cp -rf ./* ${D}/usr/AGL/CES2016/
 }
 
-FILES_${PN} = "/opt/AGL/"
+FILES_${PN} = "/usr/AGL/"
diff --git a/recipes-demo-hmi/HVAC/HVAC.bb b/recipes-demo-hmi/HVAC/HVAC.bb
index 681b84f0b..c19a29b04 100644
--- a/recipes-demo-hmi/HVAC/HVAC.bb
+++ b/recipes-demo-hmi/HVAC/HVAC.bb
@@ -25,7 +25,7 @@ do_configure() {
 
 # empty folder for now
 do_install() {
-    mkdir -p ${D}/opt/AGL/${PN}/
+    mkdir -p ${D}/usr/AGL/${PN}/
 }
 
-FILES_${PN} = "/opt/AGL/${PN}/"
+FILES_${PN} = "/usr/AGL/${PN}/"
diff --git a/recipes-demo-hmi/HomeScreen/HomeScreen_0.3.3.bb b/recipes-demo-hmi/HomeScreen/HomeScreen_0.3.3.bb
index dee561d42..d2c319a66 100644
--- a/recipes-demo-hmi/HomeScreen/HomeScreen_0.3.3.bb
+++ b/recipes-demo-hmi/HomeScreen/HomeScreen_0.3.3.bb
@@ -26,18 +26,18 @@ do_compile_prepend(){
 }
 
 do_install() {
-    install -d ${D}/opt/AGL/${PN}
-    install -m 0755 ${B}/HomeScreen/HomeScreen ${D}/opt/AGL/${PN}/
-    install -m 0755 ${B}/SampleAppTimeDate/SampleAppTimeDate ${D}/opt/AGL/${PN}/
-    install -m 0755 ${B}/HomeScreenAppFrameworkBinderTizen/HomeScreenAppFrameworkBinderTizen ${D}/opt/AGL/${PN}/
-    install -m 0755 ${B}/WindowManager/WindowManager ${D}/opt/AGL/${PN}/
-    install -m 0755 ${B}/InputEventManager/InputEventManager ${D}/opt/AGL/${PN}/
+    install -d ${D}/usr/AGL/${PN}
+    install -m 0755 ${B}/HomeScreen/HomeScreen ${D}/usr/AGL/${PN}/
+    install -m 0755 ${B}/SampleAppTimeDate/SampleAppTimeDate ${D}/usr/AGL/${PN}/
+    install -m 0755 ${B}/HomeScreenAppFrameworkBinderTizen/HomeScreenAppFrameworkBinderTizen ${D}/usr/AGL/${PN}/
+    install -m 0755 ${B}/WindowManager/WindowManager ${D}/usr/AGL/${PN}/
+    install -m 0755 ${B}/InputEventManager/InputEventManager ${D}/usr/AGL/${PN}/
 
 
-    install -d ${D}/opt/AGL/${PN}/colorschemes
-    cp -r ${B}/HomeScreen/colorschemes/* ${D}/opt/AGL/${PN}/colorschemes/
+    install -d ${D}/usr/AGL/${PN}/colorschemes
+    cp -r ${B}/HomeScreen/colorschemes/* ${D}/usr/AGL/${PN}/colorschemes/
 }
 
-FILES_${PN} += "/opt/AGL/${PN}/"
-FILES_${PN}-dbg += "/opt/AGL/${PN}/.debug"
+FILES_${PN} += "/usr/AGL/${PN}/"
+FILES_${PN}-dbg += "/usr/AGL/${PN}/.debug"
 
diff --git a/recipes-demo-hmi/MediaPlayer/MediaPlayer.bb b/recipes-demo-hmi/MediaPlayer/MediaPlayer.bb
index 681b84f0b..c19a29b04 100644
--- a/recipes-demo-hmi/MediaPlayer/MediaPlayer.bb
+++ b/recipes-demo-hmi/MediaPlayer/MediaPlayer.bb
@@ -25,7 +25,7 @@ do_configure() {
 
 # empty folder for now
 do_install() {
-    mkdir -p ${D}/opt/AGL/${PN}/
+    mkdir -p ${D}/usr/AGL/${PN}/
 }
 
-FILES_${PN} = "/opt/AGL/${PN}/"
+FILES_${PN} = "/usr/AGL/${PN}/"
diff --git a/recipes-demo-hmi/Settings/Settings.bb b/recipes-demo-hmi/Settings/Settings.bb
index 681b84f0b..c19a29b04 100644
--- a/recipes-demo-hmi/Settings/Settings.bb
+++ b/recipes-demo-hmi/Settings/Settings.bb
@@ -25,7 +25,7 @@ do_configure() {
 
 # empty folder for now
 do_install() {
-    mkdir -p ${D}/opt/AGL/${PN}/
+    mkdir -p ${D}/usr/AGL/${PN}/
 }
 
-FILES_${PN} = "/opt/AGL/${PN}/"
+FILES_${PN} = "/usr/AGL/${PN}/"
-- 
2.16.6