From d35367b92336aaa9ae8fb07a0b77b93229bb1f55 Mon Sep 17 00:00:00 2001 From: davidovski Date: Thu, 7 Apr 2022 21:03:17 +0100 Subject: fixed not using development buildfiles --- bootstrap/bootstrap.sh | 2 +- xib_env | 5 +---- xibuild/build_all.sh | 4 +++- xibuild/buildfiles | 1 + 4 files changed, 6 insertions(+), 6 deletions(-) create mode 160000 xibuild/buildfiles diff --git a/bootstrap/bootstrap.sh b/bootstrap/bootstrap.sh index 814f39a..3dd1c18 100755 --- a/bootstrap/bootstrap.sh +++ b/bootstrap/bootstrap.sh @@ -108,7 +108,7 @@ ptch () { clean () { rm -rf $WD $CROSS_TOOLS $TOOLS - mkdir -pv $WD $CROSS_TOOLS $TOOL + mkdir -p $WD $CROSS_TOOLS $TOOL } mount_chroot () { diff --git a/xib_env b/xib_env index 3767212..56f8961 100755 --- a/xib_env +++ b/xib_env @@ -13,13 +13,10 @@ export XIB_EXPORT="$XIB_DIR/export" export PRIV_KEY="/home/david/.ssh/xi.pem" export PUB_KEY="/home/david/.ssh/xi.pub" export DEVELOPMENT_BUILDFILES="/home/david/docs/proj/xilinux/buildfiles" +XIB_BUILDFILES=$DEVELOPMENT_BUILDFILES export BUILDFILES_GIT_REPO="https://xi.davidovski.xyz/git/buildfiles.git" export INSTALLED_PACKAGES="$XIB_CHROOT/installed" export BUILD_PROFILE=$XIB_DIR/build_profile -if [ -d ${DEVELOPMENT_BUILDFILES} ]; then - export XIB_BUILDFILES=$DEVELOPMENT_BUILDFILES -fi - diff --git a/xibuild/build_all.sh b/xibuild/build_all.sh index 74b6a76..755c528 100755 --- a/xibuild/build_all.sh +++ b/xibuild/build_all.sh @@ -71,7 +71,9 @@ build_package () { # build all of the packages # build_all () { - for line in $(perl build_order.pm); do + all="$(perl build_order.pm)" + echo "Building $(echo "$all" | wc -l )" + for line in $all; do build_package $line || return 1 done } diff --git a/xibuild/buildfiles b/xibuild/buildfiles new file mode 160000 index 0000000..92790a9 --- /dev/null +++ b/xibuild/buildfiles @@ -0,0 +1 @@ +Subproject commit 92790a96688344c9f6fd6dadbaad73c1f88804a0 -- cgit v1.2.1