Skip to content

Commit

Permalink
Update buildroot to 2022.08.1
Browse files Browse the repository at this point in the history
* Switch to building on BCI instead of Alpine
  Buildroot builds its own toolchain anyway; just bootstrapping that
  toolchain on Alpine required a fair bit of patching. Switching to BCI
  makes this unnecessary.

* Remove unnecessary patches
  A bunch of stuff has since been fixed upstream.

* Update patches to current versions
  Update patches for s390x support to work on the newer buildroot
  release.

* Drop strongswan
  This pulls in a bunch of crypto libs that we don't want to bear the
  burden of updating. It is mostly unused by the community anyway, and
  wireguard is now a much more usable replacement.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
  • Loading branch information
brandond committed Nov 1, 2022
1 parent f33d625 commit 48b49ad
Show file tree
Hide file tree
Showing 31 changed files with 915 additions and 1,213 deletions.
32 changes: 9 additions & 23 deletions Dockerfile.dapper
Original file line number Diff line number Diff line change
@@ -1,39 +1,25 @@
FROM alpine:3.14
RUN set -eux \
&& apk --no-cache add \
bash
SHELL ["/usr/bin/env", "bash", "-c"]
RUN set -eux \
&& apk --no-cache add \
autoconf \
automake \
FROM registry.suse.com/bci/bci-base:15.4
RUN zypper remove -y container-suseconnect && \
zypper install -y -t pattern devel_basis && \
zypper install -y \
bc \
binutils \
build-base \
ca-certificates \
bzip2 \
ccache \
cmake \
coreutils \
cpio \
curl \
findutils \
gawk \
gcc-c++ \
git \
libtool \
gzip \
hostname \
lz4 \
mercurial \
musl-dev \
musl-libintl \
ncurses-dev \
ninja \
python3 \
rpcgen \
rsync \
sed \
subversion \
tar \
unzip \
wget \
xz \
zstd

