adopt "UsrMerge" philosophy (partly)#215
Conversation
There was a lot of duplication in the application recipes which
I try to remedy here with the apps.inc (former ics-apps.inc
which was unused).
The main changes here are:
- application recipes use the apps.inc which contains the common
parts of an application recipe
- Resources are installed according to AppStream guidelines
- /usr/share/applications (desktop file)
- /usr/share/app-info/icons/%{origin}/%{size} (icons)
- DISTRO_VERSION used as "origin"
- application executables are put in /usr/apps
- No real "standard" exists for application binaries
We are adopting the UsrMove system layout.
https://www.freedesktop.org/wiki/Software/systemd/TheCaseForTheUsrMerge/
Which is a requirement for usage of libostree.
[GDP-611] Prepare system for libostree
Signed-off-by: Mirza Krak <mirza.krak@endian.se>
Could not resist to do some cleaning. [GDP-611] Prepare system for libostree Signed-off-by: Mirza Krak <mirza.krak@endian.se>
Part of our migration to libostree and UsrMerge system layout.
"libdir" was added to INSANE_SKIP to get rid of:
cdl-concept-demo: found library in wrong location:
/usr/share/cdl/cdl/lib/libCDLClientSomeIp.so.1
warning which appeared when moved from /opt to /usr/share
[GDP-611] Prepare system for libostree
Signed-off-by: Mirza Krak <mirza.krak@endian.se>
|
Agreed - implementing "UsrMerge" makes sense for many reasons, and a lot of these recipes were all over the place, just needing someone to do some cleanup. |
|
qemu was failing to start - some problem upgrade - maybe a mismatch host/container. In any case an upgrade of qemu (inside go container) solved it. I re-triggered test stage. The test suite seems to run OK. One test still fails on RVI service not starting (due to changed paths). Should be a simple fix but is still an open issue we did not bring to conclusion. Ref: GENIVI/rvi_core#116 |
We updated the branch we fetch from "develop" to "install_to_usr" because there where a lot of hardcoded paths pointing to /opt. Once this is merged upstream we drop the SRC_URI change. Also adjust install paths (/etc/opt/rvi -> /etc/rvi), which was changed on "install_to_usr" branch [GDP-611] Prepare system for libostree Signed-off-by: Mirza Krak <mirza.krak@endian.se> (amended) Align .service file and installation steps to put rvi.config in /etc/rvi.config (one of them was set to /etc/rvi/rvi.config) Signed-off-by: Gunnar Andersson <gandersson@genivi.org>
|
Amended the last commit: systemd .service file was instructing rvi to look for the config at /etc/rvi/rvi.config but the installation steps puts it in /etc/rvi.config. (I'm not sure why the service launch uses both the CONFIG environment variable and a -c command line parameter, but I left it in there). |
|
That did the trick. Automated tests now run OK. salvator-x build fail - likely it just needs rebasing on latest master fixes. Rebasing & merging. |
1 similar comment
|
That did the trick. Automated tests now run OK. salvator-x build fail - likely it just needs rebasing on latest master fixes. Rebasing & merging. |
2 participants
Read more about UsrMerge.
This is actually required for libostree and these are changes that we have in our libostree branch that makes sense to merge even without the actual libostree support.
It is a set of commits that changes install paths to
/usrinstead of "all over the place".While doing above I did big revamp of HMI application recipe structure as there was a lot of duplication among the recipes.