pygos/build
1
0
Fork 0
mirror of https://github.com/pygos/build.git synced 2024-11-22 19:19:46 +01:00
Code Issues Releases Wiki Activity

Prefix build dir for toolchain packages with "tc-"

Browse source 
This way, we can have sysroot packages with the same name
as toolchain packages.

Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
This commit is contained in:
David Oberhollenzer 2018-01-21 21:21:59 +01:00
parent 2f569eee34
commit ec9e6f8857
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
util/pkgcmd.sh
View file

@ -2,8 +2,9 @@ run_pkg_command_common() {
local NAME="$1" local NAME="$1"
local FUNCTION="$2" local FUNCTION="$2"
local PKGDIR="$3" local PKGDIR="$3"
local DEPLOYDIR="$4" local DEPLOYDIR="$PKGDEPLOYDIR/$4"
local CHECKFILE="$PKGLOGDIR/.${NAME}-${FUNCTION}" local OUT="$PKGBUILDDIR/$5"
local CHECKFILE="$PKGLOGDIR/.${6}-${FUNCTION}"
echo "$NAME - $FUNCTION" echo "$NAME - $FUNCTION"
@ -15,8 +16,7 @@ run_pkg_command_common() {
unset -v VERSION TARBALL URL SRCDIR SHA256SUM unset -v VERSION TARBALL URL SRCDIR SHA256SUM
source "$SCRIPTDIR/$PKGDIR/$NAME/build" source "$SCRIPTDIR/$PKGDIR/$NAME/build"
local LOGFILE="$PKGLOGDIR/${NAME}-${FUNCTION}.log" local LOGFILE="$PKGLOGDIR/${7}-${FUNCTION}.log"
local OUT="$PKGBUILDDIR/$NAME"
local SRC="$PKGSRCDIR/$SRCDIR" local SRC="$PKGSRCDIR/$SRCDIR"
mkdir -p "$DEPLOYDIR" "$OUT" "${DEPLOYDIR}-dev" mkdir -p "$DEPLOYDIR" "$OUT" "${DEPLOYDIR}-dev"
@ -33,13 +33,9 @@ run_pkg_command_common() {
} }
run_pkg_command() { run_pkg_command() {
local DEPLOYDIR="$PKGDEPLOYDIR/$1" run_pkg_command_common "$1" "$2" "pkg" "$1" "$1" "$1" "$1"
run_pkg_command_common "$1" "$2" "pkg" "$DEPLOYDIR"
} }
run_tcpkg_command() { run_tcpkg_command() {
local DEPLOYDIR="$PKGDEPLOYDIR/toolchain" run_pkg_command_common "$1" "$2" "tcpkg" "toolchain" "tc-$1" "tc-$1" "tc-$1"
run_pkg_command_common "$1" "$2" "tcpkg" "$DEPLOYDIR"
} }