ENV DAPPER_SOURCE /source
Expand Down
29 changes: 26 additions & 3 deletions buildroot/amd64config
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
# Target options
#
BR2_ARCH_IS_64=y
BR2_ARCH_HAS_MMU_MANDATORY=y
BR2_USE_MMU=y
# BR2_arcle is not set
# BR2_arceb is not set
# BR2_arm is not set
# BR2_armeb is not set
# BR2_aarch64 is not set
# BR2_aarch64_be is not set
# BR2_csky is not set
# BR2_i386 is not set
# BR2_m68k is not set
# BR2_microblazeel is not set
Expand All @@ -18,20 +17,21 @@ BR2_ARCH_HAS_MMU_MANDATORY=y
# BR2_mipsel is not set
# BR2_mips64 is not set
# BR2_mips64el is not set
# BR2_nds32 is not set
# BR2_nios2 is not set
# BR2_or1k is not set
# BR2_powerpc is not set
# BR2_powerpc64 is not set
# BR2_powerpc64le is not set
# BR2_riscv is not set
# BR2_s390x is not set
# BR2_sh is not set
# BR2_sparc is not set
# BR2_sparc64 is not set
BR2_x86_64=y
# BR2_xtensa is not set
BR2_ARCH_HAS_TOOLCHAIN_BUILDROOT=y
BR2_ARCH="x86_64"
BR2_NORMALIZED_ARCH="x86_64"
BR2_ENDIAN="LITTLE"
BR2_GCC_TARGET_ARCH="nocona"
BR2_BINFMT_SUPPORTS_SHARED=y
Expand All @@ -41,14 +41,37 @@ BR2_X86_CPU_HAS_MMX=y
BR2_X86_CPU_HAS_SSE=y
BR2_X86_CPU_HAS_SSE2=y
BR2_X86_CPU_HAS_SSE3=y
# BR2_x86_x86_64 is not set
# BR2_x86_x86_64_v2 is not set
# BR2_x86_x86_64_v3 is not set
# BR2_x86_x86_64_v4 is not set
BR2_x86_nocona=y
# BR2_x86_core2 is not set
# BR2_x86_corei7 is not set
# BR2_x86_nehalem is not set
# BR2_x86_westmere is not set
# BR2_x86_corei7_avx is not set
# BR2_x86_sandybridge is not set
# BR2_x86_core_avx2 is not set
# BR2_x86_haswell is not set
# BR2_x86_broadwell is not set
# BR2_x86_skylake is not set
# BR2_x86_atom is not set
# BR2_x86_bonnell is not set
# BR2_x86_silvermont is not set
# BR2_x86_goldmont is not set
# BR2_x86_goldmont_plus is not set
# BR2_x86_tremont is not set
# BR2_x86_skylake_avx512 is not set
# BR2_x86_cannonlake is not set
# BR2_x86_icelake_client is not set
# BR2_x86_icelake_server is not set
# BR2_x86_cascadelake is not set
# BR2_x86_cooperlake is not set
# BR2_x86_tigerlake is not set
# BR2_x86_sapphirerapids is not set
# BR2_x86_alderlake is not set
# BR2_x86_rocketlake is not set
# BR2_x86_opteron is not set
# BR2_x86_opteron_sse3 is not set
# BR2_x86_barcelona is not set
Expand Down
10 changes: 6 additions & 4 deletions buildroot/arm64config
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@
# Target options
#
BR2_ARCH_IS_64=y
BR2_ARCH_HAS_MMU_MANDATORY=y
BR2_ARCH_HAS_MMU_OPTIONAL=y
BR2_USE_MMU=y
# BR2_arcle is not set
# BR2_arceb is not set
# BR2_arm is not set
# BR2_armeb is not set
BR2_aarch64=y
# BR2_aarch64_be is not set
# BR2_csky is not set
# BR2_i386 is not set
# BR2_m68k is not set
# BR2_microblazeel is not set
Expand All @@ -19,20 +17,21 @@ BR2_aarch64=y
# BR2_mipsel is not set
# BR2_mips64 is not set
# BR2_mips64el is not set
# BR2_nds32 is not set
# BR2_nios2 is not set
# BR2_or1k is not set
# BR2_powerpc is not set
# BR2_powerpc64 is not set
# BR2_powerpc64le is not set
# BR2_riscv is not set
# BR2_s390x is not set
# BR2_sh is not set
# BR2_sparc is not set
# BR2_sparc64 is not set
# BR2_x86_64 is not set
# BR2_xtensa is not set
BR2_ARCH_HAS_TOOLCHAIN_BUILDROOT=y
BR2_ARCH="aarch64"
BR2_NORMALIZED_ARCH="arm64"
BR2_ENDIAN="LITTLE"
BR2_GCC_TARGET_ABI="lp64"
BR2_GCC_TARGET_CPU="cortex-a53"
Expand Down Expand Up @@ -98,3 +97,6 @@ BR2_cortex_a53=y
# BR2_ARM_FPU_VFPV4 is not set
# BR2_ARM_FPU_VFPV4D16 is not set
BR2_ARM_FPU_FP_ARMV8=y
BR2_ARM64_PAGE_SIZE_4K=y
# BR2_ARM64_PAGE_SIZE_64K is not set
BR2_ARM64_PAGE_SIZE="4K"
6 changes: 3 additions & 3 deletions buildroot/armconfig
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
#
# Target options
#
BR2_ARCH_HAS_MMU_OPTIONAL=y
BR2_USE_MMU=y
# BR2_arcle is not set
# BR2_arceb is not set
BR2_arm=y
# BR2_armeb is not set
# BR2_aarch64 is not set
# BR2_aarch64_be is not set
# BR2_csky is not set
# BR2_i386 is not set
# BR2_m68k is not set
# BR2_microblazeel is not set
Expand All @@ -17,20 +16,21 @@ BR2_arm=y
# BR2_mipsel is not set
# BR2_mips64 is not set
# BR2_mips64el is not set
# BR2_nds32 is not set
# BR2_nios2 is not set
# BR2_or1k is not set
# BR2_powerpc is not set
# BR2_powerpc64 is not set
# BR2_powerpc64le is not set
# BR2_riscv is not set
# BR2_s390x is not set
# BR2_sh is not set
# BR2_sparc is not set
# BR2_sparc64 is not set
# BR2_x86_64 is not set
# BR2_xtensa is not set
BR2_ARCH_HAS_TOOLCHAIN_BUILDROOT=y
BR2_ARCH="arm"
BR2_NORMALIZED_ARCH="arm"
BR2_ENDIAN="LITTLE"
BR2_GCC_TARGET_ABI="aapcs-linux"
BR2_GCC_TARGET_CPU="arm1176jzf-s"
Expand Down
Loading

0 comments on commit 48b49ad

Please sign in to comment.