From 86c9a14a415c23d189ef1aec8d398d76002d8336 Mon Sep 17 00:00:00 2001
From: Daniel Silverstone <daniel.silverstone@codethink.co.uk>
Date: Thu, 18 Sep 2014 10:48:51 +0000
Subject: Update SmartDeviceLink to release 3 and rename stratum

---
 strata/genivi-smartdevicelink.morph                | 38 ++++++++++++++++++++++
 strata/genivi-smartdevicelink/libapr-util.morph    | 10 ++++++
 strata/genivi-smartdevicelink/libapr.morph         |  9 +++++
 strata/genivi-smartdevicelink/log4cxx.morph        |  9 +++++
 .../genivi-smartdevicelink/smartdevicelink.morph   | 18 ++++++++++
 strata/smartdevicelink.morph                       | 38 ----------------------
 strata/smartdevicelink/libapr-util.morph           | 10 ------
 strata/smartdevicelink/libapr.morph                |  9 -----
 strata/smartdevicelink/log4cxx.morph               |  9 -----
 strata/smartdevicelink/smartdevicelink.morph       | 18 ----------
 10 files changed, 84 insertions(+), 84 deletions(-)
 create mode 100644 strata/genivi-smartdevicelink.morph
 create mode 100644 strata/genivi-smartdevicelink/libapr-util.morph
 create mode 100644 strata/genivi-smartdevicelink/libapr.morph
 create mode 100644 strata/genivi-smartdevicelink/log4cxx.morph
 create mode 100644 strata/genivi-smartdevicelink/smartdevicelink.morph
 delete mode 100644 strata/smartdevicelink.morph
 delete mode 100644 strata/smartdevicelink/libapr-util.morph
 delete mode 100644 strata/smartdevicelink/libapr.morph
 delete mode 100644 strata/smartdevicelink/log4cxx.morph
 delete mode 100644 strata/smartdevicelink/smartdevicelink.morph

diff --git a/strata/genivi-smartdevicelink.morph b/strata/genivi-smartdevicelink.morph
new file mode 100644
index 00000000..4167077b
--- /dev/null
+++ b/strata/genivi-smartdevicelink.morph
@@ -0,0 +1,38 @@
+kind: stratum
+name: smartdevicelink 
+description: Software for Smart Device Link by Ford
+build-depends:
+ - morph: strata/genivi-foundation.morph
+ - morph: strata/genivi.morph
+ - morph: strata/audio-bluetooth.morph
+ - morph: strata/qt5-tools-jetson.morph
+chunks:
+#- name: libapr
+#  repo: upstream:libapr
+#  morph: strata/smartdevicelink/libapr.morph
+#  ref: 1.5.1 
+#  build-depends: []
+- name: libapr-tarball
+  repo: upstream:libapr-tarball
+  ref: dea1efeb7f60fc6848e1e72b3fc973d0057565db
+  unpetrify-ref: baserock/morph
+  build-depends: []
+- name: libapr-util-tarball
+  morph: strata/trove/libapr-util-tarball.morph
+  repo: upstream:libapr-util-tarball
+  ref: daba269ee5a262cc23621b3ee37ed368d2a2b69b
+  unpetrify-ref: baserock/morph
+  build-depends:
+  - libapr-tarball
+- name: log4cxx                
+  repo: upstream:log4cxx
+  ref: master 
+  build-depends:  
+  - libapr-tarball                     
+  - libapr-util-tarball    
+- name: smartdevicelink                        
+  repo: upstream:smartdevicelink
+  morph: strata/genivi-smartdevicelink/smartdevicelink.morph
+  ref: 5a59c031430712fe270e72e8521866193c27fa56
+  build-depends:                       
+  - log4cxx                
diff --git a/strata/genivi-smartdevicelink/libapr-util.morph b/strata/genivi-smartdevicelink/libapr-util.morph
new file mode 100644
index 00000000..e838a3ee
--- /dev/null
+++ b/strata/genivi-smartdevicelink/libapr-util.morph
@@ -0,0 +1,10 @@
+name: libapr-util
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./buildconf
+- ./configure --prefix "$PREFIX"
+build-commands:
+- make
+install-commands:
+- make install
diff --git a/strata/genivi-smartdevicelink/libapr.morph b/strata/genivi-smartdevicelink/libapr.morph
new file mode 100644
index 00000000..ca0d4cbd
--- /dev/null
+++ b/strata/genivi-smartdevicelink/libapr.morph
@@ -0,0 +1,9 @@
+name: libapr
+kind: chunk
+configure-commands:
+- ./buildconf --verbose
+- ./configure --prefix "$PREFIX"
+build-commands:
+- make
+install-commands:
+- make install
diff --git a/strata/genivi-smartdevicelink/log4cxx.morph b/strata/genivi-smartdevicelink/log4cxx.morph
new file mode 100644
index 00000000..e236a952
--- /dev/null
+++ b/strata/genivi-smartdevicelink/log4cxx.morph
@@ -0,0 +1,9 @@
+name: log4cxx
+kind: chunk
+configure-commands:
+- ./autogen.sh 
+- ./configure --prefix="$PREFIX" --with-apr=/usr/lib/apr-2
+build-commands:
+- make
+install-commands:
+- make install
diff --git a/strata/genivi-smartdevicelink/smartdevicelink.morph b/strata/genivi-smartdevicelink/smartdevicelink.morph
new file mode 100644
index 00000000..1ab5cada
--- /dev/null
+++ b/strata/genivi-smartdevicelink/smartdevicelink.morph
@@ -0,0 +1,18 @@
+name: smartdevicelink
+kind: chunk
+
+configure-commands:
+    - cmake -D HMI2=ON .
+build-commands:
+    - make
+install-commands:
+    - make install DESTDIR=/
+    - mkdir -p $DESTDIR/opt/smartlink/include
+    - mkdir -p $DESTDIR/opt/smartlink/bin
+    - mkdir -p $DESTDIR/opt/smartlink/lib
+    - mkdir -p $DESTDIR/opt/smartlink/HMI
+    - cp -r SDL_Core/bin/* $DESTDIR/opt/smartlink/bin
+    - cp -r SDL_Core/include/* $DESTDIR/opt/smartlink/include
+    - cp -r SDL_Core/lib/* $DESTDIR/opt/smartlink/lib
+    - cp -r SDL_Core/src/components/HMI/* $DESTDIR/opt/smartlink/HMI
+    - echo "/opt/smartlink/HMI/index.html" > $DESTDIR/opt/smartlink/bin/hmi_link 
diff --git a/strata/smartdevicelink.morph b/strata/smartdevicelink.morph
deleted file mode 100644
index eed62e73..00000000
--- a/strata/smartdevicelink.morph
+++ /dev/null
@@ -1,38 +0,0 @@
-kind: stratum
-name: smartdevicelink 
-description: Software for Smart Device Link by Ford
-build-depends:
- - morph: strata/genivi-foundation.morph
- - morph: strata/genivi.morph
- - morph: strata/audio-bluetooth.morph
- - morph: strata/qt5-tools-jetson.morph
-chunks:
-#- name: libapr
-#  repo: upstream:libapr
-#  morph: strata/smartdevicelink/libapr.morph
-#  ref: 1.5.1 
-#  build-depends: []
-- name: libapr-tarball
-  repo: upstream:libapr-tarball
-  ref: dea1efeb7f60fc6848e1e72b3fc973d0057565db
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: libapr-util-tarball
-  morph: strata/trove/libapr-util-tarball.morph
-  repo: upstream:libapr-util-tarball
-  ref: daba269ee5a262cc23621b3ee37ed368d2a2b69b
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - libapr-tarball
-- name: log4cxx                
-  repo: upstream:log4cxx
-  ref: master 
-  build-depends:  
-  - libapr-tarball                     
-  - libapr-util-tarball    
-- name: smartdevicelink                        
-  repo: upstream:smartdevicelink
-  morph: strata/smartdevicelink/smartdevicelink.morph
-  ref: 8504605b01177da2e55bee6abe4c3f20c82da379
-  build-depends:                       
-  - log4cxx                
diff --git a/strata/smartdevicelink/libapr-util.morph b/strata/smartdevicelink/libapr-util.morph
deleted file mode 100644
index e838a3ee..00000000
--- a/strata/smartdevicelink/libapr-util.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: libapr-util
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./buildconf
-- ./configure --prefix "$PREFIX"
-build-commands:
-- make
-install-commands:
-- make install
diff --git a/strata/smartdevicelink/libapr.morph b/strata/smartdevicelink/libapr.morph
deleted file mode 100644
index ca0d4cbd..00000000
--- a/strata/smartdevicelink/libapr.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: libapr
-kind: chunk
-configure-commands:
-- ./buildconf --verbose
-- ./configure --prefix "$PREFIX"
-build-commands:
-- make
-install-commands:
-- make install
diff --git a/strata/smartdevicelink/log4cxx.morph b/strata/smartdevicelink/log4cxx.morph
deleted file mode 100644
index e236a952..00000000
--- a/strata/smartdevicelink/log4cxx.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: log4cxx
-kind: chunk
-configure-commands:
-- ./autogen.sh 
-- ./configure --prefix="$PREFIX" --with-apr=/usr/lib/apr-2
-build-commands:
-- make
-install-commands:
-- make install
diff --git a/strata/smartdevicelink/smartdevicelink.morph b/strata/smartdevicelink/smartdevicelink.morph
deleted file mode 100644
index 6eb26f3a..00000000
--- a/strata/smartdevicelink/smartdevicelink.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-name: smartdevicelink
-kind: chunk
-
-configure-commands:
-    - cd SDL_Core && cmake .
-build-commands:
-    - cd SDL_Core && make
-install-commands:
-    - cd SDL_Core && make install DESTDIR=/
-    - mkdir -p $DESTDIR/opt/smartlink/include
-    - mkdir -p $DESTDIR/opt/smartlink/bin
-    - mkdir -p $DESTDIR/opt/smartlink/lib
-    - mkdir -p $DESTDIR/opt/smartlink/HMI
-    - cp -r SDL_Core/bin/* $DESTDIR/opt/smartlink/bin
-    - cp -r SDL_Core/include/* $DESTDIR/opt/smartlink/include
-    - cp -r SDL_Core/lib/* $DESTDIR/opt/smartlink/lib
-    - cp -r SDL_Core/src/components/HMI/* $DESTDIR/opt/smartlink/HMI
-    - echo "/opt/smartlink/HMI/index.html" > $DESTDIR/opt/smartlink/bin/hmi_link 
-- 
cgit v1.2.1