diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2019-05-02 08:45:10 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2019-05-02 09:38:58 +0200 |
| commit | 27c1f958d0857bc1964fcc664a2f321e34d28958 (patch) | |
| tree | 38fa7641a3531aa18fcf85b563b5dec952c05606 | |
| parent | 484f3c0ca68456dcd8b0e59212020f57b0ac5e0b (diff) | |
snapcraft: also include ld.so.conf from libc in the snapcraft.ymlsnapd-snap-fix3
The cmdutil.CommandFromSystemSnap is using this to find what library paths need setting.
| -rw-r--r-- | snapcraft.yaml | 3 | ||||
| -rw-r--r-- | tests/main/snapd-snap/task.yaml | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/snapcraft.yaml b/snapcraft.yaml index 7b36ac13ed..d76e1629b8 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -60,10 +60,13 @@ parts: plugin: nil stage-packages: - libc6 + - libc-bin stage: - lib/* - usr/lib/* - lib64/* + - etc/ld.so.conf + - etc/ld.so.conf.d/* override-stage: | snapcraftctl stage # fix symlinks of ld.so to be relative diff --git a/tests/main/snapd-snap/task.yaml b/tests/main/snapd-snap/task.yaml index 26745f8349..feb3a61a56 100644 --- a/tests/main/snapd-snap/task.yaml +++ b/tests/main/snapd-snap/task.yaml @@ -32,3 +32,8 @@ execute: | echo "Ensure we have mksquashfs (and the dependencies)" unsquashfs -ll snapd_*.snap | MATCH bin/mksquashfs unsquashfs -ll snapd_*.snap | MATCH liblzma.so.5 + + echo "Ensure we have ld.so.conf" + unsquashfs -ll snapd_*.snap | MATCH etc/ld.so.conf + echo "Ensure we have libc" + unsquashfs -ll snapd_*.snap | MATCH libc.so |