Skip to content

Commit d60b29d

Browse files
borsbors
committed
Auto merge of #81539 - nikic:update-armhf-gnu, r=sanxiyn
Update armhf-gnu to Ubuntu 20.04 This requires updating the used Linux kernel to avoid an assembler error, the used busybox version to avoid a linker error, the used rootfs to match the host version and the qemu flags to work with the newer version. r? `@Mark-Simulacrum`
2 parents c196b59 + 3f46fbf commit d60b29d

File tree

3 files changed

+29
-23
lines changed

3 files changed

+29
-23
lines changed

‎src/ci/docker/host-x86_64/armhf-gnu/Dockerfile

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:20.04
22

3-
RUN apt-get update -y && apt-get install -y --no-install-recommends \
3+
RUN apt-get update -y && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
44
bc \
55
bzip2 \
66
ca-certificates \
@@ -33,32 +33,32 @@ WORKDIR /build
3333
# the kernel. This file was generated by running `make vexpress_defconfig`
3434
# followed by `make menuconfig` and then enabling the IPv6 protocol page.
3535
COPY host-x86_64/armhf-gnu/vexpress_config /build/.config
36-
RUN curl https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.4.42.tar.xz | \
36+
RUN curl https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.4.253.tar.xz | \
3737
tar xJf - && \
38-
cd /build/linux-4.4.42 && \
38+
cd /build/linux-4.4.253 && \
3939
cp /build/.config . && \
4040
make -j$(nproc) all && \
4141
cp arch/arm/boot/zImage /tmp && \
4242
cd /build && \
43-
rm -rf linux-4.4.42
43+
rm -rf linux-4.4.253
4444

4545
# Compile an instance of busybox as this provides a lightweight system and init
4646
# binary which we will boot into. Only trick here is configuring busybox to
4747
# build static binaries.
48-
RUN curl https://www.busybox.net/downloads/busybox-1.21.1.tar.bz2 | tar xjf - && \
49-
cd busybox-1.21.1 && \
48+
RUN curl https://www.busybox.net/downloads/busybox-1.32.1.tar.bz2 | tar xjf - && \
49+
cd busybox-1.32.1 && \
5050
make defconfig && \
5151
sed -i 's/.*CONFIG_STATIC.*/CONFIG_STATIC=y/' .config && \
5252
make -j$(nproc) && \
5353
make install && \
5454
mv _install /tmp/rootfs && \
5555
cd /build && \
56-
rm -rf busybox-1.12.1
56+
rm -rf busybox-1.32.1
5757

5858
# Download the ubuntu rootfs, which we'll use as a chroot for all our tests.
5959
WORKDIR /tmp
6060
RUN mkdir rootfs/ubuntu
61-
RUN curl http://cdimage.ubuntu.com/ubuntu-base/releases/16.04/release/ubuntu-base-16.04.6-base-armhf.tar.gz | \
61+
RUN curl http://cdimage.ubuntu.com/ubuntu-base/releases/20.04/release/ubuntu-base-20.04.1-base-armhf.tar.gz | \
6262
tar xzf - -C rootfs/ubuntu && \
6363
cd rootfs && mkdir proc sys dev etc etc/init.d
6464

‎src/ci/docker/host-x86_64/armhf-gnu/vexpress_config

