summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xxib_env5
-rwxr-xr-xxibuild/build_all.sh4
-rw-r--r--xibuild/build_profile2
m---------xibuild/buildfiles0
4 files changed, 6 insertions, 5 deletions
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/build_profile b/xibuild/build_profile
index dd25cd0..0997928 100644
--- a/xibuild/build_profile
+++ b/xibuild/build_profile
@@ -13,3 +13,5 @@ export MAKEFLAGS="-j$JOBS"
export XORG_PREFIX="/usr"
export XORG_CONFIG="--prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static"
+
+ldconfig
diff --git a/xibuild/buildfiles b/xibuild/buildfiles
new file mode 160000
+Subproject 92790a96688344c9f6fd6dadbaad73c1f88804a