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

Merge various package variables into PREFERED_PROVIDER array

Browse source 
This commit merges LINUXPKG and RELEASEPKG into a single associative
array named PREFERED_PROVIDER.

Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
This commit is contained in:
David Oberhollenzer 2019-03-31 14:06:46 +02:00
parent d17315439e
commit 491d09f544
6 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
check_update.sh
View file

@ -5,7 +5,7 @@ set -e
SCRIPTDIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd) SCRIPTDIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)
# dummy toolchain variables # dummy toolchain variables
export LINUXPKG="linux" PREFERED_PROVIDER[linux]="linux"
export LAYERCONF="" export LAYERCONF=""
# utilities # utilities

5
layer/bsp-alix/TOOLCHAIN
View file

@ -1,4 +1,3 @@
RELEASEPKG="release-alix"
TARGET="i586-linux-musl" TARGET="i586-linux-musl"
GCC_CPU="geode" GCC_CPU="geode"
@ -7,7 +6,9 @@ CPU_IS_64BIT="no"
GCC_EXTRACFG="--disable-libmpx --disable-cet" GCC_EXTRACFG="--disable-libmpx --disable-cet"
BINUTILS_EXTRACFG="--disable-cet" BINUTILS_EXTRACFG="--disable-cet"
LINUXPKG="linux" PREFERED_PROVIDER[linux]="linux"
PREFERED_PROVIDER[release]="release-alix"
LINUX_TGT="bzImage modules" LINUX_TGT="bzImage modules"
TC_HARDENING="no" TC_HARDENING="no"

5
layer/bsp-qemu64/TOOLCHAIN
View file

@ -1,4 +1,3 @@
RELEASEPKG="release-qemu"
TARGET="x86_64-linux-musl" TARGET="x86_64-linux-musl"
GCC_CPU="x86-64" GCC_CPU="x86-64"
@ -7,7 +6,9 @@ CPU_IS_64BIT="yes"
GCC_EXTRACFG="--enable-libmpx" GCC_EXTRACFG="--enable-libmpx"
BINUTILS_EXTRACFG="" BINUTILS_EXTRACFG=""
LINUXPKG="linux" PREFERED_PROVIDER[linux]="linux"
PREFERED_PROVIDER[release]="release-qemu"
LINUX_TGT="bzImage" LINUX_TGT="bzImage"
TC_HARDENING="no" TC_HARDENING="no"

5
layer/bsp-rpi3/TOOLCHAIN
View file

@ -1,4 +1,3 @@
RELEASEPKG="release-rpi3"
TARGET="arm-linux-musleabihf" TARGET="arm-linux-musleabihf"
GCC_CPU="armv6" GCC_CPU="armv6"
@ -7,7 +6,9 @@ CPU_IS_64BIT="no"
GCC_EXTRACFG="--with-float=hard --with-fpu=neon-vfpv3" GCC_EXTRACFG="--with-float=hard --with-fpu=neon-vfpv3"
BINUTILS_EXTRACFG="" BINUTILS_EXTRACFG=""
LINUXPKG="linux-rpi3" PREFERED_PROVIDER[linux]="linux-rpi3"
PREFERED_PROVIDER[release]="release-rpi3"
LINUX_TGT="zImage dtbs modules" LINUX_TGT="zImage dtbs modules"
TC_HARDENING="no" TC_HARDENING="no"

6
mk.sh
View file

@ -31,6 +31,8 @@ REPODIR="$BUILDROOT/repo"
DEPENDSLIST="$BUILDROOT/depends" DEPENDSLIST="$BUILDROOT/depends"
PROVIDESLIST="$BUILDROOT/provides" PROVIDESLIST="$BUILDROOT/provides"
declare -A PREFERED_PROVIDER
mkdir -p "$PKGDOWNLOADDIR" "$PKGSRCDIR" "$PKGLOGDIR" mkdir -p "$PKGDOWNLOADDIR" "$PKGSRCDIR" "$PKGLOGDIR"
mkdir -p "$REPODIR" mkdir -p "$REPODIR"
@ -82,8 +84,8 @@ for pkg in $SCRIPTDIR/pkg/*; do
done done
done done
pkg buildstrategy -p "$PROVIDESLIST" -d "$DEPENDSLIST" "$RELEASEPKG" \ pkg buildstrategy -p "$PROVIDESLIST" -d "$DEPENDSLIST" \
> "$PACKAGELIST" "${PREFERED_PROVIDER[release]}" > "$PACKAGELIST"
cat "$PACKAGELIST" cat "$PACKAGELIST"
echo "--- building packages ---" echo "--- building packages ---"

2
pkg/linux_headers/build
View file

@ -1,5 +1,5 @@
# inherit package details from kernel package # inherit package details from kernel package
source "$SCRIPTDIR/pkg/$LINUXPKG/build" source "$SCRIPTDIR/pkg/${PREFERED_PROVIDER[linux]}/build"
DEPENDS="tc-pkgtool" DEPENDS="tc-pkgtool"
SUBPKG="linux-dev" SUBPKG="linux-dev"