Skip to content

Commit

Permalink
Merge pull request #211 from infosiftr/buildroot-gitlab
Browse files Browse the repository at this point in the history
Use GitLab for all buildroot references
  • Loading branch information
tianon authored Nov 25, 2024
2 parents b1345e3 + 273ed1c commit e0175e4
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 25 deletions.
12 changes: 6 additions & 6 deletions Dockerfile-builder.template
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ RUN set -eux; \
BR2_TOOLCHAIN_BUILDROOT_GLIBC \
'; \
\
# buildroot arches: https://git.busybox.net/buildroot/tree/arch
# buildroot+uclibc arches: https://git.busybox.net/buildroot/tree/package/uclibc/Config.in ("config BR2_PACKAGE_UCLIBC_ARCH_SUPPORTS")
# buildroot arches: https://gitlab.com/buildroot.org/buildroot/-/tree/HEAD/arch
# buildroot+uclibc arches: https://gitlab.com/buildroot.org/buildroot/-/blob/HEAD/package/uclibc/Config.in ("config BR2_PACKAGE_UCLIBC_ARCH_SUPPORTS")
dpkgArch="$(dpkg --print-architecture)"; \
case "$dpkgArch" in \
# explicitly target amd64 v1
Expand All @@ -112,7 +112,7 @@ RUN set -eux; \
\
# https://wiki.debian.org/ArmEabiPort#Choice_of_minimum_CPU
# https://github.com/free-electrons/toolchains-builder/blob/db259641eaf5bbcf13f4a3c5003e5436e806770c/configs/arch/armv5-eabi.config
# https://git.busybox.net/buildroot/tree/arch/Config.in.arm
# https://gitlab.com/buildroot.org/buildroot/-/blob/HEAD/arch/Config.in.arm
# (Debian minimums at ARMv4, we minimum at ARMv5 instead)
armel) \
setConfs="$setConfs \
Expand All @@ -127,7 +127,7 @@ RUN set -eux; \
# "Currently the Debian armhf port requires at least an ARMv7 CPU with Thumb-2 and VFP3D16."
# https://wiki.debian.org/ArmHardFloatPort#Supported_devices
# https://github.com/free-electrons/toolchains-builder/blob/db259641eaf5bbcf13f4a3c5003e5436e806770c/configs/arch/armv7-eabihf.config
# https://git.busybox.net/buildroot/tree/arch/Config.in.arm
# https://gitlab.com/buildroot.org/buildroot/-/blob/HEAD/arch/Config.in.arm
armhf) \
setConfs="$setConfs \
BR2_arm=y \
Expand Down Expand Up @@ -415,7 +415,7 @@ RUN set -eux; \
; do \
dir="$(dirname "$file")"; \
mkdir -p "../buildroot/$dir"; \
curl -fL -o "../buildroot/$file" "https://git.busybox.net/buildroot/plain/$file?id=$buildrootVersion"; \
curl -fL -o "../buildroot/$file" "https://gitlab.com/buildroot.org/buildroot/-/raw/$buildrootVersion/$file"; \
[ -s "../buildroot/$file" ]; \
done; \
\
Expand All @@ -431,7 +431,7 @@ RUN set -eux; \
grep -E '^root::' rootfs/etc/shadow; \
sed -ri -e 's/^root::/root:*:/' rootfs/etc/shadow; \
grep -E '^root:[*]:' rootfs/etc/shadow; \
# set expected permissions, etc too (https://git.busybox.net/buildroot/tree/system/device_table.txt)
# set expected permissions, etc too (https://gitlab.com/buildroot.org/buildroot/-/blob/HEAD/system/device_table.txt)
awk ' \
!/^#/ { \
if ($2 != "d" && $2 != "f") { \
Expand Down
4 changes: 2 additions & 2 deletions latest-1/glibc/Dockerfile.builder

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions latest-1/musl/Dockerfile.builder

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions latest-1/uclibc/Dockerfile.builder

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions latest/glibc/Dockerfile.builder

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions latest/musl/Dockerfile.builder

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions latest/uclibc/Dockerfile.builder

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ busyboxVersions="$(
# ]

buildrootVersion="$(
git ls-remote --tags https://git.busybox.net/buildroot \
git ls-remote --tags https://gitlab.com/buildroot.org/buildroot.git \
| cut -d/ -f3 \
| cut -d^ -f1 \
| grep -E '^[0-9]+' \
Expand Down

0 comments on commit e0175e4

Please sign in to comment.