+16-12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm 4.4.42 Kernel Configuration
3+
# Linux/arm 4.4.253 Kernel Configuration
44
#
55
CONFIG_ARM=y
66
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -60,6 +60,7 @@ CONFIG_HAVE_ARCH_AUDITSYSCALL=y
6060
CONFIG_GENERIC_IRQ_PROBE=y
6161
CONFIG_GENERIC_IRQ_SHOW=y
6262
CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
63+
CONFIG_GENERIC_IRQ_MIGRATION=y
6364
CONFIG_HARDIRQS_SW_RESEND=y
6465
CONFIG_IRQ_DOMAIN=y
6566
CONFIG_IRQ_DOMAIN_HIERARCHY=y
@@ -136,6 +137,7 @@ CONFIG_RD_LZMA=y
136137
CONFIG_RD_XZ=y
137138
CONFIG_RD_LZO=y
138139
CONFIG_RD_LZ4=y
140+
CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
139141
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
140142
CONFIG_SYSCTL=y
141143
CONFIG_ANON_INODES=y
@@ -389,6 +391,8 @@ CONFIG_SWP_EMULATE=y
389391
# CONFIG_CPU_BIG_ENDIAN is not set
390392
# CONFIG_CPU_ICACHE_DISABLE is not set
391393
# CONFIG_CPU_BPREDICT_DISABLE is not set
394+
CONFIG_CPU_SPECTRE=y
395+
CONFIG_HARDEN_BRANCH_PREDICTOR=y
392396
CONFIG_KUSER_HELPERS=y
393397
CONFIG_VDSO=y
394398
CONFIG_OUTER_CACHE=y
@@ -611,7 +615,7 @@ CONFIG_IP_PNP_BOOTP=y
611615
# CONFIG_IP_PNP_RARP is not set
612616
# CONFIG_NET_IPIP is not set
613617
# CONFIG_NET_IPGRE_DEMUX is not set
614-
CONFIG_NET_IP_TUNNEL=m
618+
CONFIG_NET_IP_TUNNEL=y
615619
# CONFIG_SYN_COOKIES is not set
616620
# CONFIG_NET_IPVTI is not set
617621
# CONFIG_NET_UDP_TUNNEL is not set
@@ -621,7 +625,7 @@ CONFIG_NET_IP_TUNNEL=m
621625
# CONFIG_INET_ESP is not set
622626
# CONFIG_INET_IPCOMP is not set
623627
# CONFIG_INET_XFRM_TUNNEL is not set
624-
CONFIG_INET_TUNNEL=m
628+
CONFIG_INET_TUNNEL=y
625629
CONFIG_INET_XFRM_MODE_TRANSPORT=y
626630
CONFIG_INET_XFRM_MODE_TUNNEL=y
627631
CONFIG_INET_XFRM_MODE_BEET=y
@@ -643,12 +647,12 @@ CONFIG_IPV6=y
643647
# CONFIG_IPV6_ILA is not set
644648
# CONFIG_INET6_XFRM_TUNNEL is not set
645649
# CONFIG_INET6_TUNNEL is not set
646-
CONFIG_INET6_XFRM_MODE_TRANSPORT=m
647-
CONFIG_INET6_XFRM_MODE_TUNNEL=m
648-
CONFIG_INET6_XFRM_MODE_BEET=m
650+
CONFIG_INET6_XFRM_MODE_TRANSPORT=y
651+
CONFIG_INET6_XFRM_MODE_TUNNEL=y
652+
CONFIG_INET6_XFRM_MODE_BEET=y
649653
# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
650654
# CONFIG_IPV6_VTI is not set
651-
CONFIG_IPV6_SIT=m
655+
CONFIG_IPV6_SIT=y
652656
# CONFIG_IPV6_SIT_6RD is not set
653657
CONFIG_IPV6_NDISC_NODETYPE=y
654658
# CONFIG_IPV6_TUNNEL is not set
@@ -667,6 +671,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
667671
# CONFIG_L2TP is not set
668672
# CONFIG_BRIDGE is not set
669673
CONFIG_HAVE_NET_DSA=y
674+
# CONFIG_NET_DSA is not set
670675
# CONFIG_VLAN_8021Q is not set
671676
# CONFIG_DECNET is not set
672677
# CONFIG_LLC2 is not set
@@ -682,7 +687,6 @@ CONFIG_HAVE_NET_DSA=y
682687
# CONFIG_BATMAN_ADV is not set
683688
# CONFIG_OPENVSWITCH is not set
684689
# CONFIG_VSOCKETS is not set
685-
# CONFIG_NETLINK_MMAP is not set
686690
# CONFIG_NETLINK_DIAG is not set
687691
# CONFIG_MPLS is not set
688692
# CONFIG_HSR is not set
@@ -718,6 +722,7 @@ CONFIG_NET_9P_VIRTIO=y
718722
# CONFIG_CEPH_LIB is not set
719723
# CONFIG_NFC is not set
720724
# CONFIG_LWTUNNEL is not set
725+
CONFIG_DST_CACHE=y
721726
CONFIG_HAVE_BPF_JIT=y
722727

