Skip to content
Snippets Groups Projects
Commit dbdc41db authored by Simon McVittie's avatar Simon McVittie
Browse files

capsule-init-project: Allow overriding capsule-symbols, capsule-version

parent ffb12f47
Branches
Tags
1 merge request!311Build capsule-capture-libs from a bundled copy of libcapsule
...@@ -9,7 +9,10 @@ me=$(basename $0); ...@@ -9,7 +9,10 @@ me=$(basename $0);
usage () usage ()
{ {
cat << EOF cat << EOF
Usage: $me TARGET [TREE [PROJECT-NAME]]" Usage: $me [OPTIONS] TARGET [TREE [PROJECT-NAME]]"
Options:
--capsule-symbols=PATH Use replacement capsule-symbols(1)
--capsule-version=PATH Use replacement capsule-symbols(1)
Positional parameters: Positional parameters:
TARGET SONAME of the library to be proxied TARGET SONAME of the library to be proxied
TREE Chroot or container to find libraries in, TREE Chroot or container to find libraries in,
...@@ -31,6 +34,18 @@ do ...@@ -31,6 +34,18 @@ do
usage 0; usage 0;
;; ;;
(--capsule-symbols)
CAPSULE_SYMBOLS="$2"
shift 2;
continue;
;;
(--capsule-version)
CAPSULE_VERSION="$2"
shift 2;
continue;
;;
(--) (--)
shift; shift;
break; break;
...@@ -58,7 +73,10 @@ lcbase=${base,,}; ...@@ -58,7 +73,10 @@ lcbase=${base,,};
dest=${3:-$base-proxy}; dest=${3:-$base-proxy};
ver=0; ver=0;
read x x ver x < <($libexec/capsule-version $target $tree); : "${CAPSULE_SYMBOLS:="$libexec/capsule-symbols"}"
: "${CAPSULE_VERSION:="$libexec/capsule-version"}"
read x x ver x < <("$CAPSULE_VERSION" "$target" "$tree");
echo Generating project for $tree : $target $ver proxy; echo Generating project for $tree : $target $ver proxy;
...@@ -93,7 +111,7 @@ EOF ...@@ -93,7 +111,7 @@ EOF
echo Extracting dynamic symbols from $tree : $target; echo Extracting dynamic symbols from $tree : $target;
$libexec/capsule-symbols $target $tree > shim/$base.so.symbols; "$CAPSULE_SYMBOLS" "$target" "$tree" > "shim/$base.so.symbols";
echo Preparing proxy source files echo Preparing proxy source files
touch shim/$base.so.c.{shared,excluded}; touch shim/$base.so.c.{shared,excluded};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment