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

GLUED: replaced PKG with pkg.

Browse Source
This commit is contained in:
Ricardo Martins 2014-02-02 09:50:11 +00:00
parent ae75cb017f
commit 6420cb1823
7 changed files with 42 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
mkpackage.bash
View File

@ -97,7 +97,7 @@ download()
u="$(echo ${git[$n]} | cut -f1 -d'#')" u="$(echo ${git[$n]} | cut -f1 -d'#')"
b="$(echo ${git[$n]} | cut -f2 -d'#')" b="$(echo ${git[$n]} | cut -f2 -d'#')"
dir=$(basename $u) dir=$(basename $u)
des="${cfg_dir_builds}/$PKG/$dir-git" des="${cfg_dir_builds}/$pkg/$dir-git"
if [[ "$u" == git* ]]; then if [[ "$u" == git* ]]; then
git clone --verbose --branch "$b" "$u" "$des" git clone --verbose --branch "$b" "$u" "$des"
@ -125,10 +125,10 @@ unpack()
case $file in case $file in
*tar*|*tgz|*tbz*) *tar*|*tgz|*tbz*)
tar -C "$cfg_dir_builds/$PKG" -x -f "$cfg_dir_downloads/$file" || exit 1 tar -C "$cfg_dir_builds/$pkg" -x -f "$cfg_dir_downloads/$file" || exit 1
;; ;;
*zip) *zip)
unzip "$cfg_dir_downloads/$file" -d "$cfg_dir_builds/$PKG" || exit 1 unzip "$cfg_dir_downloads/$file" -d "$cfg_dir_builds/$pkg" || exit 1
;; ;;
*) *)
echo "File $file can't be handled." echo "File $file can't be handled."
@ -139,11 +139,11 @@ unpack()
dir_gnu_cfg="$cfg_dir_toolchain/share/gnu-config" dir_gnu_cfg="$cfg_dir_toolchain/share/gnu-config"
if [ "$cfg_dir_cfg/config.sub" ]; then if [ "$cfg_dir_cfg/config.sub" ]; then
find "$cfg_dir_builds/$PKG" -name config.sub -exec install -v -m 0755 "$dir_gnu_cfg/config.sub" '{}' \; find "$cfg_dir_builds/$pkg" -name config.sub -exec install -v -m 0755 "$dir_gnu_cfg/config.sub" '{}' \;
fi fi
if [ "$cfg_dir_cfg/config.guess" ]; then if [ "$cfg_dir_cfg/config.guess" ]; then
find "$cfg_dir_builds/$PKG" -name config.guess -exec install -v -m 0755 "$dir_gnu_cfg/config.guess" '{}' \; find "$cfg_dir_builds/$pkg" -name config.guess -exec install -v -m 0755 "$dir_gnu_cfg/config.guess" '{}' \;
fi fi
return 0 return 0
@ -181,48 +181,48 @@ 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
download | unpack | post_unpack) download | unpack | post_unpack)
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"
fi fi
if [ -n "$build_dir" ]; then if [ -n "$build_dir" ]; then
mkdir -p "$cfg_dir_builds/$PKG/$build_dir" && cd "$cfg_dir_builds/$PKG/$build_dir" mkdir -p "$cfg_dir_builds/$pkg/$build_dir" && cd "$cfg_dir_builds/$pkg/$build_dir"
fi fi
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.
@ -298,17 +298,17 @@ if [ "$pkg_var" = "$pkg" ]; then
pkg_var='default' pkg_var='default'
fi fi
export PKG="$pkg" export pkg
export pkg_var="$pkg_var" export 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
echo "ERROR: package '$PKG' does not exist." echo "ERROR: package '$pkg' does not exist."
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
@ -318,18 +318,18 @@ else
rule="$3" rule="$3"
fi fi
mkdir -p "$cfg_dir_downloads" "$cfg_dir_rootfs" "$cfg_dir_toolchain" "$cfg_dir_builds/$PKG" mkdir -p "$cfg_dir_downloads" "$cfg_dir_rootfs" "$cfg_dir_toolchain" "$cfg_dir_builds/$pkg"
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
# echo "ERROR: postconfiguration exists '$PKG'." # echo "ERROR: postconfiguration exists '$pkg'."
# echo "$cfg_dir_postconfiguration/$PKG/$cfg_sys_name.bash" # echo "$cfg_dir_postconfiguration/$pkg/$cfg_sys_name.bash"
# exit 1 # exit 1
. "$cfg_dir_postconfiguration/$PKG/$cfg_sys_name.bash" . "$cfg_dir_postconfiguration/$pkg/$cfg_sys_name.bash"
fi fi
# Handle dependencies. # Handle dependencies.
@ -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/am33xx-cm3/host.bash
View File

@ -15,7 +15,7 @@ maintainer=\
download() download()
{ {
git clone "$url" "$cfg_dir_builds/$PKG/$PKG-$version" git clone "$url" "$cfg_dir_builds/$pkg/$pkg-$version"
} }
unpack() unpack()

3
packages/janus/default.bash
View File

@ -13,7 +13,7 @@ md5=\
unpack() unpack()
{ {
cd ${pkg_build_dir}/.. cd ${pkg_build_dir}/..
unzip ${cfg_dir_downloads}/${PKG}-${version}.zip unzip ${cfg_dir_downloads}/${pkg}-${version}.zip
} }
requires=\ requires=\
@ -118,4 +118,3 @@ janus-rx \${PARAMETERS_RX}
" > "$cfg_dir_rootfs/usr/bin/janus_wtest.sh" " > "$cfg_dir_rootfs/usr/bin/janus_wtest.sh"
} }

3
packages/janus/fft_single.bash
View File

@ -12,7 +12,7 @@ md5=\
unpack() unpack()
{ {
cd ${pkg_build_dir}/.. cd ${pkg_build_dir}/..
unzip ${cfg_dir_downloads}/${PKG}-${version}.zip unzip ${cfg_dir_downloads}/${pkg}-${version}.zip
} }
requires=\ requires=\
@ -120,4 +120,3 @@ janusf-rx \${PARAMETERS_RX}
" > "$cfg_dir_rootfs/usr/bin/janusf_wtest.sh" " > "$cfg_dir_rootfs/usr/bin/janusf_wtest.sh"
} }

3
packages/janus/neon.bash
View File

@ -12,7 +12,7 @@ md5=\
unpack() unpack()
{ {
cd ${pkg_build_dir}/.. cd ${pkg_build_dir}/..
unzip ${cfg_dir_downloads}/${PKG}-${version}.zip unzip ${cfg_dir_downloads}/${pkg}-${version}.zip
} }
requires=\ requires=\
@ -120,4 +120,3 @@ janusn-rx \${PARAMETERS_RX}
" > "$cfg_dir_rootfs/usr/bin/janusn_wtest.sh" " > "$cfg_dir_rootfs/usr/bin/janusn_wtest.sh"
} }

3
packages/janus/single.bash
View File

@ -12,7 +12,7 @@ md5=\
unpack() unpack()
{ {
cd ${pkg_build_dir}/.. cd ${pkg_build_dir}/..
unzip ${cfg_dir_downloads}/${PKG}-${version}.zip unzip ${cfg_dir_downloads}/${pkg}-${version}.zip
} }
requires=\ requires=\
@ -119,4 +119,3 @@ januss-rx \${PARAMETERS_RX}
" > "$cfg_dir_rootfs/usr/bin/januss_wtest.sh" " > "$cfg_dir_rootfs/usr/bin/januss_wtest.sh"
} }

2
packages/u-boot/igep_xloader.bash
View File

@ -1,4 +1,4 @@
source "$cfg_dir_packages/$PKG/default.bash" source "$cfg_dir_packages/$pkg/default.bash"
host_install() host_install()
{ {