Merge pull request #5 from erikwilson/master

Upgrade to buildroot LTS 2019.02

Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:18.04 AS ubuntu
 RUN yes | unminimize
-RUN apt-get update # 03/8/2019
+RUN apt-get update
 RUN apt-get install -y \
     build-essential \
     ccache \
@@ -16,24 +16,23 @@ RUN apt-get install -y \
     python \
     unzip
 RUN mkdir /usr/src/buildroot
-RUN curl -fL https://buildroot.org/downloads/buildroot-2018.11.1.tar.bz2 | tar xvjf - -C /usr/src/buildroot --strip-components=1
-RUN curl -fL https://storage.googleapis.com/buildroot-cache/2018.11.1.tar.gz | tar xvzf - -C /usr/src/buildroot
+RUN curl -fL https://buildroot.org/downloads/buildroot-2019.02.6.tar.bz2 | tar xvjf - -C /usr/src/buildroot --strip-components=1
 WORKDIR /usr/src/buildroot
 COPY conntrack-tools/* /usr/src/buildroot/package/conntrack-tools/
 COPY slirp4netns/* /usr/src/buildroot/package/slirp4netns/
 COPY strongswan/* /usr/src/buildroot/package/strongswan/
 COPY busybox.config /usr/src/buildroot/package/busybox/
 COPY package/Config.in /usr/src/buildroot/package/
 
-ARG ARCH=x86_64
+ARG ARCH=amd64
 COPY buildroot/config /usr/src/buildroot/.config
 COPY buildroot/${ARCH}config /usr/src/buildroot/.config-arch
 RUN cat .config-arch >> .config && \
     make oldconfig
 RUN make
 RUN cd .. && \
     mkdir bin && \
-    cp buildroot/output/target/usr/sbin/xtables-multi bin/ && \
+    cp buildroot/output/target/usr/sbin/xtables-legacy-multi bin/ && \
     cp buildroot/output/target/usr/sbin/conntrack bin/ && \
     cp buildroot/output/target/usr/sbin/ipset bin/ && \
     cp buildroot/output/target/usr/bin/find bin/ && \
@@ -57,5 +56,5 @@ RUN cd .. && \
 
 RUN cd ../bin && \
     for i in addgroup adduser ar arch arp arping ash awk basename blkid bunzip2 bzcat cat chattr chgrp chmod chown chroot chrt chvt cksum clear cmp cp cpio crond crontab cut date dc dd deallocvt delgroup deluser devmem df diff dirname dmesg dnsd dnsdomainname dos2unix du dumpkmap echo egrep eject env ether-wake expr factor fallocate false fbset fdflush fdformat fdisk fgrep flock fold free freeramdisk fsck fsfreeze fstrim fuser getopt getty grep gunzip gzip halt hdparm head hexdump hexedit hostid hostname hwclock i2cdetect i2cdump i2cget i2cset id ifconfig ifdown ifup inetd init insmod install ipaddr ipcrm ipcs iplink ipneigh iproute iprule iptunnel kill killall killall5 klogd last less link linux32 linux64 linuxrc ln loadfont loadkmap logger login logname losetup ls lsattr lsmod lsof lspci lsscsi lsusb lzcat lzma lzopcat makedevs md5sum mdev mesg microcom mkdir mkdosfs mke2fs mkfifo mknod mkpasswd mkswap mktemp modprobe more mount mountpoint mt mv nameif netstat nice nl nohup nproc nsenter nslookup nuke od openvt partprobe passwd paste patch pidof ping pipe_progress pivot_root poweroff printenv printf ps pwd rdate readlink readprofile realpath reboot renice reset resize resume rm rmdir rmmod route run-init run-parts runlevel sed seq setarch setconsole setfattr setkeycodes setlogcons setpriv setserial setsid sh sha1sum sha256sum sha3sum sha512sum shred sleep sort start-stop-daemon strings stty su sulogin svc svok swapoff swapon switch_root sync sysctl syslogd tail tar tc tee telnet test tftp time top touch tr traceroute true truncate tty ubirename udhcpc uevent umount uname uniq unix2dos unlink unlzma unlzop unxz unzip uptime usleep uudecode uuencode vconfig vi vlock w watch watchdog wc wget which who whoami xargs xxd xz xzcat yes zcat; do ln -s busybox $i; done && \
-    for i in iptables iptables-save iptables-restore; do ln -s xtables-multi $i; done && \
+    for i in iptables iptables-save iptables-restore; do ln -s xtables-legacy-multi $i; done && \
     for i in b2sum base32 base64 basename cat chcon chgrp chmod chown chroot cksum comm cp csplit cut date dd df dir dircolors dirname du echo env expand expr factor false fmt fold ginstall groups head hostid id join kill link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup nproc numfmt od paste pathchk pinky pr printenv printf ptx pwd readlink realpath rm rmdir runcon seq sha1sum sha224sum sha256sum sha384sum sha512sum shred shuf sleep sort split stat stty sum sync tac tail tee test timeout touch tr true truncate tsort tty uname unexpand uniq unlink uptime users vdir wc who whoami yes; do ln -sf coreutils $i; done

Vagrantfile

@@ -6,7 +6,7 @@
 
 # Buildroot version to use
 # RELEASE='2019.05.1'
-RELEASE='2018.11.1'
+RELEASE='2019.02.6'
 
 ### Change here for more memory/cores ###
 VM_MEMORY=4096
@@ -95,7 +95,6 @@ Vagrant.configure('2') do |config|
 		echo 'Downloading and extracting buildroot #{RELEASE}'
 		sudo mkdir -m 777 -p /usr/src/buildroot
 		curl -sL https://buildroot.org/downloads/buildroot-#{RELEASE}.tar.bz2 | tar xvjf - -C /usr/src/buildroot --strip-components=1
-		curl -sL https://storage.googleapis.com/buildroot-cache/#{RELEASE}.tar.gz | tar xvzf - -C /usr/src/buildroot
 		"
 
 	config.vm.provision 'shell', privileged: false, inline:

buildroot/amd64config

@@ -43,6 +43,7 @@ BR2_X86_CPU_HAS_SSE3=y
 BR2_x86_nocona=y
 # BR2_x86_core2 is not set
 # BR2_x86_corei7 is not set
+# BR2_x86_westmere is not set
 # BR2_x86_corei7_avx is not set
 # BR2_x86_core_avx2 is not set
 # BR2_x86_atom is not set

buildroot/arm64config

@@ -73,6 +73,18 @@ BR2_cortex_a53=y
 # BR2_thunderx2t99 is not set
 # BR2_thunderx2t99p1 is not set
 # BR2_vulcan is not set
+
+#
+# armv8.2a cores
+#
+# BR2_cortex_a55 is not set
+# BR2_cortex_a75 is not set
+# BR2_cortex_a75_a55 is not set
+
+#
+# armv8.3a cores
+#
+# BR2_saphira is not set
 # BR2_ARM_FPU_VFPV2 is not set
 # BR2_ARM_FPU_VFPV3 is not set
 # BR2_ARM_FPU_VFPV3D16 is not set

buildroot/armconfig

@@ -104,8 +104,6 @@ BR2_arm1176jzf_s=y
 # BR2_cortex_a73_a35 is not set
 # BR2_cortex_a73_a53 is not set
 # BR2_exynos_m1 is not set
-# BR2_falkor is not set
-# BR2_qdf24xx is not set
 # BR2_xgene1 is not set
 # BR2_ARM_EABI is not set
 BR2_ARM_EABIHF=y