mirror of
https://gitee.com/spark-store-project/additional-base-lib
synced 2025-09-21 19:22:22 +08:00
slight change to fit more distro
This commit is contained in:
parent
1a12416ad6
commit
76004e37a9
@ -144,8 +144,8 @@ check $?
|
|||||||
echo "generate ablrun-normal script..."
|
echo "generate ablrun-normal script..."
|
||||||
echo "#!/bin/bash" > ./deb-contents/usr/bin/ablrun-normal
|
echo "#!/bin/bash" > ./deb-contents/usr/bin/ablrun-normal
|
||||||
echo "ABL_TARGET_LD_SO_PATH=$LD_SO_LOCATION" >> ./deb-contents/usr/bin/ablrun-normal
|
echo "ABL_TARGET_LD_SO_PATH=$LD_SO_LOCATION" >> ./deb-contents/usr/bin/ablrun-normal
|
||||||
echo "ABL_ARCH_DIR=$DEBIAN_MULTIARCH" >> ./deb-contents/usr/bin/ablrun-normal
|
echo "ABL_DIR_PREFIX=lib/$DEBIAN_MULTIARCH" >> ./deb-contents/usr/bin/ablrun-normal
|
||||||
cat ./scripts/ablrun-normal.1 >> ./deb-contents/usr/bin/ablrun-normal
|
cat ./scripts/ablrun-normal_part >> ./deb-contents/usr/bin/ablrun-normal
|
||||||
check $?
|
check $?
|
||||||
|
|
||||||
echo "chmod..."
|
echo "chmod..."
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#some contents is generated when build package
|
#some content, such as ABL_DIR_PREFIX, ABL_TARGET_LD_SO_PATH, is generated when building the package
|
||||||
|
|
||||||
if [ "$*" = "" ]
|
if [ "$*" = "" ]
|
||||||
then
|
then
|
||||||
@ -23,19 +23,19 @@ then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
ABL_LD_SO_PATH=`readlink -e $ABL_TARGET_LD_SO_PATH`
|
ABL_LD_SO_PATH=`readlink -e $ABL_TARGET_LD_SO_PATH`
|
||||||
ABL_LIBC_SO_PATH=`readlink -e /lib/${ABL_ARCH_DIR}/libc.so.6`
|
ABL_LIBC_SO_PATH=`readlink -e /${ABL_DIR_PREFIX}/libc.so.6`
|
||||||
|
|
||||||
if [ "$LD_LIBRARY_PATH" = "" ]
|
if [ "$LD_LIBRARY_PATH" = "" ]
|
||||||
then
|
then
|
||||||
ABL_LIBRARY_PATH="/usr/lib/${ABL_ARCH_DIR}/additional-base-lib/"
|
ABL_LIBRARY_PATH="/usr/${ABL_DIR_PREFIX}/additional-base-lib/"
|
||||||
else
|
else
|
||||||
ABL_LIBRARY_PATH="$LD_LIBRARY_PATH;/usr/lib/${ABL_ARCH_DIR}/additional-base-lib"
|
ABL_LIBRARY_PATH="$LD_LIBRARY_PATH;/usr/${ABL_DIR_PREFIX}/additional-base-lib"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec bwrap \
|
exec bwrap \
|
||||||
--dev-bind / / \
|
--dev-bind / / \
|
||||||
--bind /usr/lib/${ABL_ARCH_DIR}/additional-base-lib/"$ABL_TARGET_LD_SO_PATH" "$ABL_LD_SO_PATH" \
|
--bind /usr/${ABL_DIR_PREFIX}/additional-base-lib/"$ABL_TARGET_LD_SO_PATH" "$ABL_LD_SO_PATH" \
|
||||||
--bind /usr/lib/${ABL_ARCH_DIR}/additional-base-lib/libc.so.6 "$ABL_LIBC_SO_PATH" \
|
--bind /usr/${ABL_DIR_PREFIX}/additional-base-lib/libc.so.6 "$ABL_LIBC_SO_PATH" \
|
||||||
--bind /usr/lib/${ABL_ARCH_DIR}/additional-base-lib/ldd /usr/bin/ldd \
|
--bind /usr/${ABL_DIR_PREFIX}/additional-base-lib/ldd /usr/bin/ldd \
|
||||||
--setenv LD_LIBRARY_PATH "$ABL_LIBRARY_PATH" \
|
--setenv LD_LIBRARY_PATH "$ABL_LIBRARY_PATH" \
|
||||||
-- "$@"
|
-- "$@"
|
Loading…
x
Reference in New Issue
Block a user