diff options
| author |   Loïc Collignon <loic.collignon@iot.bzh> | 2018-06-27 14:58:28 +0200 |
|---|---|---|
| committer | Loïc Collignon <loic.collignon@iot.bzh> | 2018-06-27 17:14:36 +0200 |
| commit | b20cef25a391b5d6bf46746b2e1156914aa22cba (patch) | |
| tree | f5a93db79e4af3480037ba0b5cb0321cc7f9f2b6 /conf.d | |
| parent | f1f15455d62e56135cd5e0131d415bbbc2a78fb6 (diff) | |
| parent | ad756056a4052e6eb128072d7852c0dbf0c0ed59 (diff) | |
Merge branch 'eel' into 'master'
Replace the whole content of 'master' by the content of 'eel' as it is
the new version using the new API.
Change-Id: Ifc72f9dfa44d678aefb1641c8cebca97b2aeffbe
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
Diffstat (limited to 'conf.d')
| m--------- | conf.d/app-templates | 0 | ||||
| -rwxr-xr-x | conf.d/autobuild/agl/autobuild | 2 | ||||
| -rwxr-xr-x | conf.d/autobuild/linux/autobuild | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/conf.d/app-templates b/conf.d/app-templates -Subproject 80d95bb8518874a4d510951c905491835bdf831 +Subproject 1f2944eea3a418ec02920673a390ed4b5d417a2 diff --git a/conf.d/autobuild/agl/autobuild b/conf.d/autobuild/agl/autobuild index 3a1ba5f..83097ab 100755 --- a/conf.d/autobuild/agl/autobuild +++ b/conf.d/autobuild/agl/autobuild @@ -55,7 +55,7 @@ package: build @mkdir -p ${BUILD_DIR}/$@/etc @mkdir -p ${BUILD_DIR}/$@/lib @mkdir -p ${BUILD_DIR}/$@/htdocs - @mkdir -p ${BUILD_DIR}/$@/data + @mkdir -p ${BUILD_DIR}/$@/var @cmake --build ${BUILD_DIR} --target widget @mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST} diff --git a/conf.d/autobuild/linux/autobuild b/conf.d/autobuild/linux/autobuild index 3a1ba5f..83097ab 100755 --- a/conf.d/autobuild/linux/autobuild +++ b/conf.d/autobuild/linux/autobuild @@ -55,7 +55,7 @@ package: build @mkdir -p ${BUILD_DIR}/$@/etc @mkdir -p ${BUILD_DIR}/$@/lib @mkdir -p ${BUILD_DIR}/$@/htdocs - @mkdir -p ${BUILD_DIR}/$@/data + @mkdir -p ${BUILD_DIR}/$@/var @cmake --build ${BUILD_DIR} --target widget @mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST} |