diff --git a/make-deb.sh b/make-deb.sh index 9270194..7a89a2e 100755 --- a/make-deb.sh +++ b/make-deb.sh @@ -144,8 +144,8 @@ check $? echo "generate ablrun-normal script..." 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_ARCH_DIR=$DEBIAN_MULTIARCH" >> ./deb-contents/usr/bin/ablrun-normal -cat ./scripts/ablrun-normal.1 >> ./deb-contents/usr/bin/ablrun-normal +echo "ABL_DIR_PREFIX=lib/$DEBIAN_MULTIARCH" >> ./deb-contents/usr/bin/ablrun-normal +cat ./scripts/ablrun-normal_part >> ./deb-contents/usr/bin/ablrun-normal check $? echo "chmod..." diff --git a/scripts/ablrun-normal.1 b/scripts/ablrun-normal_part similarity index 68% rename from scripts/ablrun-normal.1 rename to scripts/ablrun-normal_part index f946592..bb007a0 100755 --- a/scripts/ablrun-normal.1 +++ b/scripts/ablrun-normal_part @@ -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 [ "$*" = "" ] then @@ -23,19 +23,19 @@ then fi 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" = "" ] then - ABL_LIBRARY_PATH="/usr/lib/${ABL_ARCH_DIR}/additional-base-lib/" + ABL_LIBRARY_PATH="/usr/${ABL_DIR_PREFIX}/additional-base-lib/" 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 exec bwrap \ --dev-bind / / \ ---bind /usr/lib/${ABL_ARCH_DIR}/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/lib/${ABL_ARCH_DIR}/additional-base-lib/ldd /usr/bin/ldd \ +--bind /usr/${ABL_DIR_PREFIX}/additional-base-lib/"$ABL_TARGET_LD_SO_PATH" "$ABL_LD_SO_PATH" \ +--bind /usr/${ABL_DIR_PREFIX}/additional-base-lib/libc.so.6 "$ABL_LIBC_SO_PATH" \ +--bind /usr/${ABL_DIR_PREFIX}/additional-base-lib/ldd /usr/bin/ldd \ --setenv LD_LIBRARY_PATH "$ABL_LIBRARY_PATH" \ -- "$@"