aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2015-11-26 23:13:41 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2015-11-28 23:08:33 +0100
commitcb34ea5d6ad5a26d43994f18825366983ab69f47 (patch)
tree8d38fc42cba83075626bdd3d88068f902bfd1503 /Makefile
parentd60d6ac0370ba10bf3dd5e237b63f26d22c1aac2 (diff)
downloadbuildroot-cb34ea5d6ad5a26d43994f18825366983ab69f47.tar.gz
buildroot-cb34ea5d6ad5a26d43994f18825366983ab69f47.tar.bz2
package/skeleton: also handle merged /usr in the staging
When the target uses a merged /usr setup, gdbserver will only report paths in /lib to the remote gdb, which in turn will only look for libraries in staging/lib and never in staging/usr/lib. So. the merged (or non-merged) /usr setup must be replicated in the staging. The best solution where to do so is in the skeleton package, since it is guaranteed to come before any package that installs things in the staging, and even before the (internal or external) toolchain as well. Reported-by: Pieterjan Camerlynck <pieterjan.camerlynck@gmail.com> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Pieterjan Camerlynck <pieterjan.camerlynck@gmail.com> Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> Cc: Peter Korsgaard <jacmet@uclibc.org> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 2 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index da29444fa6..86b9d0a5ec 100644
--- a/Makefile
+++ b/Makefile
@@ -456,14 +456,9 @@ else
LIB_SYMLINK = lib32
endif
+# Populating the staging with the base directories is handled by the skeleton package
$(STAGING_DIR):
- @mkdir -p $(STAGING_DIR)/bin
- @mkdir -p $(STAGING_DIR)/lib
- @ln -snf lib $(STAGING_DIR)/$(LIB_SYMLINK)
- @mkdir -p $(STAGING_DIR)/usr/lib
- @ln -snf lib $(STAGING_DIR)/usr/$(LIB_SYMLINK)
- @mkdir -p $(STAGING_DIR)/usr/include
- @mkdir -p $(STAGING_DIR)/usr/bin
+ @mkdir -p $(STAGING_DIR)
@ln -snf $(STAGING_DIR) $(BASE_DIR)/staging
RSYNC_VCS_EXCLUSIONS = \