From: Samuel Martin <s.martin49@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v7 05/18] core: make staging *-config scripts relocatable
Date: Wed, 9 Mar 2016 23:58:46 +0100 [thread overview]
Message-ID: <1457564339-27294-6-git-send-email-s.martin49@gmail.com> (raw)
In-Reply-To: <1457564339-27294-1-git-send-email-s.martin49@gmail.com>
This change adjusts the _CONFIG_SCRIPTS hook to set add {exec_,}prefix computed
relatively to the script location.
This patch hook only fixes *-config scripts located in the staging area,
the target ones are already removed. A follow-up change will fix those
from the HOST_DIR location.
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
changes v6->v7:
- none
changes v5->v6:
- new patch
---
package/pkg-generic.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 3904c09..ffa21ee 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -240,7 +240,7 @@ $(BUILD_DIR)/%/.stamp_staging_installed:
$(call MESSAGE,"Fixing package configuration files") ;\
$(SED) "s,$(BASE_DIR), at BASE_DIR@,g" \
-e "s,$(STAGING_DIR), at STAGING_DIR@,g" \
- -e "s,^\(exec_\)\?prefix=.*,\1prefix=@STAGING_DIR@/usr,g" \
+ -e "s,^\(exec_\)\?prefix=.*,\1prefix=\`dirname \$$0\`/../../usr,g" \
-e "s,-I/usr/,-I at STAGING_DIR@/usr/,g" \
-e "s,-L/usr/,-L at STAGING_DIR@/usr/,g" \
-e "s, at STAGING_DIR@,$(STAGING_DIR),g" \
--
2.7.2
next prev parent reply other threads:[~2016-03-09 22:58 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-09 22:58 [Buildroot] [PATCH v7 00/18] Relocatable SDK / build machine leaks Samuel Martin
2016-03-09 22:58 ` [Buildroot] [PATCH v7 01/18] package/linux-headers: cleanup installation Samuel Martin
2016-03-09 23:09 ` Yann E. MORIN
2016-03-12 8:46 ` Samuel Martin
2016-03-22 22:10 ` Yann E. MORIN
2016-03-09 22:58 ` [Buildroot] [PATCH v7 02/18] core: use $(CURDIR) to set TOPDIR Samuel Martin
2016-03-09 23:10 ` Yann E. MORIN
2016-03-09 23:51 ` Arnout Vandecappelle
2016-03-10 20:45 ` Thomas Petazzoni
2016-03-10 22:50 ` Thomas Petazzoni
2016-03-09 22:58 ` [Buildroot] [PATCH v7 03/18] core: re-enter make if $(CURDIR) or $(O) are not absolute canonical path Samuel Martin
2016-03-09 23:15 ` Yann E. MORIN
2016-03-12 8:48 ` Samuel Martin
[not found] ` <CAFt09wNvtXGcfZ3PFZOgGu+bDvp6mEr44uwxa_ryjeP6DDQKBQ@mail.gmail.com>
2016-03-21 1:45 ` Matthew Weber
2016-03-21 5:21 ` Samuel Martin
2016-03-21 11:40 ` Matthew Weber
2016-03-22 3:03 ` Matthew Weber
2016-03-22 5:55 ` Samuel Martin
2016-03-22 11:10 ` Matthew Weber
2016-03-22 22:07 ` Yann E. MORIN
2016-03-22 23:11 ` Matthew Weber
2016-03-23 0:54 ` Matthew Weber
2016-03-23 1:36 ` Matthew Weber
2016-03-25 6:31 ` Samuel Martin
2016-03-26 12:21 ` Arnout Vandecappelle
2016-03-23 17:41 ` Yann E. MORIN
2016-03-09 22:58 ` [Buildroot] [PATCH v7 04/18] core: staging symlink uses a relative path when possible Samuel Martin
2016-03-09 23:20 ` Yann E. MORIN
2016-03-10 20:47 ` Thomas Petazzoni
2016-03-12 9:11 ` Samuel Martin
2016-03-12 13:12 ` Thomas Petazzoni
2016-03-09 22:58 ` Samuel Martin [this message]
2016-03-09 23:24 ` [Buildroot] [PATCH v7 05/18] core: make staging *-config scripts relocatable Yann E. MORIN
2016-03-10 0:07 ` Arnout Vandecappelle
2016-03-12 9:22 ` Samuel Martin
2016-03-09 22:58 ` [Buildroot] [PATCH v7 06/18] core: make host " Samuel Martin
2016-03-10 0:12 ` Arnout Vandecappelle
2016-03-10 12:30 ` Samuel Martin
2016-03-10 20:50 ` Thomas Petazzoni
2016-03-09 22:58 ` [Buildroot] [PATCH v7 07/18] package/pkgconf: make the pkg-config wrapper relocatable Samuel Martin
2016-03-10 20:53 ` Thomas Petazzoni
2016-03-10 21:33 ` Peter Korsgaard
2016-03-09 22:58 ` [Buildroot] [PATCH v7 08/18] support/scripts: add fix-rpath script + a bunch of helpers Samuel Martin
2016-03-09 22:58 ` [Buildroot] [PATCH v7 09/18] core: add HOST_SANITIZE_RPATH_HOOK to TARGET_FINALIZE_HOOKS Samuel Martin
2016-03-09 22:58 ` [Buildroot] [PATCH v7 10/18] core: add {TARGET, STAGING}_SANITIZE_RPATH_HOOK " Samuel Martin
2016-03-09 22:58 ` [Buildroot] [PATCH v7 11/18] package/speex: remove no longer needed hook Samuel Martin
2016-03-09 22:58 ` [Buildroot] [PATCH v7 12/18] toolchain: add post-install hooks making the toolchain relocatable Samuel Martin
2016-03-09 22:58 ` [Buildroot] [PATCH v7 13/18] support/scripts: update check-host-rpath to use the shell helpers Samuel Martin
2016-03-09 22:58 ` [Buildroot] [PATCH v7 14/18] support/scripts/check-host-rpath: silent find command Samuel Martin
2016-03-10 0:15 ` Arnout Vandecappelle
2016-03-09 22:58 ` [Buildroot] [PATCH v7 15/18] support/scripts/check-host-rpath: also check HOST_DIR/{bin, sbin} Samuel Martin
2016-03-10 0:16 ` Arnout Vandecappelle
2016-03-09 22:58 ` [Buildroot] [PATCH v7 16/18] support/scripts: add check-host-leaks script + all needed helpers Samuel Martin
2016-03-27 22:38 ` Arnout Vandecappelle
2016-03-09 22:58 ` [Buildroot] [PATCH v7 17/18] core: add check-leaks-in-{target, host, staging} targets Samuel Martin
2016-03-09 22:58 ` [Buildroot] [PATCH v7 18/18] docs/manual: document how to debug shell script Samuel Martin
2016-03-10 0:21 ` Arnout Vandecappelle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1457564339-27294-6-git-send-email-s.martin49@gmail.com \
--to=s.martin49@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox