Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-12-22 16:24:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve buildroot builder

Browse Source 
Improve buildroot builder

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
This commit is contained in:
Bensuperpc 2021-08-08 22:09:24 +02:00
parent cb5ab9f914
commit b5a73bef22
4 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/common.buildroot
View File

@ -22,6 +22,8 @@ COPY \
RUN mkdir /dockcross/buildroot \ RUN mkdir /dockcross/buildroot \
&& cd /dockcross/buildroot \ && cd /dockcross/buildroot \
&& /dockcross/install-buildroot-toolchain.sh \ && /dockcross/install-buildroot-toolchain.sh \
-c /dockcross/buildroot.config \
-v "${BR_VERSION}" \
&& rm -rf /dockcross/buildroot /dockcross/install-buildroot-toolchain.sh && rm -rf /dockcross/buildroot /dockcross/install-buildroot-toolchain.sh
# Restore our default workdir (from "dockcross/base"). # Restore our default workdir (from "dockcross/base").

2
common/common.crosstool
View File

@ -48,7 +48,7 @@ RUN mkdir /dockcross/crosstool \
&& cd /dockcross/crosstool \ && cd /dockcross/crosstool \
&& /dockcross/install-crosstool-ng-toolchain.sh \ && /dockcross/install-crosstool-ng-toolchain.sh \
-p "${XCC_PREFIX}" \ -p "${XCC_PREFIX}" \
-c /dockcross/crosstool-ng.config \ -c "/dockcross/crosstool-ng.config" \
-v "${CT_VERSION}" \ -v "${CT_VERSION}" \
&& rm -rf /dockcross/crosstool /dockcross/install-crosstool-ng-toolchain.sh && rm -rf /dockcross/crosstool /dockcross/install-crosstool-ng-toolchain.sh

34
imagefiles/install-buildroot-toolchain.sh
View File

@ -5,9 +5,39 @@ set -o pipefail
ROOT=${PWD} ROOT=${PWD}
usage() { echo "Usage: $0 -c <config-path> -v <version>" 1>&2; exit 1; }
REPO_URL="https://github.com/buildroot/buildroot.git" REPO_URL="https://github.com/buildroot/buildroot.git"
git clone "$REPO_URL" --recurse-submodules --remote-submodules --depth=1 --branch=2021.08-rc1 CONFIG_PATH=""
REV="2021.08-rc1"
while getopts "c:v:" o; do
case "${o}" in
c)
CONFIG_PATH=$(readlink -f ${OPTARG})
;;
v)
REV=${OPTARG}
;;
*)
usage
;;
esac
done
shift $((OPTIND-1))
if [ -z ${CONFIG_PATH} ] || [ ! -f ${CONFIG_PATH} ]; then
echo "ERROR: Missing config path (-c)."
usage
fi
if [ -z ${REV} ]; then
echo "WARNING: No version selected, use default version: $REV (-v)."
fi
git clone "$REPO_URL" --recurse-submodules --remote-submodules #--branch="$REV"
cd buildroot cd buildroot
cp /dockcross/buildroot.config .config git checkout "$REV"
cp "$CONFIG_PATH" .config
make make

2
linux-arm64-full/Dockerfile.in
View File

@ -3,7 +3,7 @@ FROM dockcross/base:latest
# This is for 64-bit ARM Linux machine # This is for 64-bit ARM Linux machine
# Buildroot version # Buildroot version
#ENV BR_VERSION d47b234152980a09196355b77a12cb425f3f1d2e ENV BR_VERSION 2021.08-rc1
#include "common.buildroot" #include "common.buildroot"