pygos
/
build
mirror of https://github.com/pygos/build.git
1
0
Fork 0
Code Issues Releases Wiki Activity

cleanup: make $BUILDROOT point to actual product output directory 

Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
This commit is contained in:
David Oberhollenzer 2019-03-06 16:12:08 +01:00
parent e497ba164c
commit 2184f4dae7
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mk.sh
View File

@ -10,7 +10,7 @@ fi
PRODUCT="$1"
################################ basic setup ################################
BUILDROOT=$(pwd)
BUILDROOT="$(pwd)/$PRODUCT"
SCRIPTDIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)
NUMJOBS=$(grep -e "^processor" /proc/cpuinfo | wc -l)
@ -21,15 +21,15 @@ if [ ! -f "$LAYERCONF" ]; then
exit 1
fi
PKGSRCDIR="$BUILDROOT/src"
PKGDOWNLOADDIR="$BUILDROOT/download"
PKGBUILDDIR="$BUILDROOT/$PRODUCT/build"
PKGDEPLOYDIR="$BUILDROOT/$PRODUCT/deploy"
PKGLOGDIR="$BUILDROOT/$PRODUCT/log"
PACKAGELIST="$BUILDROOT/$PRODUCT/pkglist"
REPODIR="$BUILDROOT/$PRODUCT/repo"
DEPENDSLIST="$BUILDROOT/$PRODUCT/depends"
PROVIDESLIST="$BUILDROOT/$PRODUCT/provides"
PKGSRCDIR="$(pwd)/src"
PKGDOWNLOADDIR="$(pwd)/download"
PKGBUILDDIR="$BUILDROOT/build"
PKGDEPLOYDIR="$BUILDROOT/deploy"
PKGLOGDIR="$BUILDROOT/log"
PACKAGELIST="$BUILDROOT/pkglist"
REPODIR="$BUILDROOT/repo"
DEPENDSLIST="$BUILDROOT/depends"
PROVIDESLIST="$BUILDROOT/provides"
mkdir -p "$PKGDOWNLOADDIR" "$PKGSRCDIR" "$PKGLOGDIR"
mkdir -p "$REPODIR"
@ -50,7 +50,7 @@ source "$SCRIPTDIR/util/autotools.sh"
include_merge "TOOLCHAIN"
HOSTTUPLE=$($SCRIPTDIR/util/config.guess)
TCDIR="$BUILDROOT/$PRODUCT/toolchain"
TCDIR="$BUILDROOT/toolchain"
export PATH="$TCDIR/bin:$PATH"

2
pkg/release-alix/build
View File

@ -19,7 +19,7 @@ build() {
}
deploy() {
tar czf "$BUILDROOT/$PRODUCT/$PKGNAME.tar.gz" *
tar czf "$BUILDROOT/$PKGNAME.tar.gz" *
touch "$PKGDEPLOYDIR/$PKGNAME.files"
cat > "$PKGDEPLOYDIR/$PKGNAME.desc" <<_EOF

2
pkg/release-qemu/build
View File

@ -23,7 +23,7 @@ build() {
}
deploy() {
tar czf "$BUILDROOT/$PRODUCT/$PKGNAME.tar.gz" *
tar czf "$BUILDROOT/$PKGNAME.tar.gz" *
touch "$PKGDEPLOYDIR/$PKGNAME.files"
cat > "$PKGDEPLOYDIR/$PKGNAME.desc" <<_EOF

2
pkg/release-rpi3/build
View File

@ -21,7 +21,7 @@ build() {
}
deploy() {
tar czf "$BUILDROOT/$PRODUCT/$PKGNAME.tar.gz" *
tar czf "$BUILDROOT/$PKGNAME.tar.gz" *
touch "$PKGDEPLOYDIR/$PKGNAME.files"
cat > "$PKGDEPLOYDIR/$PKGNAME.desc" <<_EOF