diff options
| -rwxr-xr-x | xib_env | 1 | ||||
| -rwxr-xr-x | xibuild/build_package.sh | 5 | ||||
| -rw-r--r-- | xibuild/build_profile | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | xibuild/prepare.sh | 2 |
4 files changed, 8 insertions, 4 deletions
@@ -17,3 +17,4 @@ export DEVELOPMENT_BUILDFILES="/home/david/docs/proj/xilinux/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 diff --git a/xibuild/build_package.sh b/xibuild/build_package.sh index ddbc348..7152464 100755 --- a/xibuild/build_package.sh +++ b/xibuild/build_package.sh @@ -113,10 +113,7 @@ prepare_build_env () { # make_buildscript () { - # TODO this should be an external buildprofile file - echo MAKEFLAGS="$MAKEFLAGS" >> "$XIB_CHROOT/build/profile" - echo LDFLAGS="$LDFLAGS" >> "$XIB_CHROOT/build/profile" - + cat $BUILD_PROFILE > "$XIB_CHROOT/build/profile" cat > "$XIB_CHROOT/build/build.sh" << "EOF" #!/bin/bash source /build/profile diff --git a/xibuild/build_profile b/xibuild/build_profile new file mode 100644 index 0000000..d218fac --- /dev/null +++ b/xibuild/build_profile @@ -0,0 +1,4 @@ +export MAKEFLAGS="-j$(grep "processor" /proc/cpuinfo | wc -l)" +export XORG_PREFIX="/usr" + +export XORG_CONFIG="--prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static" diff --git a/xibuild/prepare.sh b/xibuild/prepare.sh index 81f52a5..f7f5733 100644..100755 --- a/xibuild/prepare.sh +++ b/xibuild/prepare.sh @@ -17,3 +17,5 @@ fi [ -f $INSTALLED_PACKAGES ] || touch $INSTALLED_PACKAGES [ -f $XIB_CHROOT/etc/resolv.conf ] || cp /etc/resolv.conf $XIB_CHROOT/etc/resolv.conf + +cp build_profile $BUILD_PROFILE |