diff --git a/package/target-finish/2nd-stage/2nd-stage.conf b/package/target-finish/2nd-stage/2nd-stage.conf index 3ace36c9b..afe32df1a 100644 --- a/package/target-finish/2nd-stage/2nd-stage.conf +++ b/package/target-finish/2nd-stage/2nd-stage.conf @@ -130,18 +130,20 @@ rm -rf var/{adm,games,mail,opt} rm -rf usr/{include,src,*-linux-gnu} {,usr/}lib/*.{a,la,o} for x in usr/lib/*/ ; do rm -rf ${x%/} ; done # -if [ $ROCKCFG_ARCH = arm ] ; then +if [ "$arch" = arm ] ; then echo "Installing /usr/lib/libgcc_s.so.1 ..." - pkg_ver="$( grep "[ =]$ROCKCFG_DEFAULT_CC " $base/config/$config/packages | cut -f6 -d" " )" - pkg_extraver="$( grep "[ =]$ROCKCFG_DEFAULT_CC " $base/config/$config/packages | cut -f7 -d" " )" - echo "$pkg_suffix $pkg_ver $pkg_extraver" - eval echo $pkg_suffix - eval x=$build_rock/pkgs/$ROCKCFG_DEFAULT_CC$pkg_suffix - if [[ "$pkg_suffix" == *gem ]] ; then - mine -k pkg_tarbz2 $x > tmp/$ROCKCFG_DEFAULT_CC.tar.bz2 - x=tmp/$ROCKCFG_DEFAULT_CC.tar.bz2 - fi - tar $taropt $x "usr/lib/libgcc_s.so*" +# pkg_ver="$( grep "[ =]$ROCKCFG_DEFAULT_CC " $base/config/$config/packages | cut -f6 -d" " )" +# pkg_extraver="$( grep "[ =]$ROCKCFG_DEFAULT_CC " $base/config/$config/packages | cut -f7 -d" " )" +# echo "$pkg_suffix $pkg_ver $pkg_extraver" +# eval echo $pkg_suffix +# eval x=$build_rock/pkgs/$ROCKCFG_DEFAULT_CC$pkg_suffix +# if [[ "$pkg_suffix" == *gem ]] ; then +# mine -k pkg_tarbz2 $x > tmp/$ROCKCFG_DEFAULT_CC.tar.bz2 +# x=tmp/$ROCKCFG_DEFAULT_CC.tar.bz2 +# fi +# tar --wildcards $taropt $x "usr/lib/libgcc_s.so*" +# false + cp -v $root/usr/lib/libgcc_s.so* usr/lib/ fi ldconfig -r $disksdir/2nd_stage