diff --git a/make-deb.sh b/make-deb.sh index bef5b82..e7fb7ce 100755 --- a/make-deb.sh +++ b/make-deb.sh @@ -95,11 +95,27 @@ echo "ABL_ARCH_DIR=$DEBIAN_MULTIARCH" >> ./deb-contents/usr/bin/ablrun-normal cat ./scripts/ablrun-normal.1 >> ./deb-contents/usr/bin/ablrun-normal chmod a+x ./deb-contents/usr/bin/* +rooted_readlink(){ + rrl_result=$1 + rrl_root=$2 + while [ -h "$rrl_result" ] + do + rrl_result=`readlink "$rrl_result"` + if [ "${rrl_result:0:1}" == "/" ] + then + rrl_result="$rrl_root/$rrl_result" + else + rrl_result=`dirname "$1"`"/$rrl_result" + fi + done + echo -n "$rrl_result" +} + cp -r "./downloads/libc6/lib/${DEBIAN_MULTIARCH}/" "./deb-contents/usr/lib/${DEBIAN_MULTIARCH}/additional-base-lib" mkdir --parents "./deb-contents/usr/lib/${DEBIAN_MULTIARCH}/additional-base-lib/$LD_SO_LOCATION" rm -d "./deb-contents/usr/lib/${DEBIAN_MULTIARCH}/additional-base-lib/$LD_SO_LOCATION" -cp ./downloads/libc6/`readlink "./downloads/libc6/$LD_SO_LOCATION"` "./deb-contents/usr/lib/${DEBIAN_MULTIARCH}/additional-base-lib/$LD_SO_LOCATION" +cp `rooted_readlink "./downloads/libc6/$LD_SO_LOCATION" "./downloads/libc6"` "./deb-contents/usr/lib/${DEBIAN_MULTIARCH}/additional-base-lib/$LD_SO_LOCATION" cp "./downloads/libc-bin/usr/bin/ldd" "./deb-contents/usr/lib/${DEBIAN_MULTIARCH}/additional-base-lib/ldd" -cp `readlink -e ./downloads/libstdc++6/usr/lib/${DEBIAN_MULTIARCH}/libstdc++.so.6` "./deb-contents/usr/lib/${DEBIAN_MULTIARCH}/additional-base-lib/libstdc++.so.6" +cp `rooted_readlink ./downloads/libstdc++6/usr/lib/${DEBIAN_MULTIARCH}/libstdc++.so.6 ./downloads/libstdc++6/` "./deb-contents/usr/lib/${DEBIAN_MULTIARCH}/additional-base-lib/libstdc++.so.6" dpkg -b ./deb-contents "./additional-base-lib_${GLIBC_VERSION}-${ABL_VERSION}_${DEBIAN_DEB_ARCH}.deb" \ No newline at end of file diff --git a/scripts/ablrun-normal.1 b/scripts/ablrun-normal.1 index 50d3ae4..bb9be0e 100755 --- a/scripts/ablrun-normal.1 +++ b/scripts/ablrun-normal.1 @@ -23,9 +23,9 @@ ABL_LIBC_SO_PATH=`readlink -e /lib/${ABL_ARCH_DIR}/libc.so.6` if [ "$LD_LIBRARY_PATH" = "" ] then - ABL_LIBRARY_PATH="/usr/lib/x86_64-linux-gnu/additional-base-lib/" + ABL_LIBRARY_PATH="/usr/lib/${ABL_ARCH_DIR}/additional-base-lib/" else - ABL_LIBRARY_PATH="$LD_LIBRARY_PATH;/usr/lib/x86_64-linux-gnu/additional-base-lib" + ABL_LIBRARY_PATH="$LD_LIBRARY_PATH;/usr/lib/${ABL_ARCH_DIR}/additional-base-lib" fi exec bwrap \