723728
#
@@ -1267,6 +1272,7 @@ CONFIG_LEGACY_PTY_COUNT=16
12671272
# CONFIG_SERIAL_NONSTANDARD is not set
12681273
# CONFIG_N_GSM is not set
12691274
# CONFIG_TRACE_SINK is not set
1275+
CONFIG_LDISC_AUTOLOAD=y
12701276
CONFIG_DEVMEM=y
12711277
CONFIG_DEVKMEM=y
12721278

@@ -1304,7 +1310,6 @@ CONFIG_VIRTIO_CONSOLE=y
13041310
CONFIG_HW_RANDOM=y
13051311
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
13061312
CONFIG_HW_RANDOM_VIRTIO=y
1307-
# CONFIG_R3964 is not set
13081313
# CONFIG_RAW_DRIVER is not set
13091314
# CONFIG_TCG_TPM is not set
13101315
# CONFIG_XILLYBUS is not set
@@ -2009,7 +2014,6 @@ CONFIG_USB_ISP1760_HOST_ROLE=y
20092014
# CONFIG_USB_EMI26 is not set
20102015
# CONFIG_USB_ADUTUX is not set
20112016
# CONFIG_USB_SEVSEG is not set
2012-
# CONFIG_USB_RIO500 is not set
20132017
# CONFIG_USB_LEGOTOWER is not set
20142018
# CONFIG_USB_LCD is not set
20152019
# CONFIG_USB_LED is not set
@@ -2318,8 +2322,6 @@ CONFIG_ARM_PMU=y
23182322
# CONFIG_ANDROID is not set
23192323
# CONFIG_NVMEM is not set
23202324
# CONFIG_STM is not set
2321-
# CONFIG_STM_DUMMY is not set
2322-
# CONFIG_STM_SOURCE_CONSOLE is not set
23232325
# CONFIG_INTEL_TH is not set
23242326

23252327
#
@@ -2332,6 +2334,7 @@ CONFIG_ARM_PMU=y
23322334
#
23332335
CONFIG_ARM_PSCI_FW=y
23342336
# CONFIG_FIRMWARE_MEMMAP is not set
2337+
CONFIG_HAVE_ARM_SMCCC=y
23352338

23362339
#
23372340
# File systems
@@ -2676,6 +2679,7 @@ CONFIG_TRACING_EVENTS_GPIO=y
26762679
# CONFIG_TEST_KSTRTOX is not set
26772680
# CONFIG_TEST_PRINTF is not set
26782681
# CONFIG_TEST_RHASHTABLE is not set
2682+
# CONFIG_TEST_HASH is not set
26792683
# CONFIG_DMA_API_DEBUG is not set
26802684
# CONFIG_TEST_LKM is not set
26812685
# CONFIG_TEST_USER_COPY is not set

‎src/tools/remote-test-client/src/main.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,10 @@ fn start_qemu_emulator(target: &str, rootfs: &Path, server: &Path, tmpdir: &Path
185185
.arg("-append")
186186
.arg("console=ttyAMA0 root=/dev/ram rdinit=/sbin/init init=/sbin/init")
187187
.arg("-nographic")
188-
.arg("-redir")
189-
.arg("tcp:12345::12345");
188+
.arg("-netdev")
189+
.arg("user,id=net0,hostfwd=tcp::12345-:12345")
190+
.arg("-device")
191+
.arg("virtio-net-device,netdev=net0,mac=00:00:00:00:00:00");
190192
t!(cmd.spawn());
191193
}
192194
"aarch64-unknown-linux-gnu" => {

0 commit comments

Comments
 (0)