From 92f2ea6ed46ffae5302a47452d816b5dc5784eb7 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Mon, 28 Jan 2019 12:57:22 -0500 Subject: Reorder tools --- etc/tasks/001-packages.sh | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100755 etc/tasks/001-packages.sh (limited to 'etc/tasks/001-packages.sh') diff --git a/etc/tasks/001-packages.sh b/etc/tasks/001-packages.sh new file mode 100755 index 0000000..f7d0cad --- /dev/null +++ b/etc/tasks/001-packages.sh @@ -0,0 +1,43 @@ +#!/bin/bash +set -e +set -x + +prefix="${TOOLCHAIN}" +sysconfdir="${TOOLCHAIN_BUILD}/etc" +reqdir=${sysconfdir}/pkgs +blddir=builds + +export PATH="${prefix}/bin:${PATH}" +export CFLAGS="-I${prefix}/include" +export LDFLAGS="-L${prefix}/lib -Wl,-rpath=${prefix}/lib" +export PREFIX="${prefix}" + +function pre() +{ + if [[ ! -d ${reqdir} ]]; then + # Nothing there, but maybe that's on purpose. + exit 0 + fi + mkdir -p "${blddir}" + pushd ${blddir} &>/dev/null +} + +function build() +{ + pre + # Iterate over binary package build scripts + for req in ${reqdir}/* + do + chmod +x "${req}" + "${req}" + done + post +} + +function post() +{ + popd &>/dev/null + [[ -d ${blddir} ]] && rm -rf "${blddir}" +} + +build -- cgit From 73a53c48901e120a06d221c8cb4f02076e3b9888 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Tue, 29 Jan 2019 14:38:49 -0500 Subject: Introduce real toolchain --- etc/tasks/001-packages.sh | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'etc/tasks/001-packages.sh') diff --git a/etc/tasks/001-packages.sh b/etc/tasks/001-packages.sh index f7d0cad..fabad6e 100755 --- a/etc/tasks/001-packages.sh +++ b/etc/tasks/001-packages.sh @@ -10,6 +10,7 @@ blddir=builds export PATH="${prefix}/bin:${PATH}" export CFLAGS="-I${prefix}/include" export LDFLAGS="-L${prefix}/lib -Wl,-rpath=${prefix}/lib" +export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig" export PREFIX="${prefix}" function pre() @@ -30,6 +31,11 @@ function build() do chmod +x "${req}" "${req}" + retval=$? + if [[ ${retval} != 0 ]]; then + echo "BUILD FAILED: ${req}" + exit ${retval} + fi done post } -- cgit From 11f358cafab2da28692fdaa837dfbcc3cc163736 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Thu, 31 Jan 2019 14:12:13 -0500 Subject: Refactor all --- etc/tasks/001-packages.sh | 8 -------- 1 file changed, 8 deletions(-) (limited to 'etc/tasks/001-packages.sh') diff --git a/etc/tasks/001-packages.sh b/etc/tasks/001-packages.sh index fabad6e..5d20ee7 100755 --- a/etc/tasks/001-packages.sh +++ b/etc/tasks/001-packages.sh @@ -1,18 +1,10 @@ #!/bin/bash -set -e set -x -prefix="${TOOLCHAIN}" sysconfdir="${TOOLCHAIN_BUILD}/etc" reqdir=${sysconfdir}/pkgs blddir=builds -export PATH="${prefix}/bin:${PATH}" -export CFLAGS="-I${prefix}/include" -export LDFLAGS="-L${prefix}/lib -Wl,-rpath=${prefix}/lib" -export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig" -export PREFIX="${prefix}" - function pre() { if [[ ! -d ${reqdir} ]]; then -- cgit