X-Git-Url: https://hackdaworld.org/gitweb/?p=hdw-linux%2Fhdw-linux.git;a=blobdiff_plain;f=scripts%2FBuild;h=be436fab2b478211fa272f3a490a191b9a8f9c51;hp=a3ed9a84dce675ecff4f2af25423fe9a8b39d65a;hb=8dd2356c22327a15f0e16abbc887c4f72fc62985;hpb=c7b7c7d4ce2f5a6947e42ff37d9584d26eb52ba4 diff --git a/scripts/Build b/scripts/Build index a3ed9a8..be436fa 100755 --- a/scripts/Build +++ b/scripts/Build @@ -35,8 +35,7 @@ if [ -z "$package" ]; then fi if [ -z "$stage" ]; then - echo "stage level not specified. something went wrong ... hey," - echo "this is a development version ;)" + echo "no stage level specified, abort." exit 1 fi @@ -122,7 +121,7 @@ echo "found $package config file ..." prefix=""; docdir="" if [ "$stage" -lt "2" ] ; then # use the symlink as prefix - prefix="/${s1_prefix}" + prefix="/${tc_name}" docdir="$prefix/share/doc/$package" install_conf="PREFIX=$prefix" else @@ -186,7 +185,7 @@ echo "found $package config file ..." # flist find variables/command flist_path="bin/ boot/ etc/ lib/ opt/ sbin/ usr/ var/" - [ "$stage" -lt "2" ] && flist_path="${flist_path} ${s1_prefix}/" + [ "$stage" -lt "2" ] && flist_path="${flist_path} ${tc_name}/" flist_cmd="find \$flist_path \( -cnewer $root/.time_$package -o \ -newer $root/.time_$package \) \( -not -type d -o \ -type d -empty \) -print" @@ -295,6 +294,7 @@ echo "found $package config file ..." echo echo "Debug: (buildenvironment)" printenv + echo "gcc to use: `which gcc`, `which cc`" echo fi build_main @@ -391,7 +391,7 @@ echo "found $package config file ..." grep -v '^ldd'`; do for rpkg in `grep $rdep -r \ $root/var/adm/flists | \ - grep -v $s1_prefix | \ + grep -v $tc_name | \ awk -F: '{ print $2 }'`; do add=1 for cmp in $alldeps; do @@ -411,7 +411,7 @@ echo "found $package config file ..." grep -v '^ldd'`; do for rpkg in `grep $rdep -r \ $root/var/adm/flists | \ - grep -v $s1_prefix | \ + grep -v $tc_name | \ awk -F: '{ print $2 }'`; do add=1 for cmp in $alldeps; do