From 8fe415232dbc019985ca0cca0d49e876237ea201 Mon Sep 17 00:00:00 2001
From: Ricardo Martins <rasm@lsts.pt>
Date: Tue, 4 Feb 2014 07:44:17 +0000
Subject: [PATCH] GLUED: renamed cfg_package_spec_dir to pkg_dir.

---
 mkpackage.bash                     | 2 +-
 rules/apache-log4cxx/default.bash  | 2 +-
 rules/boost/default.bash           | 2 +-
 rules/bridge-utils/default.bash    | 2 +-
 rules/busybox/default.bash         | 6 +++---
 rules/collectd/default.bash        | 2 +-
 rules/desert/default.bash          | 2 +-
 rules/dropbear/default.bash        | 4 ++--
 rules/dtn/default.bash             | 2 +-
 rules/eglibc/common.bash           | 2 +-
 rules/eglibc/cross.bash            | 4 ++--
 rules/escc/default.bash            | 2 +-
 rules/europa/default.bash          | 4 ++--
 rules/expect/default.bash          | 2 +-
 rules/fconfig/default.bash         | 2 +-
 rules/filesystem/target.bash       | 2 +-
 rules/flac/default.bash            | 2 +-
 rules/gcc/common.bash              | 2 +-
 rules/gpsd/default.bash            | 2 +-
 rules/intel-microcode/default.bash | 2 +-
 rules/libpcap/default.bash         | 2 +-
 rules/libusb-compat/default.bash   | 2 +-
 rules/libxslt/default.bash         | 2 +-
 rules/linux/common.bash            | 2 +-
 rules/lsts/default.bash            | 4 ++--
 rules/m4/host.bash                 | 2 +-
 rules/ns/default.bash              | 2 +-
 rules/ntp/default.bash             | 2 +-
 rules/omniEvents/default.bash      | 6 +++---
 rules/omniorb/default.bash         | 4 ++--
 rules/perl-modules/default.bash    | 2 +-
 rules/perl/default.bash            | 2 +-
 rules/ppp/default.bash             | 2 +-
 rules/ptpd/default.bash            | 2 +-
 rules/python/default.bash          | 4 ++--
 rules/readline/default.bash        | 2 +-
 rules/setserial/default.bash       | 2 +-
 rules/syslinux/default.bash        | 2 +-
 rules/tclcl/default.bash           | 2 +-
 rules/trex/default.bash            | 2 +-
 rules/u-boot/common.bash           | 2 +-
 rules/u-boot/igep_xloader.bash     | 2 +-
 rules/valgrind/default.bash        | 2 +-
 rules/xerces-c/default.bash        | 2 +-
 44 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/mkpackage.bash b/mkpackage.bash
index 41f349a..f6527fa 100755
--- a/mkpackage.bash
+++ b/mkpackage.bash
@@ -320,7 +320,7 @@ fi
 
 mkdir -p "$cfg_dir_downloads" "$cfg_dir_rootfs" "$cfg_dir_toolchain" "$cfg_dir_builds/$pkg"
 
-export cfg_package_spec_dir="$cfg_dir_rules/$pkg"
+export pkg_dir="$cfg_dir_rules/$pkg"
 
 . "$cfg_dir_rules/$pkg/$pkg_var.bash"
 
