diogo/lsts_glued
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GLUED: renamed PKG_VAR to pkg_var.

Browse Source
This commit is contained in:
Ricardo Martins 2014-02-02 09:43:32 +00:00
parent 96e867964a
commit bfb17158e6
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mkpackage.bash
View File

@ -181,15 +181,15 @@ postconfigure()
perform_clean() perform_clean()
{ {
rm -rf "$cfg_dir_builds/$PKG/$PKG_VAR" rm -rf "$cfg_dir_builds/$PKG/$pkg_var"
} }
perform_all() perform_all()
{ {
start="$(date +%s)" start="$(date +%s)"
nfo1 "$PKG / $PKG_VAR" nfo1 "$PKG / $pkg_var"
export pkg_build_dir="$cfg_dir_builds/$PKG/$PKG_VAR" export pkg_build_dir="$cfg_dir_builds/$PKG/$pkg_var"
for rule in download unpack post_unpack refresh configure build host_install target_install postconfigure; do for rule in download unpack post_unpack refresh configure build host_install target_install postconfigure; do
case $rule in case $rule in
@ -197,11 +197,11 @@ perform_all()
marker="$cfg_dir_builds/$PKG/.$rule" marker="$cfg_dir_builds/$PKG/.$rule"
;; ;;
*) *)
marker="$cfg_dir_builds/$PKG/$PKG_VAR/.$rule" marker="$cfg_dir_builds/$PKG/$pkg_var/.$rule"
;; ;;
esac esac
mkdir -p "$cfg_dir_builds/$PKG/$PKG_VAR" && cd "$cfg_dir_builds/$PKG/$PKG_VAR" mkdir -p "$cfg_dir_builds/$PKG/$pkg_var" && cd "$cfg_dir_builds/$PKG/$pkg_var"
if [ -z "$build_dir" ]; then if [ -z "$build_dir" ]; then
build_dir="$PKG-$version" build_dir="$PKG-$version"
@ -213,16 +213,16 @@ perform_all()
if [ -n "$build_always" ] || [ "$rule" = 'refresh' ]; then if [ -n "$build_always" ] || [ "$rule" = 'refresh' ]; then
nfo2 "$rule" nfo2 "$rule"
$rule > "$cfg_dir_builds/$PKG/$PKG_VAR/$rule.log" 2>&1 $rule > "$cfg_dir_builds/$PKG/$pkg_var/$rule.log" 2>&1
else else
if ! [ -f "$marker" ]; then if ! [ -f "$marker" ]; then
nfo2 "$rule" nfo2 "$rule"
$rule > "$cfg_dir_builds/$PKG/$PKG_VAR/$rule.log" 2>&1 $rule > "$cfg_dir_builds/$PKG/$pkg_var/$rule.log" 2>&1
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
touch "$marker" touch "$marker"
else else
err "failed to execute rule $rule of $PKG / $PKG_VAR" err "failed to execute rule $rule of $PKG / $pkg_var"
tail "$cfg_dir_builds/$PKG/$PKG_VAR/$rule.log" tail "$cfg_dir_builds/$PKG/$pkg_var/$rule.log"
exit 1 exit 1
fi fi
fi fi
@ -231,7 +231,7 @@ perform_all()
elapsed=$[ $(date +%s)-$start ] elapsed=$[ $(date +%s)-$start ]
ok "completed in ${elapsed}s" ok "completed in ${elapsed}s"
touch "$cfg_dir_builds/$PKG/$PKG_VAR/.complete" touch "$cfg_dir_builds/$PKG/$pkg_var/.complete"
} }
# Check shell. # Check shell.
@ -299,7 +299,7 @@ if [ "$pkg_var" = "$pkg" ]; then
fi fi
export PKG="$pkg" export PKG="$pkg"
export PKG_VAR="$pkg_var" export pkg_var="$pkg_var"
export PKG_COMMON="$cfg_dir_packages/$PKG/common.bash" export PKG_COMMON="$cfg_dir_packages/$PKG/common.bash"
if ! [ -d "$cfg_dir_packages/$PKG" ]; then if ! [ -d "$cfg_dir_packages/$PKG" ]; then
@ -307,8 +307,8 @@ if ! [ -d "$cfg_dir_packages/$PKG" ]; then
exit 1 exit 1
fi fi
if ! [ -f "$cfg_dir_packages/$PKG/$PKG_VAR.bash" ]; then if ! [ -f "$cfg_dir_packages/$PKG/$pkg_var.bash" ]; then
echo "ERROR: variant '$PKG_VAR' of package '$PKG' does not exist." echo "ERROR: variant '$pkg_var' of package '$PKG' does not exist."
exit 1 exit 1
fi fi
@ -322,7 +322,7 @@ mkdir -p "$cfg_dir_downloads" "$cfg_dir_rootfs" "$cfg_dir_toolchain" "$cfg_dir_b
export cfg_package_spec_dir="$cfg_dir_base/packages/$PKG" export cfg_package_spec_dir="$cfg_dir_base/packages/$PKG"
. "$cfg_dir_packages/$PKG/$PKG_VAR.bash" . "$cfg_dir_packages/$PKG/$pkg_var.bash"
# Postconfiguration: # Postconfiguration:
if [ -e "$cfg_dir_postconfiguration/$PKG/$cfg_sys_name.bash" ]; then if [ -e "$cfg_dir_postconfiguration/$PKG/$cfg_sys_name.bash" ]; then
@ -347,7 +347,7 @@ n=0; while [ -n "${requires[$n]}" ]; do
"$0" "$1" "$req" "$0" "$1" "$req"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
err "failed to build dependency for package $PKG / $PKG_VAR" err "failed to build dependency for package $PKG / $pkg_var"
exit 1 exit 1
fi fi
done done

2
packages/binutils/cross.bash
View File

@ -18,7 +18,7 @@ maintainer=\
"Ricardo Martins <rasm@fe.up.pt>" "Ricardo Martins <rasm@fe.up.pt>"
) )
build_dir=$PKG_VAR build_dir=$pkg_var
configure() configure()
{ {

2
packages/eglibc/common.bash
View File

@ -18,7 +18,7 @@ maintainer=\
'Ricardo Martins <rasm@fe.up.pt>' 'Ricardo Martins <rasm@fe.up.pt>'
) )
build_dir=$PKG_VAR build_dir=$pkg_var
post_unpack() post_unpack()
{ {

2
packages/gcc/common.bash
View File

@ -13,7 +13,7 @@ md5=\
'a3d7d63b9cb6b6ea049469a0c4a43c9d' 'a3d7d63b9cb6b6ea049469a0c4a43c9d'
) )
build_dir=$PKG_VAR build_dir=$pkg_var
post_unpack() post_unpack()
{ {

4
packages/linux/common.bash
View File

@ -14,8 +14,8 @@ post_unpack()
refresh() refresh()
{ {
for rule in configure build target_install; do for rule in configure build target_install; do
if [ "$cfg_dir_system/cfg/linux-${version}.cfg" -nt "$cfg_dir_builds/linux/$PKG_VAR/.$rule" ]; then if [ "$cfg_dir_system/cfg/linux-${version}.cfg" -nt "$cfg_dir_builds/linux/$pkg_var/.$rule" ]; then
rm "$cfg_dir_builds/linux/$PKG_VAR/.$rule" rm "$cfg_dir_builds/linux/$pkg_var/.$rule"
fi fi
done done
} }