From bfb17158e69fc0305d908a8876b2fd0a9dfcb1c5 Mon Sep 17 00:00:00 2001
From: Ricardo Martins <rasm@lsts.pt>
Date: Sun, 2 Feb 2014 09:43:32 +0000
Subject: [PATCH] GLUED: renamed PKG_VAR to pkg_var.

---
 mkpackage.bash               | 30 +++++++++++++++---------------
 packages/binutils/cross.bash |  2 +-
 packages/eglibc/common.bash  |  2 +-
 packages/gcc/common.bash     |  2 +-
 packages/linux/common.bash   |  4 ++--
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/mkpackage.bash b/mkpackage.bash
index 59060e5..bff2133 100755
--- a/mkpackage.bash
+++ b/mkpackage.bash
@@ -181,15 +181,15 @@ postconfigure()
 
 perform_clean()
 {
-    rm -rf "$cfg_dir_builds/$PKG/$PKG_VAR"
+    rm -rf "$cfg_dir_builds/$PKG/$pkg_var"
 }
 
 perform_all()
 {
     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
         case $rule in
@@ -197,11 +197,11 @@ perform_all()
                 marker="$cfg_dir_builds/$PKG/.$rule"
                 ;;
             *)
-                marker="$cfg_dir_builds/$PKG/$PKG_VAR/.$rule"
+                marker="$cfg_dir_builds/$PKG/$pkg_var/.$rule"
                 ;;
         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
             build_dir="$PKG-$version"
@@ -213,16 +213,16 @@ perform_all()
 
         if [ -n "$build_always" ] || [ "$rule" = 'refresh' ]; then
             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
             if ! [ -f "$marker" ]; then
                 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
                     touch "$marker"
                 else
-                    err "failed to execute rule $rule of $PKG / $PKG_VAR"
-                    tail "$cfg_dir_builds/$PKG/$PKG_VAR/$rule.log"
+                    err "failed to execute rule $rule of $PKG / $pkg_var"
+                    tail "$cfg_dir_builds/$PKG/$pkg_var/$rule.log"
                     exit 1
                 fi
             fi
@@ -231,7 +231,7 @@ perform_all()
 
     elapsed=$[ $(date +%s)-$start ]
     ok "completed in ${elapsed}s"
-    touch "$cfg_dir_builds/$PKG/$PKG_VAR/.complete"
+    touch "$cfg_dir_builds/$PKG/$pkg_var/.complete"
 }
 
 # Check shell.
@@ -299,7 +299,7 @@ if [ "$pkg_var" = "$pkg" ]; then
 fi
 
 export PKG="$pkg"
-export PKG_VAR="$pkg_var"
+export pkg_var="$pkg_var"
 export PKG_COMMON="$cfg_dir_packages/$PKG/common.bash"
 
 if ! [ -d "$cfg_dir_packages/$PKG" ]; then
@@ -307,8 +307,8 @@ if ! [ -d "$cfg_dir_packages/$PKG" ]; then
     exit 1
 fi
 
-if ! [ -f "$cfg_dir_packages/$PKG/$PKG_VAR.bash" ]; then
-    echo "ERROR: variant '$PKG_VAR' of package '$PKG' does not exist."
+if ! [ -f "$cfg_dir_packages/$PKG/$pkg_var.bash" ]; then
+    echo "ERROR: variant '$pkg_var' of package '$PKG' does not exist."
     exit 1
 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"
 
-. "$cfg_dir_packages/$PKG/$PKG_VAR.bash"
+. "$cfg_dir_packages/$PKG/$pkg_var.bash"
 
 # Postconfiguration:
 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"
     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
     fi
 done
diff --git a/packages/binutils/cross.bash b/packages/binutils/cross.bash
index e1e98f3..45b3853 100644
--- a/packages/binutils/cross.bash
+++ b/packages/binutils/cross.bash
@@ -18,7 +18,7 @@ maintainer=\
     "Ricardo Martins <rasm@fe.up.pt>"
 )
 
-build_dir=$PKG_VAR
+build_dir=$pkg_var
 
 configure()
 {
diff --git a/packages/eglibc/common.bash b/packages/eglibc/common.bash
index 41571c5..8905c64 100644
--- a/packages/eglibc/common.bash
+++ b/packages/eglibc/common.bash
@@ -18,7 +18,7 @@ maintainer=\
     'Ricardo Martins <rasm@fe.up.pt>'
 )
 
-build_dir=$PKG_VAR
+build_dir=$pkg_var
 
 post_unpack()
 {
diff --git a/packages/gcc/common.bash b/packages/gcc/common.bash
index 8dad813..45e7fe1 100644
--- a/packages/gcc/common.bash
+++ b/packages/gcc/common.bash
@@ -13,7 +13,7 @@ md5=\
     'a3d7d63b9cb6b6ea049469a0c4a43c9d'
 )
 
-build_dir=$PKG_VAR
+build_dir=$pkg_var
 
 post_unpack()
 {
diff --git a/packages/linux/common.bash b/packages/linux/common.bash
index 43d38ac..6469447 100644
--- a/packages/linux/common.bash
+++ b/packages/linux/common.bash
@@ -14,8 +14,8 @@ post_unpack()
 refresh()
 {
     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
-            rm "$cfg_dir_builds/linux/$PKG_VAR/.$rule"
+        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"
         fi
     done
 }