From ae75cb017f7abf9373c59583b6224ca8c95de131 Mon Sep 17 00:00:00 2001 From: Ricardo Martins Date: Sun, 2 Feb 2014 09:47:16 +0000 Subject: [PATCH] GLUED: replaced PKG_COMMON with pkg_common. --- mkpackage.bash | 2 +- packages/base/cross.bash | 2 +- packages/base/default.bash | 2 +- packages/bzip2/default.bash | 2 +- packages/bzip2/host.bash | 2 +- packages/eglibc/cross.bash | 2 +- packages/eglibc/headers.bash | 2 +- packages/eglibc/locales.bash | 2 +- packages/gcc/cross.bash | 2 +- packages/gcc/cross_stage1.bash | 2 +- packages/gcc/cross_stage2.bash | 2 +- packages/gdb/cross.bash | 2 +- packages/gdb/default.bash | 2 +- packages/libffi/default.bash | 2 +- packages/libffi/host.bash | 2 +- packages/linux/default.bash | 2 +- packages/linux/igep.bash | 2 +- packages/lvm2/default.bash | 2 +- packages/ncurses/default.bash | 2 +- packages/ncurses/host.bash | 2 +- packages/protobuf/cross.bash | 2 +- packages/protobuf/default.bash | 2 +- packages/python/cross.bash | 2 +- packages/python/default.bash | 2 +- packages/python_host/host.bash | 2 +- packages/syslinux/default.bash | 2 +- packages/syslinux/host.bash | 2 +- packages/u-boot/default.bash | 2 +- packages/util-linux/default.bash | 2 +- packages/util-linux/host.bash | 2 +- packages/util-linux/ldattach.bash | 2 +- packages/wget/default.bash | 2 +- packages/wget/host.bash | 2 +- packages/zlib/default.bash | 2 +- packages/zlib/host.bash | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/mkpackage.bash b/mkpackage.bash index bff2133..9744b73 100755 --- a/mkpackage.bash +++ b/mkpackage.bash @@ -300,7 +300,7 @@ fi export PKG="$pkg" 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 echo "ERROR: package '$PKG' does not exist." diff --git a/packages/base/cross.bash b/packages/base/cross.bash index 948375f..7ebb452 100644 --- a/packages/base/cross.bash +++ b/packages/base/cross.bash @@ -1,4 +1,4 @@ -source $PKG_COMMON +source $pkg_common requires=\ ( diff --git a/packages/base/default.bash b/packages/base/default.bash index 3edf537..697bd3e 100644 --- a/packages/base/default.bash +++ b/packages/base/default.bash @@ -1,4 +1,4 @@ -source $PKG_COMMON +source $pkg_common requires=\ ( diff --git a/packages/bzip2/default.bash b/packages/bzip2/default.bash index 731c8e8..69b0e5e 100644 --- a/packages/bzip2/default.bash +++ b/packages/bzip2/default.bash @@ -1,4 +1,4 @@ -source $PKG_COMMON +source $pkg_common configure() diff --git a/packages/bzip2/host.bash b/packages/bzip2/host.bash index 2e8e046..0b86de0 100644 --- a/packages/bzip2/host.bash +++ b/packages/bzip2/host.bash @@ -1,4 +1,4 @@ -source $PKG_COMMON +source $pkg_common build() { diff --git a/packages/eglibc/cross.bash b/packages/eglibc/cross.bash index b9895ae..29c2965 100644 --- a/packages/eglibc/cross.bash +++ b/packages/eglibc/cross.bash @@ -1,4 +1,4 @@ -source $PKG_COMMON +source $pkg_common requires=\ ( diff --git a/packages/eglibc/headers.bash b/packages/eglibc/headers.bash index 7b4e801..cfd01fa 100644 --- a/packages/eglibc/headers.bash +++ b/packages/eglibc/headers.bash @@ -1,4 +1,4 @@ -source $PKG_COMMON +source $pkg_common requires=\ ( diff --git a/packages/eglibc/locales.bash b/packages/eglibc/locales.bash index ffc49ab..b986f7b 100644 --- a/packages/eglibc/locales.bash +++ b/packages/eglibc/locales.bash @@ -1,4 +1,4 @@ -source $PKG_COMMON +source $pkg_common requires=\ ( diff --git a/packages/gcc/cross.bash b/packages/gcc/cross.bash index 5a8fce6..8fd79d7 100644 --- a/packages/gcc/cross.bash +++ b/packages/gcc/cross.bash @@ -1,4 +1,4 @@ -source $PKG_COMMON +source $pkg_common requires=\ ( diff --git a/packages/gcc/cross_stage1.bash b/packages/gcc/cross_stage1.bash index 1bd6449..106bdad 100644 --- a/packages/gcc/cross_stage1.bash +++ b/packages/gcc/cross_stage1.bash @@ -1,4 +1,4 @@ -source $PKG_COMMON +source $pkg_common requires=\ ( diff --git a/packages/gcc/cross_stage2.bash b/packages/gcc/cross_stage2.bash index ff41401..bfe2118 100644 --- a/packages/gcc/cross_stage2.bash +++ b/packages/gcc/cross_stage2.bash @@ -1,4 +1,4 @@ -source $PKG_COMMON +source $pkg_common requires=\ ( diff --git a/packages/gdb/cross.bash b/packages/gdb/cross.bash index d564eeb..3cd3b64 100644 --- a/packages/gdb/cross.bash +++ b/packages/gdb/cross.bash @@ -1,4 +1,4 @@ -source $PKG_COMMON +source $pkg_common requires=\ ( diff --git a/packages/gdb/default.bash b/packages/gdb/default.bash index ee8ac29..1bd54ef 100644 --- a/packages/gdb/default.bash +++ b/packages/gdb/default.bash @@ -1,4 +1,4 @@ -source $PKG_COMMON +source $pkg_common requires=\ ( diff --git a/packages/libffi/default.bash b/packages/libffi/default.bash index 1f8bb10..58974fc 100755 --- a/packages/libffi/default.bash +++ b/packages/libffi/default.bash @@ -1,4 +1,4 @@ -source "$PKG_COMMON" +source "$pkg_common" configure() { diff --git a/packages/libffi/host.bash b/packages/libffi/host.bash index a404b5e..cabdc7e 100644 --- a/packages/libffi/host.bash +++ b/packages/libffi/host.bash @@ -1,4 +1,4 @@ -source "$PKG_COMMON" +source "$pkg_common" configure() { diff --git a/packages/linux/default.bash b/packages/linux/default.bash index f4433fc..9ca14cd 100644 --- a/packages/linux/default.bash +++ b/packages/linux/default.bash @@ -1,4 +1,4 @@ -source "$PKG_COMMON" +source "$pkg_common" version=\ ( diff --git a/packages/linux/igep.bash b/packages/linux/igep.bash index 96bbd69..964b3bd 100644 --- a/packages/linux/igep.bash +++ b/packages/linux/igep.bash @@ -1,4 +1,4 @@ -source "$PKG_COMMON" +source "$pkg_common" version=\ ( diff --git a/packages/lvm2/default.bash b/packages/lvm2/default.bash index 3fbcac6..230ce1d 100644 --- a/packages/lvm2/default.bash +++ b/packages/lvm2/default.bash @@ -1,4 +1,4 @@ -source $PKG_COMMON +source $pkg_common configure() { diff --git a/packages/ncurses/default.bash b/packages/ncurses/default.bash index cca987b..ac1d6a9 100644 --- a/packages/ncurses/default.bash +++ b/packages/ncurses/default.bash @@ -1,4 +1,4 @@ -source $PKG_COMMON +source $pkg_common configure_common() { diff --git a/packages/ncurses/host.bash b/packages/ncurses/host.bash index d1604b6..8aa54a0 100644 --- a/packages/ncurses/host.bash +++ b/packages/ncurses/host.bash @@ -1,4 +1,4 @@ -source $PKG_COMMON +source $pkg_common configure() { diff --git a/packages/protobuf/cross.bash b/packages/protobuf/cross.bash index b0d7986..17a8283 100644 --- a/packages/protobuf/cross.bash +++ b/packages/protobuf/cross.bash @@ -1,4 +1,4 @@ -source $PKG_COMMON +source $pkg_common # We need to build it once on our host system in order to create the "protoc" file used by the second step. configure() diff --git a/packages/protobuf/default.bash b/packages/protobuf/default.bash index 16224e3..3637d30 100644 --- a/packages/protobuf/default.bash +++ b/packages/protobuf/default.bash @@ -1,4 +1,4 @@ -source $PKG_COMMON +source $pkg_common requires=\ ( diff --git a/packages/python/cross.bash b/packages/python/cross.bash index bd5de6c..1c58632 100644 --- a/packages/python/cross.bash +++ b/packages/python/cross.bash @@ -1,4 +1,4 @@ -source $PKG_COMMON +source $pkg_common configure() { diff --git a/packages/python/default.bash b/packages/python/default.bash index bd928a5..ae38fe7 100644 --- a/packages/python/default.bash +++ b/packages/python/default.bash @@ -1,5 +1,5 @@ # Following indication from: http://randomsplat.com/id5-cross-compiling-python-for-embedded-linux.html -source $PKG_COMMON +source $pkg_common requires=\ ( diff --git a/packages/python_host/host.bash b/packages/python_host/host.bash index 2f80721..148192c 100644 --- a/packages/python_host/host.bash +++ b/packages/python_host/host.bash @@ -1,4 +1,4 @@ -source $PKG_COMMON +source $pkg_common configure() { diff --git a/packages/syslinux/default.bash b/packages/syslinux/default.bash index 46ec4e0..09ea464 100644 --- a/packages/syslinux/default.bash +++ b/packages/syslinux/default.bash @@ -1,4 +1,4 @@ -source $PKG_COMMON +source $pkg_common host_install() { diff --git a/packages/syslinux/host.bash b/packages/syslinux/host.bash index bf0a29e..0b30f36 100644 --- a/packages/syslinux/host.bash +++ b/packages/syslinux/host.bash @@ -1,4 +1,4 @@ -source $PKG_COMMON +source $pkg_common host_install() { diff --git a/packages/u-boot/default.bash b/packages/u-boot/default.bash index 08e8409..61117cd 100644 --- a/packages/u-boot/default.bash +++ b/packages/u-boot/default.bash @@ -1,4 +1,4 @@ -source "$PKG_COMMON" +source "$pkg_common" version=\ ( diff --git a/packages/util-linux/default.bash b/packages/util-linux/default.bash index 86eff5b..73961d9 100755 --- a/packages/util-linux/default.bash +++ b/packages/util-linux/default.bash @@ -1,4 +1,4 @@ -source "$PKG_COMMON" +source "$pkg_common" configure() { diff --git a/packages/util-linux/host.bash b/packages/util-linux/host.bash index f8e9b09..57fd3b2 100755 --- a/packages/util-linux/host.bash +++ b/packages/util-linux/host.bash @@ -1,4 +1,4 @@ -source "$PKG_COMMON" +source "$pkg_common" configure() { diff --git a/packages/util-linux/ldattach.bash b/packages/util-linux/ldattach.bash index dfaff11..71807ba 100644 --- a/packages/util-linux/ldattach.bash +++ b/packages/util-linux/ldattach.bash @@ -1,4 +1,4 @@ -source "$PKG_COMMON" +source "$pkg_common" configure() { diff --git a/packages/wget/default.bash b/packages/wget/default.bash index 4c93925..2c9b958 100644 --- a/packages/wget/default.bash +++ b/packages/wget/default.bash @@ -1,4 +1,4 @@ -source $PKG_COMMON +source $pkg_common requires=\ ( diff --git a/packages/wget/host.bash b/packages/wget/host.bash index 0145bce..e76f4bf 100644 --- a/packages/wget/host.bash +++ b/packages/wget/host.bash @@ -1,4 +1,4 @@ -source $PKG_COMMON +source $pkg_common configure() { diff --git a/packages/zlib/default.bash b/packages/zlib/default.bash index 642f3d8..118c18b 100644 --- a/packages/zlib/default.bash +++ b/packages/zlib/default.bash @@ -1,4 +1,4 @@ -source "$PKG_COMMON" +source "$pkg_common" configure() { diff --git a/packages/zlib/host.bash b/packages/zlib/host.bash index 6586f23..930192b 100755 --- a/packages/zlib/host.bash +++ b/packages/zlib/host.bash @@ -1,4 +1,4 @@ -source "$PKG_COMMON" +source "$pkg_common" configure() {