diff options
| author | Pim Klanke <pim@protonic.nl> | 2018-09-07 14:24:19 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-09-10 09:16:50 +0200 |
| commit | 70840025029d8e0011c4902e20bb217d1d613647 (patch) | |
| tree | 422e76d7643e6de82bef79f6fe4d8730a9f97c54 /rules/host-gobject-introspection.make | |
| parent | a240e6967fafa968b48ac43efae0661890638678 (diff) | |
| download | ptxdist-70840025029d8e0011c4902e20bb217d1d613647.tar.gz ptxdist-70840025029d8e0011c4902e20bb217d1d613647.tar.xz | |
rules: host-gobject-introspection: Fix incorrect '/lib' replacement
Instead of replacing all occurrences of /lib, replace all occurrences of
'/lib' (including the single quotes).
When building from a Jenkins environment, the workdir is, by default,
located under /var/lib/jenkins/. This lead to the following issue.
The first sed command replaces "/share" with:
"/var/lib/jenkins/<workdir>/sysroot-host/share/"
The second sed command replaces /lib (without quotes!) and alters the
previously replaced "/share" into:
"/var/var/lib/jenkins/workdir/sysroot-host/lib/jenkins/workdir/sysroot-
host/share/"
Signed-off-by: Pim Klanke <pim@protonic.nl>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/host-gobject-introspection.make')
| -rw-r--r-- | rules/host-gobject-introspection.make | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/host-gobject-introspection.make b/rules/host-gobject-introspection.make index 36d846c2f..32b90d1b7 100644 --- a/rules/host-gobject-introspection.make +++ b/rules/host-gobject-introspection.make @@ -60,7 +60,7 @@ $(STATEDIR)/host-gobject-introspection.install.post: "$(PTXDIST_SYSROOT_HOST)/bin/g-ir-scanner" \ "$(PTXDIST_SYSROOT_HOST)/bin/g-ir-annotation-tool" - @sed -i 's;'/lib';'$(PTXDIST_SYSROOT_HOST)/lib';' \ + @sed -i "s;'/lib';'$(PTXDIST_SYSROOT_HOST)/lib';" \ "$(PTXDIST_SYSROOT_HOST)/bin/g-ir-scanner" \ "$(PTXDIST_SYSROOT_HOST)/bin/g-ir-annotation-tool" |