diff --git a/rules/apache-log4cxx/default.bash b/rules/apache-log4cxx/default.bash
index 8c75964..ac99928 100644
--- a/rules/apache-log4cxx/default.bash
+++ b/rules/apache-log4cxx/default.bash
@@ -21,7 +21,7 @@ requires=\
 
 post_unpack()
 {
-    patches=$(ls "$cfg_package_spec_dir/patches-$version/"*.patch 2>/dev/null)
+    patches=$(ls "$pkg_dir/patches-$version/"*.patch 2>/dev/null)
     if [ -n "$patches" ]; then
         cat $patches | patch -p1
     fi
diff --git a/rules/boost/default.bash b/rules/boost/default.bash
index 6378a2f..ff5cafc 100644
--- a/rules/boost/default.bash
+++ b/rules/boost/default.bash
@@ -27,7 +27,7 @@ requires=\
 
 post_unpack()
 {
-    patches=$(ls "$cfg_package_spec_dir/patches-${version}/"*.patch)
+    patches=$(ls "$pkg_dir/patches-${version}/"*.patch)
     if [ -n "$patches" ]; then
         cd "../boost_$vendor_version" &&  cat $patches | patch -p1
     fi
diff --git a/rules/bridge-utils/default.bash b/rules/bridge-utils/default.bash
index 3ba30f0..ac311b9 100644
--- a/rules/bridge-utils/default.bash
+++ b/rules/bridge-utils/default.bash
@@ -20,7 +20,7 @@ maintainer=\
 
 post_unpack()
 {
-    patches=$(ls "$cfg_package_spec_dir/patches-$version/"*.patch 2>/dev/null)
+    patches=$(ls "$pkg_dir/patches-$version/"*.patch 2>/dev/null)
     if [ -n "$patches" ]; then
         cat $patches | patch -p1
     fi &&
diff --git a/rules/busybox/default.bash b/rules/busybox/default.bash
index c5a19df..ca3699d 100644
--- a/rules/busybox/default.bash
+++ b/rules/busybox/default.bash
@@ -15,7 +15,7 @@ md5=\
 
 post_unpack()
 {
-    patches=$(ls "$cfg_package_spec_dir"/patches/*.patch)
+    patches=$(ls "$pkg_dir"/patches/*.patch)
 
     if [ -n "$patches" ]; then
         cat $patches | patch -p1
@@ -24,7 +24,7 @@ post_unpack()
 
 configure()
 {
-    cp "$cfg_package_spec_dir"/config .config &&
+    cp "$pkg_dir"/config .config &&
     yes '' | $cmd_make CROSS_COMPILE="$cfg_target_canonical"- oldconfig
 }
 
@@ -36,5 +36,5 @@ build()
 target_install()
 {
     $cmd_make CROSS_COMPILE="$cfg_target_canonical"- CONFIG_PREFIX=$cfg_dir_rootfs install &&
-    tar -C "$cfg_package_spec_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
+    tar -C "$pkg_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
 }
diff --git a/rules/collectd/default.bash b/rules/collectd/default.bash
index 25a7ffd..e0cde90 100644
--- a/rules/collectd/default.bash
+++ b/rules/collectd/default.bash
@@ -88,7 +88,7 @@ target_install()
   # Collectd:
   $cmd_mkdir "$cfg_dir_rootfs/usr/share/"
   $cmd_cp    "$cfg_dir_toolchain_sysroot/usr/share/collectd/" "$cfg_dir_rootfs/usr/share/"
-  $cmd_cp    "${cfg_package_spec_dir}/fs/etc/rc.d/collectd"   "$cfg_dir_rootfs/etc/rc.d/"
+  $cmd_cp    "${pkg_dir}/fs/etc/rc.d/collectd"   "$cfg_dir_rootfs/etc/rc.d/"
 
   # Configuration:
   echo "# Client
diff --git a/rules/desert/default.bash b/rules/desert/default.bash
index 2c537fc..d363127 100644
--- a/rules/desert/default.bash
+++ b/rules/desert/default.bash
@@ -25,7 +25,7 @@ requires=\
 
 post_unpack()
 {
-    patches=$(ls "$cfg_package_spec_dir/patches/"*.patch)
+    patches=$(ls "$pkg_dir/patches/"*.patch)
     if [ -n "$patches" ]; then
         cat $patches | patch -p0
     fi
diff --git a/rules/dropbear/default.bash b/rules/dropbear/default.bash
index f53c5f4..a1fe5fb 100644
--- a/rules/dropbear/default.bash
+++ b/rules/dropbear/default.bash
@@ -25,7 +25,7 @@ requires=\
 
 post_unpack()
 {
-    patches=$(ls "$cfg_package_spec_dir/patches/"*.patch)
+    patches=$(ls "$pkg_dir/patches/"*.patch)
     if [ -n "$patches" ]; then
         cat $patches | patch -p1
     fi
@@ -62,5 +62,5 @@ target_install()
     ln -fs dropbearmulti "$cfg_dir_rootfs/usr/bin/ssh" &&
     ln -fs dropbearmulti "$cfg_dir_rootfs/usr/bin/dbclient" &&
     ln -fs ../bin/dropbearmulti "$cfg_dir_rootfs/usr/sbin/dropbear" &&
-    tar -C "$cfg_package_spec_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
+    tar -C "$pkg_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
 }
diff --git a/rules/dtn/default.bash b/rules/dtn/default.bash
index 3df233a..63a4a23 100644
--- a/rules/dtn/default.bash
+++ b/rules/dtn/default.bash
@@ -76,5 +76,5 @@ target_install()
     $cmd_target_strip daemon/dtnd -o "$cfg_dir_rootfs/usr/bin/dtnd" &&
     $cmd_mkdir "$cfg_dir_rootfs/etc/dtn" "$cfg_dir_rootfs/usr/share/dtn" &&
     cp servlib/conv_layers/clevent.xsd "$cfg_dir_rootfs/usr/share/dtn" &&
-    tar -C "$cfg_package_spec_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
+    tar -C "$pkg_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
 }
diff --git a/rules/eglibc/common.bash b/rules/eglibc/common.bash
index 8905c64..b1be15d 100644
--- a/rules/eglibc/common.bash
+++ b/rules/eglibc/common.bash
@@ -24,7 +24,7 @@ post_unpack()
 {
     ln -fs ../ports ../eglibc-$version/libc/ports
 
-    patches=$(ls "$cfg_package_spec_dir"/patches/*.patch)
+    patches=$(ls "$pkg_dir"/patches/*.patch)
 
     cd ../eglibc-$version
     if [ -n "$patches" ]; then
diff --git a/rules/eglibc/cross.bash b/rules/eglibc/cross.bash
index 29c2965..2a8ad57 100644
--- a/rules/eglibc/cross.bash
+++ b/rules/eglibc/cross.bash
@@ -13,7 +13,7 @@ build()
 host_install()
 {
     $cmd_make install_root="$cfg_dir_toolchain_sysroot" -j1 install &&
-    cp "$cfg_package_spec_dir"/files/timepps.h "$cfg_dir_toolchain_sysroot/usr/include"
+    cp "$pkg_dir"/files/timepps.h "$cfg_dir_toolchain_sysroot/usr/include"
 }
 
 target_install()
@@ -33,5 +33,5 @@ target_install()
 
     $cmd_target_strip -v --strip-unneeded "elf/ldconfig" \
         -o "$cfg_dir_rootfs/sbin/ldconfig" &&
-    tar -C "$cfg_package_spec_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
+    tar -C "$pkg_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
 }
diff --git a/rules/escc/default.bash b/rules/escc/default.bash
index 63868e4..0541505 100644
--- a/rules/escc/default.bash
+++ b/rules/escc/default.bash
@@ -44,5 +44,5 @@ target_install()
         $cmd_target_strip "utils/$util/$util" -o "$cfg_dir_rootfs/usr/bin/$util"
     done &&
 
-    tar -C "$cfg_package_spec_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
+    tar -C "$pkg_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
 }
diff --git a/rules/europa/default.bash b/rules/europa/default.bash
index 91dac78..9c2466c 100644
--- a/rules/europa/default.bash
+++ b/rules/europa/default.bash
@@ -27,7 +27,7 @@ requires=\
 
 post_unpack()
 {
-    patches=$(ls "$cfg_package_spec_dir"/patches-$version/*.patch)
+    patches=$(ls "$pkg_dir"/patches-$version/*.patch)
 
     if [ -n "$patches" ]; then
         cat $patches | patch -p1
@@ -37,7 +37,7 @@ post_unpack()
 build()
 {
     OLD_PATH="$PATH"
-    export PATH="$cfg_package_spec_dir/compat:$PATH"
+    export PATH="$pkg_dir/compat:$PATH"
     export PLASMA_HOME="$PWD/../europa-$version"
     export EUROPA_HOME="$cfg_dir_toolchain_sysroot/usr"
 
diff --git a/rules/expect/default.bash b/rules/expect/default.bash
index 0bc95a9..ddd78b8 100644
--- a/rules/expect/default.bash
+++ b/rules/expect/default.bash
@@ -21,7 +21,7 @@ requires=\
 post_unpack()
 {
     cd ../expect${version}
-    patches=$(ls "$cfg_package_spec_dir/patches/"*.patch)
+    patches=$(ls "$pkg_dir/patches/"*.patch)
     if [ -n "$patches" ]; then
         cat $patches | patch -p1
     fi
diff --git a/rules/fconfig/default.bash b/rules/fconfig/default.bash
index 1d29cf7..ec5c9e5 100644
--- a/rules/fconfig/default.bash
+++ b/rules/fconfig/default.bash
@@ -15,7 +15,7 @@ md5=\
 
 post_unpack()
 {
-    patch -d ../fconfig -p1 < "$cfg_package_spec_dir"/patches/limits.patch
+    patch -d ../fconfig -p1 < "$pkg_dir"/patches/limits.patch
 }
 
 build()
diff --git a/rules/filesystem/target.bash b/rules/filesystem/target.bash
index a6ae60f..0a4af2d 100644
--- a/rules/filesystem/target.bash
+++ b/rules/filesystem/target.bash
@@ -34,7 +34,7 @@ target_install()
     $cmd_mkdir "$cfg_dir_rootfs"/root/.ssh &&
     chmod 0700 "$cfg_dir_rootfs"/root/.ssh &&
 
-    tar -C "$cfg_package_spec_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
+    tar -C "$pkg_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
 
     if [ -d "$cfg_dir_system/fs" ]; then
         tar -C "$cfg_dir_system/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
diff --git a/rules/flac/default.bash b/rules/flac/default.bash
index 5b81eae..7c8d19a 100644
--- a/rules/flac/default.bash
+++ b/rules/flac/default.bash
@@ -19,7 +19,7 @@ requires=(
 
 post_unpack()
 {
-    patches=$(ls "$cfg_package_spec_dir/patches-$version/"*.patch)
+    patches=$(ls "$pkg_dir/patches-$version/"*.patch)
     if [ -n "$patches" ]; then
         cat $patches | patch -p1
     fi
diff --git a/rules/gcc/common.bash b/rules/gcc/common.bash
index 45e7fe1..d29653a 100644
--- a/rules/gcc/common.bash
+++ b/rules/gcc/common.bash
@@ -17,7 +17,7 @@ build_dir=$pkg_var
 
 post_unpack()
 {
-    patches=$(ls "$cfg_package_spec_dir/patches-${version}/"*.patch)
+    patches=$(ls "$pkg_dir/patches-${version}/"*.patch)
     if [ -n "$patches" ]; then
         cd "../gcc-$version" &&  cat $patches | patch -p1
     fi
diff --git a/rules/gpsd/default.bash b/rules/gpsd/default.bash
index f4c8807..85f1ec7 100644
--- a/rules/gpsd/default.bash
+++ b/rules/gpsd/default.bash
@@ -41,5 +41,5 @@ target_install()
         $cmd_target_strip "$l" -o $cfg_dir_rootfs/usr/lib/"$(basename $l)"
     done
 
-    cp "$cfg_package_spec_dir"/services/gpsd "$cfg_dir_rootfs/etc/rc.d"
+    cp "$pkg_dir"/services/gpsd "$cfg_dir_rootfs/etc/rc.d"
 }
diff --git a/rules/intel-microcode/default.bash b/rules/intel-microcode/default.bash
index f482469..82b4c83 100644
--- a/rules/intel-microcode/default.bash
+++ b/rules/intel-microcode/default.bash
@@ -10,5 +10,5 @@ maintainer=\
 
 target_install()
 {
-    tar -C "$cfg_package_spec_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
+    tar -C "$pkg_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
 }
diff --git a/rules/libpcap/default.bash b/rules/libpcap/default.bash
index d3cd366..7bde993 100644
--- a/rules/libpcap/default.bash
+++ b/rules/libpcap/default.bash
@@ -26,7 +26,7 @@ requires=\
 
 post_unpack()
 {
-    for patch in "$cfg_package_spec_dir"/patches/*; do
+    for patch in "$pkg_dir"/patches/*; do
         patch -p1 < "$patch" || return 1
     done
 }
diff --git a/rules/libusb-compat/default.bash b/rules/libusb-compat/default.bash
index 9d7434d..b9e3cf7 100644
--- a/rules/libusb-compat/default.bash
+++ b/rules/libusb-compat/default.bash
@@ -25,7 +25,7 @@ requires=\
 
 post_unpack()
 {
-    patches=$(ls "$cfg_package_spec_dir/patches/"*.patch)
+    patches=$(ls "$pkg_dir/patches/"*.patch)
     if [ -n "$patches" ]; then
         cat $patches | patch -p1
     fi
diff --git a/rules/libxslt/default.bash b/rules/libxslt/default.bash
index fca9f62..6b881ea 100644
--- a/rules/libxslt/default.bash
+++ b/rules/libxslt/default.bash
@@ -15,7 +15,7 @@ md5=\
 
 post_unpack()
 {
-    patch -p1 < "$cfg_package_spec_dir"/patches/libxslt-configure.patch
+    patch -p1 < "$pkg_dir"/patches/libxslt-configure.patch
 }
 
 requires=\
diff --git a/rules/linux/common.bash b/rules/linux/common.bash
index 6469447..41be8b9 100644
--- a/rules/linux/common.bash
+++ b/rules/linux/common.bash
@@ -1,6 +1,6 @@
 post_unpack()
 {
-    patches=$(ls "$cfg_package_spec_dir/patches-$version/"*.patch\
+    patches=$(ls "$pkg_dir/patches-$version/"*.patch\
 	"$cfg_dir_system/patches/linux/patches-${version}/"*.patch 2>/dev/null)
     if [ -n "$patches" ]; then
         cat $patches | patch -p1
diff --git a/rules/lsts/default.bash b/rules/lsts/default.bash
index 49c82c4..36e11c4 100644
--- a/rules/lsts/default.bash
+++ b/rules/lsts/default.bash
@@ -17,11 +17,11 @@ requires=\
 download()
 {
     mkdir -p dnsmasq.d &&
-    python "$cfg_package_spec_dir/download-peers.py" dnsmasq.d
+    python "$pkg_dir/download-peers.py" dnsmasq.d
 }
 
 target_install()
 {
-    tar -C "$cfg_package_spec_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f - &&
+    tar -C "$pkg_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f - &&
     tar -C dnsmasq.d --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs/etc" -x -v -f -
 }
diff --git a/rules/m4/host.bash b/rules/m4/host.bash
index 5da5817..10b227c 100644
--- a/rules/m4/host.bash
+++ b/rules/m4/host.bash
@@ -20,7 +20,7 @@ maintainer=\
 
 post_unpack()
 {
-    patches=$(ls "$cfg_package_spec_dir/patches/"*.patch)
+    patches=$(ls "$pkg_dir/patches/"*.patch)
     if [ -n "$patches" ]; then
         cd "../m4-$version" && cat $patches | patch -p1
     fi
diff --git a/rules/ns/default.bash b/rules/ns/default.bash
index 87eb527..3eed53c 100644
--- a/rules/ns/default.bash
+++ b/rules/ns/default.bash
@@ -29,7 +29,7 @@ requires=\
 
 post_unpack()
 {
-    patches=$(ls "$cfg_package_spec_dir/patches/"*.patch)
+    patches=$(ls "$pkg_dir/patches/"*.patch)
     if [ -n "$patches" ]; then
         cat $patches | patch -p1
     fi
diff --git a/rules/ntp/default.bash b/rules/ntp/default.bash
index f24562e..e937d0e 100644
--- a/rules/ntp/default.bash
+++ b/rules/ntp/default.bash
@@ -37,5 +37,5 @@ target_install()
     $cmd_target_strip ntpd/ntpd -o $cfg_dir_rootfs/usr/bin/ntpd &&
     $cmd_target_strip ntpdate/ntpdate -o $cfg_dir_rootfs/usr/bin/ntpdate &&
     $cmd_target_strip ntpq/ntpq -o $cfg_dir_rootfs/usr/bin/ntpq &&
-    tar -C "$cfg_package_spec_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
+    tar -C "$pkg_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
 }
diff --git a/rules/omniEvents/default.bash b/rules/omniEvents/default.bash
index a89fb50..f7700c3 100644
--- a/rules/omniEvents/default.bash
+++ b/rules/omniEvents/default.bash
@@ -25,7 +25,7 @@ md5=\
 
 post_unpack()
 {
-  patches=$(ls "$cfg_package_spec_dir"/patches-${version}/*.patch)
+  patches=$(ls "$pkg_dir"/patches-${version}/*.patch)
   if [ -n "$patches" ]; then
 #    echo " cat $patches | patch -p1 "
     cat $patches | patch -p1
@@ -58,8 +58,8 @@ target_install()
 {
   # Log:
   $cmd_mkdir "${cfg_dir_rootfs}/var/lib/omniEvents/"
-  $cmd_cp    "${cfg_package_spec_dir}/fs/etc/rc.d/omniEvents"    "$cfg_dir_rootfs/etc/rc.d/omniEvents"
-  $cmd_cp    "${cfg_package_spec_dir}/fs/etc/omniorb-eventservice"    "${cfg_dir_rootfs}/etc/"
+  $cmd_cp    "${pkg_dir}/fs/etc/rc.d/omniEvents"    "$cfg_dir_rootfs/etc/rc.d/omniEvents"
+  $cmd_cp    "${pkg_dir}/fs/etc/omniorb-eventservice"    "${cfg_dir_rootfs}/etc/"
 
   # Binaries:
   $cmd_cp "${cfg_dir_toolchain_sysroot}/usr/lib/lib"*"omniEvents"* "${cfg_dir_rootfs}/usr/lib"
diff --git a/rules/omniorb/default.bash b/rules/omniorb/default.bash
index 083bc2a..1c36ba8 100644
--- a/rules/omniorb/default.bash
+++ b/rules/omniorb/default.bash
@@ -89,8 +89,8 @@ target_install()
     $cmd_cp "$cfg_dir_toolchain_sysroot/usr/bin/catior"        "$cfg_dir_rootfs/usr/bin"
 
     # Specific configuration:
-    $cmd_cp "${cfg_package_spec_dir}/fs/etc/rc.d/omninames"    "$cfg_dir_rootfs/etc/rc.d/omninames"
-    $cmd_cp "${cfg_package_spec_dir}/fs/etc/omniORB.cfg"       "$cfg_dir_rootfs/etc/omniORB.cfg"
+    $cmd_cp "${pkg_dir}/fs/etc/rc.d/omninames"    "$cfg_dir_rootfs/etc/rc.d/omninames"
+    $cmd_cp "${pkg_dir}/fs/etc/omniORB.cfg"       "$cfg_dir_rootfs/etc/omniORB.cfg"
 
     # Log:
     $cmd_mkdir "${cfg_dir_rootfs}/var/omninames/"
diff --git a/rules/perl-modules/default.bash b/rules/perl-modules/default.bash
index 8db7fa6..ff1ebec 100644
--- a/rules/perl-modules/default.bash
+++ b/rules/perl-modules/default.bash
@@ -47,7 +47,7 @@ requires=\
 
 post_unpack()
 {
-    sed "s!%cfg_dir_rootfs%!$cfg_dir_rootfs!g" "$cfg_package_spec_dir"/perl.in > "$pkg_build_dir"/perl &&
+    sed "s!%cfg_dir_rootfs%!$cfg_dir_rootfs!g" "$pkg_dir"/perl.in > "$pkg_build_dir"/perl &&
     chmod 0755 "$pkg_build_dir"/perl
 }
 
diff --git a/rules/perl/default.bash b/rules/perl/default.bash
index 4e48b9b..977d986 100644
--- a/rules/perl/default.bash
+++ b/rules/perl/default.bash
@@ -23,7 +23,7 @@ post_unpack()
     chmod -v 644 Makefile.SH &&
     chmod -v 644 utils/Makefile.SH
 
-    patches=$(ls "$cfg_package_spec_dir"/patches-${version}/*.patch)
+    patches=$(ls "$pkg_dir"/patches-${version}/*.patch)
     if [ -n "$patches" ]; then
         cat $patches | patch -p1
     fi
diff --git a/rules/ppp/default.bash b/rules/ppp/default.bash
index 0c31730..5aba8b9 100644
--- a/rules/ppp/default.bash
+++ b/rules/ppp/default.bash
@@ -25,7 +25,7 @@ requires=\
 
 post_unpack()
 {
-    for patch in "$cfg_package_spec_dir"/patches/*; do
+    for patch in "$pkg_dir"/patches/*; do
         patch -p1 < "$patch" || return 1
     done
 }
diff --git a/rules/ptpd/default.bash b/rules/ptpd/default.bash
index a320864..11ce0f9 100644
--- a/rules/ptpd/default.bash
+++ b/rules/ptpd/default.bash
@@ -26,5 +26,5 @@ build()
 target_install()
 {
     $cmd_target_strip src/ptpd2 -o $cfg_dir_rootfs/usr/bin/ptpd2 &&
-    tar -C "$cfg_package_spec_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
+    tar -C "$pkg_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
 }
diff --git a/rules/python/default.bash b/rules/python/default.bash
index ae38fe7..42b36f1 100644
--- a/rules/python/default.bash
+++ b/rules/python/default.bash
@@ -14,8 +14,8 @@ configure()
   echo "Configure is in $(pwd)"
 
   # We are patching the source as python needs python to compile python for our target:
-  patch -p1 < "${cfg_package_spec_dir}/patches/Python-${version}-xcompile.patch"
-  patch -p1 < "${cfg_package_spec_dir}/patches/001-Enable-zlib-bz2.patch"
+  patch -p1 < "${pkg_dir}/patches/Python-${version}-xcompile.patch"
+  patch -p1 < "${pkg_dir}/patches/001-Enable-zlib-bz2.patch"
 
   export CC="$cfg_target_canonical-gcc"
   export CXX="$cfg_target_canonical-g++"
diff --git a/rules/readline/default.bash b/rules/readline/default.bash
index 81cdf98..06ce505 100644
--- a/rules/readline/default.bash
+++ b/rules/readline/default.bash
@@ -25,7 +25,7 @@ maintainer=\
 
 post_unpack()
 {
-    patches=$(ls "$cfg_package_spec_dir/patches/"*.patch)
+    patches=$(ls "$pkg_dir/patches/"*.patch)
     if [ -n "$patches" ]; then
         cat $patches | patch -p0
     fi
diff --git a/rules/setserial/default.bash b/rules/setserial/default.bash
index 98d3e91..b55af73 100644
--- a/rules/setserial/default.bash
+++ b/rules/setserial/default.bash
@@ -36,5 +36,5 @@ build()
 target_install()
 {
     $cmd_target_strip setserial -o $cfg_dir_rootfs/usr/bin/setserial
-    cp "$cfg_package_spec_dir"/services/setserial "$cfg_dir_rootfs/etc/rc.d"
+    cp "$pkg_dir"/services/setserial "$cfg_dir_rootfs/etc/rc.d"
 }
diff --git a/rules/syslinux/default.bash b/rules/syslinux/default.bash
index 09ea464..33cd44d 100644
--- a/rules/syslinux/default.bash
+++ b/rules/syslinux/default.bash
@@ -24,7 +24,7 @@ target_install()
     $cmd_target_strip extlinux/extlinux -o $cfg_dir_rootfs/usr/sbin/extlinux &&
     $cmd_mkdir $cfg_dir_rootfs/boot/extlinux &&
     cp -d mbr/mbr.bin $cfg_dir_rootfs/boot/extlinux &&
-    (echo $console ; cat "$cfg_package_spec_dir"/extlinux.conf) \
+    (echo $console ; cat "$pkg_dir"/extlinux.conf) \
          | sed "s%\$cfg_kernel_extra_args%$cfg_kernel_extra_args%g" \
          | sed "s%\$cfg_kernel_boot_dev%$cfg_kernel_boot_dev%g" \
          >  "$cfg_dir_rootfs/boot/extlinux/extlinux.conf"
diff --git a/rules/tclcl/default.bash b/rules/tclcl/default.bash
index c1f5f91..7bad685 100644
--- a/rules/tclcl/default.bash
+++ b/rules/tclcl/default.bash
@@ -20,7 +20,7 @@ maintainer=\
 
 post_unpack()
 {
-    patches=$(ls "$cfg_package_spec_dir"/patches/*.patch)
+    patches=$(ls "$pkg_dir"/patches/*.patch)
     if [ -n "$patches" ]; then
         cat $patches | patch -p1
     fi
diff --git a/rules/trex/default.bash b/rules/trex/default.bash
index 569841b..4a069fd 100644
--- a/rules/trex/default.bash
+++ b/rules/trex/default.bash
@@ -42,5 +42,5 @@ target_install()
         $cmd_target_strip "$dst"
     done &&
 
-    tar -C "$cfg_package_spec_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
+    tar -C "$pkg_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
 }
diff --git a/rules/u-boot/common.bash b/rules/u-boot/common.bash
index c2ac2c7..bac9ff2 100644
--- a/rules/u-boot/common.bash
+++ b/rules/u-boot/common.bash
@@ -1,6 +1,6 @@
 post_unpack()
 {
-    patches=$(ls "$cfg_package_spec_dir/patches-$version/"*.patch\
+    patches=$(ls "$pkg_dir/patches-$version/"*.patch\
 	"$cfg_dir_system/patches/u-boot/patches-${version}/"*.patch 2>/dev/null)
     if [ -n "$patches" ]; then
         cat $patches | patch -p1
diff --git a/rules/u-boot/igep_xloader.bash b/rules/u-boot/igep_xloader.bash
index b3f0619..89378fb 100644
--- a/rules/u-boot/igep_xloader.bash
+++ b/rules/u-boot/igep_xloader.bash
@@ -1,4 +1,4 @@
-source "$cfg_package_spec_dir/default.bash"
+source "$pkg_dir/default.bash"
 
 host_install()
 {
diff --git a/rules/valgrind/default.bash b/rules/valgrind/default.bash
index a2803eb..0027627 100644
--- a/rules/valgrind/default.bash
+++ b/rules/valgrind/default.bash
@@ -20,7 +20,7 @@ maintainer=\
 
 # post_unpack()
 # {
-#     patches=$(ls "$cfg_package_spec_dir"/patches/*.patch)
+#     patches=$(ls "$pkg_dir"/patches/*.patch)
 #     if [ -n "$patches" ]; then
 #         cat $patches | patch -p1
 #     fi
diff --git a/rules/xerces-c/default.bash b/rules/xerces-c/default.bash
index f426cda..e5156d2 100644
--- a/rules/xerces-c/default.bash
+++ b/rules/xerces-c/default.bash
@@ -22,7 +22,7 @@ maintainer=\
 
 post_unpack()
 {
-    patches=$(ls "$cfg_package_spec_dir"/patches/*.patch)
+    patches=$(ls "$pkg_dir"/patches/*.patch)
 
     if [ -n "$patches" ]; then
         cd ../xerces-c-src_$vendor_version &&