diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:14:24 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:29:45 +0100 |
commit | 29d6678fd546377459ef75cf54abeef5b969b5cf (patch) | |
tree | 8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/recipes-devtools/fakeroot/fakeroot-1.14.4/absolutepaths.patch | |
parent | da49de6885ee1bc424e70bc02f21f6ab920efb55 (diff) | |
download | poky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz |
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.
The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.
Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/fakeroot/fakeroot-1.14.4/absolutepaths.patch')
-rw-r--r-- | meta/recipes-devtools/fakeroot/fakeroot-1.14.4/absolutepaths.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-devtools/fakeroot/fakeroot-1.14.4/absolutepaths.patch b/meta/recipes-devtools/fakeroot/fakeroot-1.14.4/absolutepaths.patch new file mode 100644 index 0000000000..ae18e8a28c --- /dev/null +++ b/meta/recipes-devtools/fakeroot/fakeroot-1.14.4/absolutepaths.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | Image creation runs under a fakeroot context and calls a script which refers | ||
2 | to the build systems's python. This loads but can find a libpython from staging | ||
3 | if these are incompatible, anything can break. These scripts should *not* be | ||
4 | changing LD_LIBRARY_PATH, just adding an LD_PRELOAD with an absolute path. The | ||
5 | dyanmic linker can figure out anything else with rpaths. | ||
6 | |||
7 | RP - 23/1/10 | ||
8 | |||
9 | Index: fakeroot-1.9.4/configure.ac | ||
10 | =================================================================== | ||
11 | --- fakeroot-1.9.4.orig/configure.ac 2010-01-23 22:34:39.000000000 +0000 | ||
12 | +++ fakeroot-1.9.4/configure.ac 2010-01-23 22:35:14.000000000 +0000 | ||
13 | @@ -414,6 +414,8 @@ | ||
14 | ;; | ||
15 | esac | ||
16 | |||
17 | +LDPRELOADABS=1 | ||
18 | + | ||
19 | AC_DEFINE_UNQUOTED([LIBCPATH], "$libcpath", [path to libc shared object]) | ||
20 | AC_SUBST(DLSUFFIX) | ||
21 | AC_SUBST(LDLIBPATHVAR) | ||
22 | Index: fakeroot-1.9.4/scripts/fakeroot.in | ||
23 | =================================================================== | ||
24 | --- fakeroot-1.9.4.orig/scripts/fakeroot.in 2010-01-23 22:34:53.000000000 +0000 | ||
25 | +++ fakeroot-1.9.4/scripts/fakeroot.in 2010-01-23 22:37:17.000000000 +0000 | ||
26 | @@ -135,7 +135,7 @@ | ||
27 | if [ "$WAITINTRAP" -eq 0 ]; then | ||
28 | trap "kill -s @signal@ $PID" EXIT INT | ||
29 | else | ||
30 | - trap 'FAKEROOTKEY=$FAKEROOTKEY LD_LIBRARY_PATH="$PATHS" LD_PRELOAD="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT | ||
31 | + trap 'FAKEROOTKEY=$FAKEROOTKEY LD_PRELOAD="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT | ||
32 | fi | ||
33 | |||
34 | if test -z "$FAKEROOTKEY" || test -z "$PID"; then | ||
35 | @@ -158,10 +158,10 @@ | ||
36 | export FAKEROOT_FD_BASE | ||
37 | |||
38 | if test -z "$*"; then | ||
39 | - FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-/bin/sh} | ||
40 | + FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-/bin/sh} | ||
41 | RESULT=$? | ||
42 | else | ||
43 | - FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" "$@" | ||
44 | + FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" "$@" | ||
45 | RESULT=$? | ||
46 | fi | ||
47 | |||