From dc5214f16c965f2c7c8c5a827b92c7f1afc5dae9 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Fri, 6 Sep 2013 15:49:44 -0700 Subject: [PATCH 01/66] busybox: config: enable rtcwake, powertop --- package/busybox/busybox.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index 1ea810e5bef1..b5e1f80349f3 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -659,7 +659,7 @@ CONFIG_RDATE=y CONFIG_READPROFILE=y CONFIG_RENICE=y # CONFIG_REV is not set -# CONFIG_RTCWAKE is not set +CONFIG_RTCWAKE=y # CONFIG_SCRIPT is not set # CONFIG_SCRIPTREPLAY is not set CONFIG_SETARCH=y @@ -1008,7 +1008,7 @@ CONFIG_PIDOF=y CONFIG_FEATURE_PIDOF_SINGLE=y CONFIG_FEATURE_PIDOF_OMIT=y # CONFIG_PMAP is not set -# CONFIG_POWERTOP is not set +CONFIG_POWERTOP=y # CONFIG_FEATURE_POWERTOP_INTERACTIVE is not set CONFIG_PS=y # CONFIG_FEATURE_PS_WIDE is not set From 52640406538879953b3b1fd18101a289be3f3428 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Tue, 21 Oct 2014 09:25:42 -0700 Subject: [PATCH 02/66] busybox: add nandwrite, nanddump --- package/busybox/busybox.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index b5e1f80349f3..fe1aca629201 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -788,8 +788,8 @@ CONFIG_FEATURE_MAKEDEVS_TABLE=y # CONFIG_MAN is not set CONFIG_MICROCOM=y CONFIG_MT=y -# CONFIG_NANDWRITE is not set -# CONFIG_NANDDUMP is not set +CONFIG_NANDWRITE=y +CONFIG_NANDDUMP=y CONFIG_PARTPROBE=y # CONFIG_RAIDAUTORUN is not set # CONFIG_READAHEAD is not set From a435bcc43b00c11e10d86603e8b241c11d22924c Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Fri, 27 Mar 2015 11:41:03 -0700 Subject: [PATCH 03/66] busybox: enable BASH_IS_ASH feature --- package/busybox/busybox.config | 1 + 1 file changed, 1 insertion(+) diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index fe1aca629201..38b4f3fde216 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -1127,6 +1127,7 @@ CONFIG_ASH_CMDCMD=y # CONFIG_FEATURE_SH_MATH=y CONFIG_FEATURE_SH_MATH_64=y +CONFIG_FEATURE_BASH_IS_ASH=y CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set From f6841cdaf134b79ac71f414365829acdc8b4dda7 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Fri, 27 Mar 2015 13:29:07 -0700 Subject: [PATCH 04/66] snapshot: kconfig fragments --- configs/frags/arm.config | 11 +++++++++++ configs/frags/arm64.config | 1 + configs/frags/armeb.config | 1 + configs/frags/armel.config | 1 + configs/frags/build | 26 ++++++++++++++++++++++++++ configs/frags/debug.config | 1 + configs/frags/packages.config | 23 +++++++++++++++++++++++ configs/frags/x86.config | 4 ++++ 8 files changed, 68 insertions(+) create mode 100644 configs/frags/arm.config create mode 100644 configs/frags/arm64.config create mode 100644 configs/frags/armeb.config create mode 100644 configs/frags/armel.config create mode 100755 configs/frags/build create mode 100644 configs/frags/debug.config create mode 100644 configs/frags/packages.config create mode 100644 configs/frags/x86.config diff --git a/configs/frags/arm.config b/configs/frags/arm.config new file mode 100644 index 000000000000..f7184c854bf2 --- /dev/null +++ b/configs/frags/arm.config @@ -0,0 +1,11 @@ +# EABI, soft-float +#BR2_arm926t=y +#BR2_ARM_EABI=y +#BR2_ARM_SOFT_FLOAT=y + +# EABI, hard float +BR2_cortex_a5=y +BR2_ARM_EABIHF=y +BR2_ARM_FPU_VFPV3=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM=y diff --git a/configs/frags/arm64.config b/configs/frags/arm64.config new file mode 100644 index 000000000000..1c7714729f79 --- /dev/null +++ b/configs/frags/arm64.config @@ -0,0 +1 @@ +BR2_aarch64=y diff --git a/configs/frags/armeb.config b/configs/frags/armeb.config new file mode 100644 index 000000000000..7b7bf560a8ed --- /dev/null +++ b/configs/frags/armeb.config @@ -0,0 +1 @@ +BR2_armeb=y diff --git a/configs/frags/armel.config b/configs/frags/armel.config new file mode 100644 index 000000000000..5d689c0b43de --- /dev/null +++ b/configs/frags/armel.config @@ -0,0 +1 @@ +BR2_arm=y diff --git a/configs/frags/build b/configs/frags/build new file mode 100755 index 000000000000..a8d29d95fa96 --- /dev/null +++ b/configs/frags/build @@ -0,0 +1,26 @@ +#!/bin/bash +D=$(dirname $0) + +rm .config +make defconfig + +FRAGMENTS=() +if [[ $1 =~ ^arm.* ]]; then + FRAGMENTS+=("arm") +fi + +FRAGMENTS+=("$*") +FRAGMENTS+=("packages") +echo ${FRAGMENTS[@]} +for frag in ${FRAGMENTS[@]}; do + if [ -e $D/$frag.config ]; then + cat $D/$frag.config >> .config + else + echo "WARNING: $D/$frag.config doesn't exist" + fi +done + +# reconfigure with new fragments appended +yes "" | make oldconfig + +make diff --git a/configs/frags/debug.config b/configs/frags/debug.config new file mode 100644 index 000000000000..87f6aa85c0ca --- /dev/null +++ b/configs/frags/debug.config @@ -0,0 +1 @@ +#BR2_PACKAGE_FILE=y diff --git a/configs/frags/packages.config b/configs/frags/packages.config new file mode 100644 index 000000000000..c43eb66be71b --- /dev/null +++ b/configs/frags/packages.config @@ -0,0 +1,23 @@ +# parallel make, ccache +BR2_JLEVEL=14 +BR2_CCACHE=y +BR2_CCACHE_DIR="/tmp/buildroot-ccache-$(BR2_ARCH)" + +# enable overlay support (used for custom init scripts) +BR2_ROOTFS_OVERLAY="overlay" + +# need cpio for initramfs +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_CPIO_GZIP=y +# compress the tar image +BR2_TARGET_ROOTFS_TAR_XZ=y + +# don't run a getty; etc/inittab configured for auto-root login +BR2_TARGET_GENERIC_GETTY=n + +# ssh needed for ARM workload-automation +BR2_PACKAGE_DROPBEAR=y + +# Testing utils +BR2_PACKAGE_STRESS=y +BR2_PACKAGE_TRACE_CMD=y diff --git a/configs/frags/x86.config b/configs/frags/x86.config new file mode 100644 index 000000000000..bb23e46500a2 --- /dev/null +++ b/configs/frags/x86.config @@ -0,0 +1,4 @@ +BR2_TOOLCHAIN_BUILDROOT=y +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y + +BR2_GCC_VERSION_4_9_X=y From 2b11faa3dd6ba74c615275dee6706dac121d5f3b Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Fri, 6 Sep 2013 21:41:46 -0700 Subject: [PATCH 05/66] overlay: auto-mount debugfs --- overlay/etc/init.d/S50debugfs | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100755 overlay/etc/init.d/S50debugfs diff --git a/overlay/etc/init.d/S50debugfs b/overlay/etc/init.d/S50debugfs new file mode 100755 index 000000000000..320d764beb44 --- /dev/null +++ b/overlay/etc/init.d/S50debugfs @@ -0,0 +1,8 @@ +#!/bin/sh + +case $1 in + start|"") + mount -t debugfs none /sys/kernel/debug + ln -s /sys/kernel/debug /debug + ;; +esac From 8a41a9e352696fb18ad687b87a2b18c7a2feaa38 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Fri, 6 Sep 2013 21:42:14 -0700 Subject: [PATCH 06/66] overlay: auto-create resolv.conf from kernel PNP info --- overlay/etc/init.d/S50pnp_networking | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 overlay/etc/init.d/S50pnp_networking diff --git a/overlay/etc/init.d/S50pnp_networking b/overlay/etc/init.d/S50pnp_networking new file mode 100755 index 000000000000..12439145ed55 --- /dev/null +++ b/overlay/etc/init.d/S50pnp_networking @@ -0,0 +1,9 @@ +#!/bin/sh + +case $1 in + start|"") + if [ -e /proc/net/pnp ]; then + cat /proc/net/pnp >> /etc/resolv.conf + fi + ;; +esac From af8f6221e41a43baa0d9a21f41020267bd0142da Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Mon, 30 Mar 2015 21:25:41 -0700 Subject: [PATCH 07/66] configs/frags/arm: use arm926 w/soft-float Some boards (like davinci dm365, da850) do not have floating point units. Also, we need to include arm9/arm11 support for davinci, versatilepb and raspberry-pi. Therefore, we can't use the Linaro compiler which needs Cortex-A support and hard-float. --- configs/frags/arm.config | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/configs/frags/arm.config b/configs/frags/arm.config index f7184c854bf2..7360ad3b980f 100644 --- a/configs/frags/arm.config +++ b/configs/frags/arm.config @@ -1,11 +1,19 @@ # EABI, soft-float -#BR2_arm926t=y -#BR2_ARM_EABI=y -#BR2_ARM_SOFT_FLOAT=y +BR2_arm926t=y +BR2_ARM_EABI=y +BR2_ARM_SOFT_FLOAT=y +#BR2_ARM_EABIHF=y +#BR2_ARM_FPU_VFPV2=y -# EABI, hard float -BR2_cortex_a5=y -BR2_ARM_EABIHF=y -BR2_ARM_FPU_VFPV3=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM=y +# Buildroot glibc toolchain +BR2_TOOLCHAIN_BUILDROOT=y +BR2_TOOLCHAIN_USES_GLIBC=y +BR2_TOOLCHAIN_BUILDROOT_VENDOR="buildroot" +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y + +# EABI, hard float, Linaro toolchain (requires >= Cortex-A) +#BR2_cortex_a5=y +#BR2_ARM_EABIHF=y +#BR2_ARM_FPU_VFPV3=y +#BR2_TOOLCHAIN_EXTERNAL=y +#BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM=y From cfd67e387a808beeda1c900ae3175f2bfd4b9d2d Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Fri, 5 Jun 2015 11:08:00 -0700 Subject: [PATCH 08/66] configs/frags: packages: add eudev for module loading Signed-off-by: Kevin Hilman --- configs/frags/packages.config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/frags/packages.config b/configs/frags/packages.config index c43eb66be71b..86e1279c9b9b 100644 --- a/configs/frags/packages.config +++ b/configs/frags/packages.config @@ -21,3 +21,7 @@ BR2_PACKAGE_DROPBEAR=y # Testing utils BR2_PACKAGE_STRESS=y BR2_PACKAGE_TRACE_CMD=y + +# add eudev for automatic module loading support +BR2_INIT_BUSYBOX=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y From cf1f1d8b2b07ecb75aa1d51c4c82c72bb832325d Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Thu, 18 Jun 2015 15:58:18 -0700 Subject: [PATCH 09/66] configs/frags: armeb: update for ARMv7 only ARMv7 and ARMv7 big-endian support is different, and we currently only test ARMv7 big-endian platforms. So, update the armeb fragment to only build with ARMv7 support. Also, since it's ARMv7+, we can use the Linaro toolchain so do so. --- configs/frags/armeb.config | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configs/frags/armeb.config b/configs/frags/armeb.config index 7b7bf560a8ed..c7756e92d785 100644 --- a/configs/frags/armeb.config +++ b/configs/frags/armeb.config @@ -1 +1,7 @@ BR2_armeb=y + +BR2_cortex_a5=y +BR2_ARM_EABIHF=y +BR2_ARM_FPU_VFPV2=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM=y From 79318fe82db1452951b4c1f32061458c5db84d9f Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Wed, 11 Nov 2015 10:05:52 -0800 Subject: [PATCH 10/66] configs/frags: packages: add pciutils Signed-off-by: Kevin Hilman --- configs/frags/packages.config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/frags/packages.config b/configs/frags/packages.config index 86e1279c9b9b..d70177e2fbbd 100644 --- a/configs/frags/packages.config +++ b/configs/frags/packages.config @@ -25,3 +25,6 @@ BR2_PACKAGE_TRACE_CMD=y # add eudev for automatic module loading support BR2_INIT_BUSYBOX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y + +# misc. ools +BR2_PACKAGE_PCIUTILS=y \ No newline at end of file From 2c3272a4994943d0e0fce2bc58a8829102e67b3a Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Wed, 11 Nov 2015 11:42:45 -0800 Subject: [PATCH 11/66] configs/frags: build: fail if frag not present Signed-off-by: Kevin Hilman --- configs/frags/build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/frags/build b/configs/frags/build index a8d29d95fa96..03aa26b83f28 100755 --- a/configs/frags/build +++ b/configs/frags/build @@ -16,7 +16,8 @@ for frag in ${FRAGMENTS[@]}; do if [ -e $D/$frag.config ]; then cat $D/$frag.config >> .config else - echo "WARNING: $D/$frag.config doesn't exist" + echo "WARNING: $D/$frag.config doesn't exist. Giving up." + exit 1 fi done From 7fdcb6c51f4b5a842df79ac70f88b74ef213ba62 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Wed, 11 Nov 2015 12:09:58 -0800 Subject: [PATCH 12/66] configs/frags: rename packages to base The "base" fragment will always be included. --- configs/frags/{packages.config => base.config} | 0 configs/frags/build | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename configs/frags/{packages.config => base.config} (100%) diff --git a/configs/frags/packages.config b/configs/frags/base.config similarity index 100% rename from configs/frags/packages.config rename to configs/frags/base.config diff --git a/configs/frags/build b/configs/frags/build index 03aa26b83f28..6246ce11d58c 100755 --- a/configs/frags/build +++ b/configs/frags/build @@ -10,7 +10,7 @@ if [[ $1 =~ ^arm.* ]]; then fi FRAGMENTS+=("$*") -FRAGMENTS+=("packages") +FRAGMENTS+=("base") echo ${FRAGMENTS[@]} for frag in ${FRAGMENTS[@]}; do if [ -e $D/$frag.config ]; then From ebe5fcd83724d60be0c6494e539b87e5c02d3894 Mon Sep 17 00:00:00 2001 From: Anders Roxell Date: Tue, 15 Sep 2015 09:19:37 +0200 Subject: [PATCH 13/66] configs/frags: add new arm64be fragment Signed-off-by: Anders Roxell --- configs/frags/arm64be.config | 1 + 1 file changed, 1 insertion(+) create mode 100644 configs/frags/arm64be.config diff --git a/configs/frags/arm64be.config b/configs/frags/arm64be.config new file mode 100644 index 000000000000..36449285aeeb --- /dev/null +++ b/configs/frags/arm64be.config @@ -0,0 +1 @@ +BR2_aarch64_be=y From 6c03d14cd40b3a07312a37c3f037cc10ff1e7675 Mon Sep 17 00:00:00 2001 From: Anders Roxell Date: Mon, 29 Jun 2015 18:56:00 +0200 Subject: [PATCH 14/66] configs/frags: tests: add ltp-testsuite Signed-off-by: Anders Roxell --- configs/frags/tests.config | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 configs/frags/tests.config diff --git a/configs/frags/tests.config b/configs/frags/tests.config new file mode 100644 index 000000000000..a1f498de15f3 --- /dev/null +++ b/configs/frags/tests.config @@ -0,0 +1,2 @@ +# Testing utils +BR2_PACKAGE_LTP_TESTSUITE=y From 15ec178fed1d14b797fe5e270236343b88146900 Mon Sep 17 00:00:00 2001 From: Anders Roxell Date: Mon, 29 Jun 2015 19:00:26 +0200 Subject: [PATCH 15/66] configs/frags: tests: add lmbench Signed-off-by: Anders Roxell --- configs/frags/tests.config | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/frags/tests.config b/configs/frags/tests.config index a1f498de15f3..7de8ae9e4de8 100644 --- a/configs/frags/tests.config +++ b/configs/frags/tests.config @@ -1,2 +1,3 @@ # Testing utils BR2_PACKAGE_LTP_TESTSUITE=y +BR2_PACKAGE_LMBENCH=y From a81b1fe3fdbba085d7ec1f234e7ad7230a046f81 Mon Sep 17 00:00:00 2001 From: Anders Roxell Date: Mon, 29 Jun 2015 20:09:21 +0200 Subject: [PATCH 16/66] configs/frags: tests: add rt-tests Signed-off-by: Anders Roxell --- configs/frags/tests.config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/frags/tests.config b/configs/frags/tests.config index 7de8ae9e4de8..1a59710e7c53 100644 --- a/configs/frags/tests.config +++ b/configs/frags/tests.config @@ -1,3 +1,6 @@ # Testing utils BR2_PACKAGE_LTP_TESTSUITE=y BR2_PACKAGE_LMBENCH=y + +# Testing utils rt-tests to enable cyclictest and hackbench +BR2_PACKAGE_RT_TESTS=y From 477203d96151fddb90b659c8b0e388d3537d4d06 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Tue, 17 Nov 2015 15:11:07 -0800 Subject: [PATCH 17/66] configs/frags: tests: add popt package Needed by in-kernel selftests for compile-time and runtime. Signed-off-by: Kevin Hilman --- configs/frags/tests.config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/frags/tests.config b/configs/frags/tests.config index 1a59710e7c53..a6c0fab199a5 100644 --- a/configs/frags/tests.config +++ b/configs/frags/tests.config @@ -4,3 +4,6 @@ BR2_PACKAGE_LMBENCH=y # Testing utils rt-tests to enable cyclictest and hackbench BR2_PACKAGE_RT_TESTS=y + +# needed for in-kernel kselftests (compile-time and runtime) +BR2_PACKAGE_POPT=y From 1c9197bf7a36980a46005a0020dcc922d348e1d1 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Tue, 17 Nov 2015 15:11:58 -0800 Subject: [PATCH 18/66] configs/frags: build: tar up output/hosts The output/hosts dir is needed for cross-compiling external packages (e.g. kernel selftests.) Package up for ease of distribution. Signed-off-by: Kevin Hilman --- configs/frags/build | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/configs/frags/build b/configs/frags/build index 6246ce11d58c..5354ca160b30 100755 --- a/configs/frags/build +++ b/configs/frags/build @@ -25,3 +25,12 @@ done yes "" | make oldconfig make + +# remove uncompressed versions of rootfs +(cd output/images; rm -f rootfs.cpio rootfs.tar) + +if [ $? = 0 ]; then + echo "Packaging up output/host directory" + tar -C output/host -Jcf output/images/host.tar.xz . + (cd output/images; md5sum host.tar.xz > host.tar.xz.md5) +fi From 1217d68d3f4b631f31577eb0aa83178982ea2a8a Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Wed, 6 Apr 2016 16:46:19 -0700 Subject: [PATCH 19/66] package/buildroot: inittab: auto root login on console --- package/busybox/inittab | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/busybox/inittab b/package/busybox/inittab index ff1725c775a1..6332c590e2af 100644 --- a/package/busybox/inittab +++ b/package/busybox/inittab @@ -27,6 +27,8 @@ null::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr # now run any rc scripts ::sysinit:/etc/init.d/rcS +console::respawn:/bin/sh + # Put a getty on the serial port #ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100 # GENERIC_SERIAL From fef84d97905517dda2151449da4833211399833b Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Tue, 26 Jul 2016 07:40:29 -0700 Subject: [PATCH 20/66] configs/frags: base: update for 2016.05 --- configs/frags/base.config | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/configs/frags/base.config b/configs/frags/base.config index d70177e2fbbd..fe1343a262ca 100644 --- a/configs/frags/base.config +++ b/configs/frags/base.config @@ -11,6 +11,8 @@ BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_GZIP=y # compress the tar image BR2_TARGET_ROOTFS_TAR_XZ=y +# selinux enabled kernels can't use CPIO (no extended attributes, nead "real" filesystem) +BR2_TARGET_ROOTFS_EXT2=y # don't run a getty; etc/inittab configured for auto-root login BR2_TARGET_GENERIC_GETTY=n @@ -26,5 +28,12 @@ BR2_PACKAGE_TRACE_CMD=y BR2_INIT_BUSYBOX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y -# misc. ools -BR2_PACKAGE_PCIUTILS=y \ No newline at end of file +# misc. tools +BR2_PACKAGE_PCIUTILS=y + +# ensure older kernel support (v3.2 is oldest as of 2016.05) +# NOTE: arm64 only exists as of v3.10 +BR2_KERNEL_HEADERS_3_10=y + +# ensure older compiler support (needed?) +BR2_TOOLCHAIN_GCC_AT_LEAST_4_8=y From 313ae669ca545e567ec7e03e8d097e4a9940469f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 28 Jul 2016 15:25:03 +0200 Subject: [PATCH 21/66] configs/frags/armeb: really use the Linaro toolchain If you don't enable BR2_ARM_ENABLE_VFP=y, then BR2_ARM_EABIHF=y does not do anything because EABIhf is not available for cores that don't have a VFP. Since the Linaro ARM big-endian toolchain is an EABIhf only toolchain, it is not available if EABI is used instead of EABIhf. Due to this, it was using the Musl big-endian toolchain, which is big-endian for ARMv4/5 (i.e BE-32). To fix this, we define BR2_ARM_ENABLE_VFP=y. In addition, there is a different Config.in symbol for the ARM little-endian and the ARM big-endian Linaro toolchain, so we use the appropriate one. Signed-off-by: Thomas Petazzoni Signed-off-by: Kevin Hilman --- configs/frags/armeb.config | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configs/frags/armeb.config b/configs/frags/armeb.config index c7756e92d785..b262db921aee 100644 --- a/configs/frags/armeb.config +++ b/configs/frags/armeb.config @@ -1,7 +1,10 @@ BR2_armeb=y +# NOTE: big-endian is different between ARMv4/v5 and ARMv7 +# this only works for ARMv7 BR2_cortex_a5=y +BR2_ARM_ENABLE_VFP=y BR2_ARM_EABIHF=y BR2_ARM_FPU_VFPV2=y BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM=y +BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB=y From 9842ba0e873ea49517dbad3b686f3b06befda4bf Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 28 Jul 2016 15:25:14 +0200 Subject: [PATCH 22/66] configs/frags/build: better way of "expanding" the configuration "make olddefconfig" is the better way of doing 'yes "" | make oldconfig'. Signed-off-by: Thomas Petazzoni Signed-off-by: Kevin Hilman --- configs/frags/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/frags/build b/configs/frags/build index 5354ca160b30..1223a265dcaf 100755 --- a/configs/frags/build +++ b/configs/frags/build @@ -22,7 +22,7 @@ for frag in ${FRAGMENTS[@]}; do done # reconfigure with new fragments appended -yes "" | make oldconfig +make olddefconfig make From a3b84940fc65aa8529a9356a1f5f882fbcd5053f Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Tue, 26 Jul 2016 14:05:41 +0200 Subject: [PATCH 23/66] configs/frags/base: purge locales This purges useless locales (en_US might be also purged) to reduce the size of the created rootfs. Signed-off-by: Quentin Schulz Signed-off-by: Kevin Hilman --- configs/frags/base.config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/frags/base.config b/configs/frags/base.config index fe1343a262ca..a98008285874 100644 --- a/configs/frags/base.config +++ b/configs/frags/base.config @@ -37,3 +37,7 @@ BR2_KERNEL_HEADERS_3_10=y # ensure older compiler support (needed?) BR2_TOOLCHAIN_GCC_AT_LEAST_4_8=y + +# purge locales to reduce rootfs size +BR2_ENABLE_LOCALE_PURGE=y +BR2_ENABLE_LOCALE_WHITELIST="C en_US" From 3c3d0174d7e1d1acc7e5abc74a39204878c0bcf2 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Thu, 28 Jul 2016 10:10:12 -0700 Subject: [PATCH 24/66] configs/frags/arm: enable ARMv4 Set the default to arm920t (armv4) to enable rootfs on ARMv4 systems as well. Reported-by: Quentin Schulz Signed-off-by: Kevin Hilman --- configs/frags/arm.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/frags/arm.config b/configs/frags/arm.config index 7360ad3b980f..d3d5ddbfb6b2 100644 --- a/configs/frags/arm.config +++ b/configs/frags/arm.config @@ -1,5 +1,5 @@ # EABI, soft-float -BR2_arm926t=y +BR2_arm920t=y BR2_ARM_EABI=y BR2_ARM_SOFT_FLOAT=y #BR2_ARM_EABIHF=y From 9851abf13fbc4a4fcb1014c48dcac153fe263452 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Thu, 18 Aug 2016 10:16:49 -0700 Subject: [PATCH 25/66] package/busybox: enable mkfs for VFAT and ext2 --- package/busybox/busybox.config | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index 38b4f3fde216..2312e24da8df 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -606,6 +606,11 @@ CONFIG_FREERAMDISK=y # CONFIG_FSCK_MINIX is not set CONFIG_FSFREEZE=y CONFIG_FSTRIM=y +CONFIG_MKFS_EXT2=y +# CONFIG_MKFS_MINIX is not set +# CONFIG_FEATURE_MINIX2 is not set +# CONFIG_MKFS_REISER is not set +CONFIG_MKFS_VFAT=y CONFIG_GETOPT=y CONFIG_FEATURE_GETOPT_LONG=y CONFIG_HEXDUMP=y From d7eadbc4bc8281e9bddb2aef9dcb75b596cacbd6 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Thu, 18 Aug 2016 10:18:26 -0700 Subject: [PATCH 26/66] configs/frags: add fragment for flash tools and UBI --- configs/frags/flash.config | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 configs/frags/flash.config diff --git a/configs/frags/flash.config b/configs/frags/flash.config new file mode 100644 index 000000000000..fc68530a2c79 --- /dev/null +++ b/configs/frags/flash.config @@ -0,0 +1,2 @@ +BR2_PACKAGE_MTD=y +BR2_PACKAGE_MTD_MKFSUBIFS=y From 340ab86ef54108a505142ece0ba3fc4a49891b3c Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Thu, 18 Aug 2016 10:18:58 -0700 Subject: [PATCH 27/66] configs/frags: echo which frags are being included --- configs/frags/build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/frags/build b/configs/frags/build index 1223a265dcaf..6feb61811840 100755 --- a/configs/frags/build +++ b/configs/frags/build @@ -10,10 +10,12 @@ if [[ $1 =~ ^arm.* ]]; then fi FRAGMENTS+=("$*") +#FRAGMENTS+=("min") FRAGMENTS+=("base") echo ${FRAGMENTS[@]} for frag in ${FRAGMENTS[@]}; do if [ -e $D/$frag.config ]; then + echo "INFO: Including fragment: $frag" cat $D/$frag.config >> .config else echo "WARNING: $D/$frag.config doesn't exist. Giving up." From 125d62b5d21a1b19ee5e537f6d53757ac8bd390f Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Thu, 10 Nov 2016 16:55:32 -0800 Subject: [PATCH 28/66] overlay: dropbear: add args --- overlay/etc/default/dropbear | 1 + 1 file changed, 1 insertion(+) create mode 100644 overlay/etc/default/dropbear diff --git a/overlay/etc/default/dropbear b/overlay/etc/default/dropbear new file mode 100644 index 000000000000..5c388395ec85 --- /dev/null +++ b/overlay/etc/default/dropbear @@ -0,0 +1 @@ +DROPBEAR_ARGS=-B From 170b0942e6c02cb79bba39e17edad2075135f9f3 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Thu, 10 Nov 2016 16:58:17 -0800 Subject: [PATCH 29/66] configs/frags: flash: create UBI rootfs --- configs/frags/flash.config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/frags/flash.config b/configs/frags/flash.config index fc68530a2c79..4f0a664a9cbd 100644 --- a/configs/frags/flash.config +++ b/configs/frags/flash.config @@ -1,2 +1,5 @@ BR2_PACKAGE_MTD=y BR2_PACKAGE_MTD_MKFSUBIFS=y + +# create UBI rootfs +BR2_TARGET_ROOTFS_UBIFS=y From f6421bcc13741072f37d5f3e5b58416950fdd4b8 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Mon, 23 Jan 2017 11:42:43 -0800 Subject: [PATCH 30/66] configs/frags: base: add ext2 utils --- configs/frags/base.config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/frags/base.config b/configs/frags/base.config index a98008285874..005193ea299b 100644 --- a/configs/frags/base.config +++ b/configs/frags/base.config @@ -41,3 +41,6 @@ BR2_TOOLCHAIN_GCC_AT_LEAST_4_8=y # purge locales to reduce rootfs size BR2_ENABLE_LOCALE_PURGE=y BR2_ENABLE_LOCALE_WHITELIST="C en_US" + +# fs utils +BR2_PACKAGE_E2FSPROGS=y From 3073cacdfe2b8bb5c6592cc3d3cc439770be6783 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Fri, 2 Feb 2018 11:40:49 -0800 Subject: [PATCH 31/66] configs/frags: build: return error if make fails --- configs/frags/build | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configs/frags/build b/configs/frags/build index 6feb61811840..5c9412bcc7fb 100755 --- a/configs/frags/build +++ b/configs/frags/build @@ -28,6 +28,11 @@ make olddefconfig make +RESULT=$? +if [ $RESULT != 0 ]; then + exit $RESULT +fi + # remove uncompressed versions of rootfs (cd output/images; rm -f rootfs.cpio rootfs.tar) From fd282e446919eaaf5d8cc6f254a158ac5e630e68 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Fri, 2 Feb 2018 11:41:56 -0800 Subject: [PATCH 32/66] configs/frags: xz compress .ext2 rootfs image and delete the non-compressed version when done --- configs/frags/base.config | 2 ++ configs/frags/build | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configs/frags/base.config b/configs/frags/base.config index 005193ea299b..c79cd6930108 100644 --- a/configs/frags/base.config +++ b/configs/frags/base.config @@ -13,6 +13,8 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_ROOTFS_TAR_XZ=y # selinux enabled kernels can't use CPIO (no extended attributes, nead "real" filesystem) BR2_TARGET_ROOTFS_EXT2=y +# ...compressed +BR2_TARGET_ROOTFS_EXT2_XZ=y # don't run a getty; etc/inittab configured for auto-root login BR2_TARGET_GENERIC_GETTY=n diff --git a/configs/frags/build b/configs/frags/build index 5c9412bcc7fb..11f2bdf57e8b 100755 --- a/configs/frags/build +++ b/configs/frags/build @@ -34,7 +34,7 @@ if [ $RESULT != 0 ]; then fi # remove uncompressed versions of rootfs -(cd output/images; rm -f rootfs.cpio rootfs.tar) +(cd output/images; rm -f rootfs.cpio rootfs.tar rootfs.ext2) if [ $? = 0 ]; then echo "Packaging up output/host directory" From 8d261cb19419f181e25a938fff4342d1736f324b Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Fri, 2 Feb 2018 11:42:29 -0800 Subject: [PATCH 33/66] configs/frags: tests: increase size of ext2 image rootfs with tests can be much bigger, increase deafult size --- configs/frags/tests.config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/frags/tests.config b/configs/frags/tests.config index a6c0fab199a5..c2b2a7537be9 100644 --- a/configs/frags/tests.config +++ b/configs/frags/tests.config @@ -1,3 +1,6 @@ +# ext2 might grow bigger than default (60M) +BR2_TARGET_ROOTFS_EXT2_SIZE="200M" + # Testing utils BR2_PACKAGE_LTP_TESTSUITE=y BR2_PACKAGE_LMBENCH=y From ce524eae6edcd07ced080c85215047080425b78d Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Thu, 7 Jun 2018 15:24:43 -0700 Subject: [PATCH 34/66] configs/frags: add new arch: arc Signed-off-by: Kevin Hilman --- configs/frags/arc.config | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 configs/frags/arc.config diff --git a/configs/frags/arc.config b/configs/frags/arc.config new file mode 100644 index 000000000000..921b95f67092 --- /dev/null +++ b/configs/frags/arc.config @@ -0,0 +1,2 @@ +BR2_arcle=y +BR2_archs38=y From 6b99486e5d6c2ea45dd892726115000144a6dfc3 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Fri, 8 Jun 2018 14:18:00 -0700 Subject: [PATCH 35/66] configs/frags/base: newer kernel headers v3.10 headers are deprecated as of buildroot 2018.02. Move to v4.4. --- configs/frags/base.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/frags/base.config b/configs/frags/base.config index c79cd6930108..d514af0a7cc2 100644 --- a/configs/frags/base.config +++ b/configs/frags/base.config @@ -35,7 +35,7 @@ BR2_PACKAGE_PCIUTILS=y # ensure older kernel support (v3.2 is oldest as of 2016.05) # NOTE: arm64 only exists as of v3.10 -BR2_KERNEL_HEADERS_3_10=y +BR2_KERNEL_HEADERS_4_4=y # ensure older compiler support (needed?) BR2_TOOLCHAIN_GCC_AT_LEAST_4_8=y From 1c268d965d4480f5e9683931b64858840b9509d9 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Fri, 8 Jun 2018 14:19:15 -0700 Subject: [PATCH 36/66] configs/frags/arc: use glibc --- configs/frags/arc.config | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configs/frags/arc.config b/configs/frags/arc.config index 921b95f67092..faf4db20df46 100644 --- a/configs/frags/arc.config +++ b/configs/frags/arc.config @@ -1,2 +1,8 @@ BR2_arcle=y BR2_archs38=y + +# Buildroot glibc toolchain +BR2_TOOLCHAIN_BUILDROOT=y +BR2_TOOLCHAIN_USES_GLIBC=y +BR2_TOOLCHAIN_BUILDROOT_VENDOR="buildroot" +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y From 1542cd53753a18dfeb9bf301c90165ead01e065b Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Thu, 28 Jun 2018 12:28:09 -0700 Subject: [PATCH 37/66] Add back v3.18 kernel headers support Kernel v3.18 is still LTS, and is actively tested in kernelCI, so add back support. Signed-off-by: Kevin Hilman --- Config.in.legacy | 7 ------- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 5 +++++ 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index fb7b0aadd0c1..e4276d77ad50 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -2529,13 +2529,6 @@ config BR2_KERNEL_HEADERS_4_8 Version 4.8.x of the Linux kernel headers are no longer maintained upstream and are now removed. -config BR2_KERNEL_HEADERS_3_18 - bool "kernel headers version 3.18.x are no longer supported" - select BR2_LEGACY - help - Version 3.18.x of the Linux kernel headers are no longer - maintained upstream and are now removed. - config BR2_GLIBC_VERSION_2_22 bool "glibc 2.22 removed" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index 629c355ad7ea..2ca84f89ad09 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -7,6 +7,7 @@ sha256 49474956a6149c16cbcba862d1f4db54835a32d336063c75094f669f1c34c65e linux- sha256 e547748c548b0f55f665bc78cfec322e7b96f41527b5e4b5d79430fdaa57c3e8 linux-4.9.225.tar.xz sha256 671d1f1d5ad0ae74fb21ee70a5544400e7d6270098d3f8b134484ded2c3e5b90 linux-4.14.182.tar.xz sha256 9843f40efb37491770688810d153d0779daed8eb097773a0de5abf2cb0d1bd7e linux-4.19.125.tar.xz +sha256 3ec7f47365a8a050e629a5016e90e38a800e840c844901c979e9e796f8dc6711 linux-3.18.133.tar.xz # Locally computed sha256 ea53913813cb5a9069608532b327de7a7ed0fdc8fed8c6f10cd55d1ac6a58ffb linux-cip-4.19.118-cip25.tar.gz sha256 7f0a0db0e1cfb14053523f4432f1ad1468b5bd42305b44905c4b103466c8d655 linux-cip-4.19.115-cip24-rt9.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 53ea3984eb86..20ac6c2eead5 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -27,6 +27,10 @@ config BR2_KERNEL_HEADERS_AS_KERNEL depends on BR2_LINUX_KERNEL select BR2_KERNEL_HEADERS_LATEST if BR2_LINUX_KERNEL_LATEST_VERSION +config BR2_KERNEL_HEADERS_3_18 + bool "Linux 3.18.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + config BR2_KERNEL_HEADERS_4_4 bool "Linux 4.4.x kernel headers" depends on !BR2_riscv @@ -334,6 +338,7 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string + default "3.18.133" if BR2_KERNEL_HEADERS_3_18 default "4.4.225" if BR2_KERNEL_HEADERS_4_4 default "4.9.225" if BR2_KERNEL_HEADERS_4_9 default "4.14.182" if BR2_KERNEL_HEADERS_4_14 From 9c5eb3bc57129d1acf5d324dd52230fe581286e3 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Thu, 28 Jun 2018 12:29:25 -0700 Subject: [PATCH 38/66] configs/frags/base: use v3.18 kernel headers Signed-off-by: Kevin Hilman --- configs/frags/base.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/frags/base.config b/configs/frags/base.config index d514af0a7cc2..c6d43281bc81 100644 --- a/configs/frags/base.config +++ b/configs/frags/base.config @@ -35,7 +35,7 @@ BR2_PACKAGE_PCIUTILS=y # ensure older kernel support (v3.2 is oldest as of 2016.05) # NOTE: arm64 only exists as of v3.10 -BR2_KERNEL_HEADERS_4_4=y +BR2_KERNEL_HEADERS_3_18=y # ensure older compiler support (needed?) BR2_TOOLCHAIN_GCC_AT_LEAST_4_8=y From 6d75dea8d13464c91018d118f2e4c8a0a43a20a6 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Thu, 7 Feb 2019 14:38:35 -0800 Subject: [PATCH 39/66] configs/frags: add mipsel.config --- configs/frags/mipsel.config | 1 + 1 file changed, 1 insertion(+) create mode 100644 configs/frags/mipsel.config diff --git a/configs/frags/mipsel.config b/configs/frags/mipsel.config new file mode 100644 index 000000000000..b4e1934e6009 --- /dev/null +++ b/configs/frags/mipsel.config @@ -0,0 +1 @@ +BR2_mipsel=y From af1d6ae091b483241141519e700c40683a2ee390 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Thu, 7 Feb 2019 14:40:42 -0800 Subject: [PATCH 40/66] configs/frags: add riscv.config --- configs/frags/riscv.config | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 configs/frags/riscv.config diff --git a/configs/frags/riscv.config b/configs/frags/riscv.config new file mode 100644 index 000000000000..54fa6e4ab70f --- /dev/null +++ b/configs/frags/riscv.config @@ -0,0 +1,5 @@ +BR2_riscv=y +BR2_riscv_g=y + +# RISC-V needs recent kernel headers +BR2_KERNEL_HEADERS_4_19=y From 21fcf5d395c893d45f757952eb6ab8321e7f3f7d Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Thu, 7 Feb 2019 14:42:42 -0800 Subject: [PATCH 41/66] configs/frags/base: remove ccache and jlevel Remove hard-coded parallel make and ccache options. Signed-off-by: Kevin Hilman --- configs/frags/base.config | 5 ----- 1 file changed, 5 deletions(-) diff --git a/configs/frags/base.config b/configs/frags/base.config index c6d43281bc81..3e56dfb8a971 100644 --- a/configs/frags/base.config +++ b/configs/frags/base.config @@ -1,8 +1,3 @@ -# parallel make, ccache -BR2_JLEVEL=14 -BR2_CCACHE=y -BR2_CCACHE_DIR="/tmp/buildroot-ccache-$(BR2_ARCH)" - # enable overlay support (used for custom init scripts) BR2_ROOTFS_OVERLAY="overlay" From c651158dfa0ffe627265a39b5c65814baa4e0c8d Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Thu, 7 Feb 2019 17:05:32 -0800 Subject: [PATCH 42/66] configs/frags/build: ensure overrides --- configs/frags/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/frags/build b/configs/frags/build index 11f2bdf57e8b..ea007db62da0 100755 --- a/configs/frags/build +++ b/configs/frags/build @@ -9,9 +9,9 @@ if [[ $1 =~ ^arm.* ]]; then FRAGMENTS+=("arm") fi -FRAGMENTS+=("$*") -#FRAGMENTS+=("min") FRAGMENTS+=("base") +FRAGMENTS+=("$*") # ensure passed-in frags override base + echo ${FRAGMENTS[@]} for frag in ${FRAGMENTS[@]}; do if [ -e $D/$frag.config ]; then From 0303d5de029aa6940f0873fe9aa07297b70a6cbb Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Thu, 28 Feb 2019 16:41:01 -0800 Subject: [PATCH 43/66] configs/frags: use default compiler, JLEVEL=0 --- configs/frags/base.config | 6 +++--- configs/frags/x86.config | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/configs/frags/base.config b/configs/frags/base.config index 3e56dfb8a971..5959367db638 100644 --- a/configs/frags/base.config +++ b/configs/frags/base.config @@ -1,3 +1,6 @@ +# auto-select j-level based on host CPUs +BR2_JLEVEL=0 + # enable overlay support (used for custom init scripts) BR2_ROOTFS_OVERLAY="overlay" @@ -32,9 +35,6 @@ BR2_PACKAGE_PCIUTILS=y # NOTE: arm64 only exists as of v3.10 BR2_KERNEL_HEADERS_3_18=y -# ensure older compiler support (needed?) -BR2_TOOLCHAIN_GCC_AT_LEAST_4_8=y - # purge locales to reduce rootfs size BR2_ENABLE_LOCALE_PURGE=y BR2_ENABLE_LOCALE_WHITELIST="C en_US" diff --git a/configs/frags/x86.config b/configs/frags/x86.config index bb23e46500a2..c4a962df3276 100644 --- a/configs/frags/x86.config +++ b/configs/frags/x86.config @@ -1,4 +1,2 @@ BR2_TOOLCHAIN_BUILDROOT=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y - -BR2_GCC_VERSION_4_9_X=y From b5ce9ad78d6f7b46edf348c70117569c354585b6 Mon Sep 17 00:00:00 2001 From: Guillaume Tucker Date: Mon, 3 Jun 2019 14:41:54 +0100 Subject: [PATCH 44/66] Add bootrr package from KernelCI's Github fork Add a bootrr package built using KernelCI's Github fork. Signed-off-by: Guillaume Tucker --- package/Config.in | 1 + package/bootrr/Config.in | 4 ++++ package/bootrr/bootrr.hash | 2 ++ package/bootrr/bootrr.mk | 16 ++++++++++++++++ 4 files changed, 23 insertions(+) create mode 100644 package/bootrr/Config.in create mode 100644 package/bootrr/bootrr.hash create mode 100644 package/bootrr/bootrr.mk diff --git a/package/Config.in b/package/Config.in index 85d73263614f..eabc9f6af891 100644 --- a/package/Config.in +++ b/package/Config.in @@ -86,6 +86,7 @@ endmenu menu "Debugging, profiling and benchmark" source "package/blktrace/Config.in" source "package/bonnie/Config.in" + source "package/bootrr/Config.in" source "package/cache-calibrator/Config.in" source "package/clinfo/Config.in" source "package/dacapo/Config.in" diff --git a/package/bootrr/Config.in b/package/bootrr/Config.in new file mode 100644 index 000000000000..c2d7852f0806 --- /dev/null +++ b/package/bootrr/Config.in @@ -0,0 +1,4 @@ +config BR2_PACKAGE_BOOTRR + bool "bootrr" + help + The bootrr test scripts. diff --git a/package/bootrr/bootrr.hash b/package/bootrr/bootrr.hash new file mode 100644 index 000000000000..0ec9a768b84d --- /dev/null +++ b/package/bootrr/bootrr.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 60309b885873b9a8fefb7d42b7475c6cd70ea1e0982143b433dd934563ebbb69 bootrr-ea2a0f215327f99f90227a382bbdf2c6abe763f6.tar.gz diff --git a/package/bootrr/bootrr.mk b/package/bootrr/bootrr.mk new file mode 100644 index 000000000000..de28232129b4 --- /dev/null +++ b/package/bootrr/bootrr.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# bootrr +# +################################################################################ + +BOOTRR_SITE = https://github.com/kernelci/bootrr.git +BOOTRR_VERSION = ea2a0f215327f99f90227a382bbdf2c6abe763f6 +BOOTRR_SITE_METHOD = git +BOOTRR_LICENSE = LGPL-2.1+ + +define BOOTRR_INSTALL_TARGET_CMDS + DESTDIR=$(TARGET_DIR)/opt/bootrr $(MAKE) -C $(@D) install +endef + +$(eval $(generic-package)) From 015d2cee9e745fb113aac0f3e3569d993690b697 Mon Sep 17 00:00:00 2001 From: Guillaume Tucker Date: Mon, 3 Jun 2019 14:43:13 +0100 Subject: [PATCH 45/66] configs/frags: add baseline.config Add a baseline.config fragment for the KernelCI baseline test plan which uses bootrr. Signed-off-by: Guillaume Tucker --- configs/frags/baseline.config | 1 + 1 file changed, 1 insertion(+) create mode 100644 configs/frags/baseline.config diff --git a/configs/frags/baseline.config b/configs/frags/baseline.config new file mode 100644 index 000000000000..efdac4412287 --- /dev/null +++ b/configs/frags/baseline.config @@ -0,0 +1 @@ +BR2_PACKAGE_BOOTRR=y From 0e76239ce9bc6be3d6cd22b6f5a074ba34c9f3e3 Mon Sep 17 00:00:00 2001 From: Guillaume Tucker Date: Wed, 4 Sep 2019 23:50:03 +0100 Subject: [PATCH 46/66] util-linux: add util-linux-dmesg to only build dmesg Add a util-linux-dmesg package to only build dmesg from util-linux. This is to optimize for size, since there is no granularity in the standard util-linux package configuration to only select some binaries. The UTIL_LINUX_DMESG configuration for this package is mutually exclusive with UTIL_LINUX_BINARIES to not have it built twice. Signed-off-by: Guillaume Tucker --- package/Config.in | 1 + package/util-linux-dmesg/Config.in | 5 +++ .../util-linux-dmesg/util-linux-dmesg.hash | 9 ++++ package/util-linux-dmesg/util-linux-dmesg.mk | 42 +++++++++++++++++++ package/util-linux/Config.in | 1 + 5 files changed, 58 insertions(+) create mode 100644 package/util-linux-dmesg/Config.in create mode 100644 package/util-linux-dmesg/util-linux-dmesg.hash create mode 100644 package/util-linux-dmesg/util-linux-dmesg.mk diff --git a/package/Config.in b/package/Config.in index eabc9f6af891..9d09f0fd0b5c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2400,6 +2400,7 @@ menu "System tools" source "package/tpm2-totp/Config.in" source "package/unscd/Config.in" source "package/util-linux/Config.in" + source "package/util-linux-dmesg/Config.in" source "package/xdg-dbus-proxy/Config.in" source "package/xen/Config.in" source "package/xvisor/Config.in" diff --git a/package/util-linux-dmesg/Config.in b/package/util-linux-dmesg/Config.in new file mode 100644 index 000000000000..59c05b9a5827 --- /dev/null +++ b/package/util-linux-dmesg/Config.in @@ -0,0 +1,5 @@ +config BR2_PACKAGE_UTIL_LINUX_DMESG + bool "util-linux-dmesg" + depends on !BR2_PACKAGE_UTIL_LINUX_BINARIES + help + The dmesg utility from util-linux. diff --git a/package/util-linux-dmesg/util-linux-dmesg.hash b/package/util-linux-dmesg/util-linux-dmesg.hash new file mode 100644 index 000000000000..ed503a12ed6b --- /dev/null +++ b/package/util-linux-dmesg/util-linux-dmesg.hash @@ -0,0 +1,9 @@ +# From https://www.kernel.org/pub/linux/utils/util-linux/v2.33/sha256sums.asc +sha256 f261b9d73c35bfeeea04d26941ac47ee1df937bd3b0583e748217c1ea423658a util-linux-2.33.tar.xz +# License files, locally calculated +sha256 4335620e8f478ee4dc4d26540448d39469091ef1d8e3fbbbb8bf753206ceac74 README.licensing +sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause +sha256 ba7640f00d93e72e92b94b9d71f25ec53bac2f1682f5c4adcccb0018359f60f8 Documentation/licenses/COPYING.BSD-4-Clause-UC +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/licenses/COPYING.GPL-2.0-or-later +sha256 e53348ce276358e9997014071c5294b36a18c4b34f32f00ee57b9acce0aafd63 Documentation/licenses/COPYING.ISC +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 Documentation/licenses/COPYING.LGPL-2.1-or-later diff --git a/package/util-linux-dmesg/util-linux-dmesg.mk b/package/util-linux-dmesg/util-linux-dmesg.mk new file mode 100644 index 000000000000..53c0cb3d3e6d --- /dev/null +++ b/package/util-linux-dmesg/util-linux-dmesg.mk @@ -0,0 +1,42 @@ +################################################################################ +# +# util-linux +# +################################################################################ + +UTIL_LINUX_DMESG_VERSION_MAJOR = 2.33 +UTIL_LINUX_DMESG_VERSION = $(UTIL_LINUX_DMESG_VERSION_MAJOR) +UTIL_LINUX_DMESG_SOURCE = util-linux-$(UTIL_LINUX_DMESG_VERSION).tar.xz +UTIL_LINUX_DMESG_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_DMESG_VERSION_MAJOR) + +UTIL_LINUX_DMESG_CONF_OPTS += \ + --without-systemd \ + --disable-rpath \ + --disable-makeinstall-chown \ + +ifeq ($(BR2_PACKAGE_READLINE),y) +UTIL_LINUX_DMESG_CONF_OPTS += --with-readline +UTIL_LINUX_DMESG_LIBS += $(if $(BR2_STATIC_LIBS),-lcurses) +UTIL_LINUX_DMESG_DEPENDENCIES += readline +else +UTIL_LINUX_DMESG_CONF_OPTS += --without-readline +endif + +define UTIL_LINUX_DMESG_BUILD_CMDS + cd $(@D); \ + ./autogen.sh; \ + $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ + $(UTIL_LINUX_DMESG_CONF_ENV) \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME); \ + $(TARGET_MAKE_ENV) $(MAKE) dmesg +endef + +define UTIL_LINUX_DMESG_INSTALL_TARGET_CMDS + install -m0755 $(@D)/dmesg $(TARGET_DIR)/bin/dmesg +endef + +$(eval $(generic-package)) diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index aa3c1a5f76b4..57aa2e8093c4 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -44,6 +44,7 @@ config BR2_PACKAGE_UTIL_LINUX_LIBUUID config BR2_PACKAGE_UTIL_LINUX_BINARIES bool "basic set" depends on BR2_USE_MMU # fork() + depends on !BR2_PACKAGE_UTIL_LINUX_DMESG select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_UTIL_LINUX_LIBFDISK From cd7a624394b273c53af647484c919e89deb91821 Mon Sep 17 00:00:00 2001 From: Guillaume Tucker Date: Thu, 5 Sep 2019 14:13:21 +0100 Subject: [PATCH 47/66] busybox: add busybox-no-dmesg.config fragment Add busybox fragment to disable dmesg. This is to then be able to use an other dmesg implementation such as the one from util-linux. Signed-off-by: Guillaume Tucker --- package/busybox/busybox-no-dmesg.config | 1 + 1 file changed, 1 insertion(+) create mode 100644 package/busybox/busybox-no-dmesg.config diff --git a/package/busybox/busybox-no-dmesg.config b/package/busybox/busybox-no-dmesg.config new file mode 100644 index 000000000000..a3d060e65525 --- /dev/null +++ b/package/busybox/busybox-no-dmesg.config @@ -0,0 +1 @@ +# CONFIG_DMESG is not set From b0a080b4f909a71fff7e8c60dbba48500fde3e16 Mon Sep 17 00:00:00 2001 From: Guillaume Tucker Date: Wed, 4 Sep 2019 23:51:11 +0100 Subject: [PATCH 48/66] baseline.config: enable use dmesg from util-linux Enable BR2_PACKAGE_UTIL_LINUX_DMESG and use the busybox fragment to disable dmesg to use the one from util-linux instead with standard implementation of all the command line options. Signed-off-by: Guillaume Tucker --- configs/frags/baseline.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/frags/baseline.config b/configs/frags/baseline.config index efdac4412287..1431c5c95516 100644 --- a/configs/frags/baseline.config +++ b/configs/frags/baseline.config @@ -1 +1,3 @@ BR2_PACKAGE_BOOTRR=y +BR2_PACKAGE_UTIL_LINUX_DMESG=y +BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="package/busybox/busybox-no-dmesg.config" From 1feab01744c5316647ec8af3e7854549c7272f56 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Wed, 25 Sep 2019 10:20:04 -0700 Subject: [PATCH 49/66] busybox: enable tar gzip support Need gzip support in tar to support LAVA transfer_overlay feature, where the target must fetch and unpack .tar.gz archive from the lava-worker. Signed-off-by: Kevin Hilman --- package/busybox/busybox.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index 2312e24da8df..2f09314a3251 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -131,7 +131,7 @@ CONFIG_FEATURE_HWIB=y # CONFIG_FEATURE_SEAMLESS_XZ is not set # CONFIG_FEATURE_SEAMLESS_LZMA is not set # CONFIG_FEATURE_SEAMLESS_BZ2 is not set -# CONFIG_FEATURE_SEAMLESS_GZ is not set +CONFIG_FEATURE_SEAMLESS_GZ=y # CONFIG_FEATURE_SEAMLESS_Z is not set CONFIG_AR=y # CONFIG_FEATURE_AR_LONG_FILENAMES is not set From 0a67b4daf15dd5acf9d5cbffa8176554b7e719e0 Mon Sep 17 00:00:00 2001 From: Guillaume Tucker Date: Fri, 6 Mar 2020 06:57:46 +0000 Subject: [PATCH 50/66] bootrr: upgrade to current master head 5ba7f37eeac5 Upgrade the version of bootrr to the latest reivision on the master branch of the kernelci fork. This includes some fixes for cros-ec tests on some Chromebook devices and adds helpers to check the kernel revision. Signed-off-by: Guillaume Tucker --- package/bootrr/bootrr.hash | 2 +- package/bootrr/bootrr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bootrr/bootrr.hash b/package/bootrr/bootrr.hash index 0ec9a768b84d..295b1b04b520 100644 --- a/package/bootrr/bootrr.hash +++ b/package/bootrr/bootrr.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 60309b885873b9a8fefb7d42b7475c6cd70ea1e0982143b433dd934563ebbb69 bootrr-ea2a0f215327f99f90227a382bbdf2c6abe763f6.tar.gz +sha256 bb8c1b534c741f6cfa0f71338c1c72f555b5f98449485ec95fb6a0bd0f6210bd bootrr-5ba7f37eeac503ef9b5cba4a1060990384d5c32c.tar.gz diff --git a/package/bootrr/bootrr.mk b/package/bootrr/bootrr.mk index de28232129b4..cf983434d0cd 100644 --- a/package/bootrr/bootrr.mk +++ b/package/bootrr/bootrr.mk @@ -5,7 +5,7 @@ ################################################################################ BOOTRR_SITE = https://github.com/kernelci/bootrr.git -BOOTRR_VERSION = ea2a0f215327f99f90227a382bbdf2c6abe763f6 +BOOTRR_VERSION = 5ba7f37eeac503ef9b5cba4a1060990384d5c32c BOOTRR_SITE_METHOD = git BOOTRR_LICENSE = LGPL-2.1+ From 0dfbe84e102a46528e6dc6171d73ee95d8b42200 Mon Sep 17 00:00:00 2001 From: Guillaume Tucker Date: Mon, 13 Apr 2020 13:07:06 +0100 Subject: [PATCH 51/66] baseline: add rootfs_overlay with dmesg.sh Add rootfs_overlay directory structure with dmesg.sh and enable it in baseline.config. This is to have the dmesg.sh script directly in the baseline ramdisk and be able to call it directly in KernelCI jobs. Signed-off-by: Guillaume Tucker --- configs/frags/baseline.config | 1 + .../rootfs_overlay/opt/kernelci/dmesg.sh | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100755 kernelci/baseline/rootfs_overlay/opt/kernelci/dmesg.sh diff --git a/configs/frags/baseline.config b/configs/frags/baseline.config index 1431c5c95516..6c57104f43f6 100644 --- a/configs/frags/baseline.config +++ b/configs/frags/baseline.config @@ -1,3 +1,4 @@ BR2_PACKAGE_BOOTRR=y BR2_PACKAGE_UTIL_LINUX_DMESG=y BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="package/busybox/busybox-no-dmesg.config" +BR2_ROOTFS_OVERLAY="kernelci/baseline/rootfs_overlay/" diff --git a/kernelci/baseline/rootfs_overlay/opt/kernelci/dmesg.sh b/kernelci/baseline/rootfs_overlay/opt/kernelci/dmesg.sh new file mode 100755 index 000000000000..3b096e107dae --- /dev/null +++ b/kernelci/baseline/rootfs_overlay/opt/kernelci/dmesg.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +set -e + +if [ "$KERNELCI_LAVA" = "y" ]; then + alias test-result='lava-test-case' +else + alias test-result='echo' +fi + +for level in crit alert emerg; do + dmesg --level=$level --notime -x -k > dmesg.$level + test -s dmesg.$level && res=fail || res=pass + count=$(cat dmesg.$level | wc -l) + cat dmesg.$level + test-result \ + $level \ + --result $res \ + --measurement $count \ + --units lines +done + +exit 0 From c87906cbc1a8e4bbf3bc3b6bc6a8d7243c7716dd Mon Sep 17 00:00:00 2001 From: Guillaume Tucker Date: Fri, 1 May 2020 13:54:51 +0100 Subject: [PATCH 52/66] baseline: also include base overlay The baseline config adds a new rootfs overlay, but it should also include the base overlay. Fix this by having the path for both overlays in the baseline fragment. Fixes: 24600c76ce51 ("baseline: add rootfs_overlay with dmesg.sh") Signed-off-by: Guillaume Tucker --- configs/frags/baseline.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/frags/baseline.config b/configs/frags/baseline.config index 6c57104f43f6..d856714664ce 100644 --- a/configs/frags/baseline.config +++ b/configs/frags/baseline.config @@ -1,4 +1,4 @@ BR2_PACKAGE_BOOTRR=y BR2_PACKAGE_UTIL_LINUX_DMESG=y BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="package/busybox/busybox-no-dmesg.config" -BR2_ROOTFS_OVERLAY="kernelci/baseline/rootfs_overlay/" +BR2_ROOTFS_OVERLAY="overlay kernelci/baseline/rootfs_overlay/" From 439869bbb7309945368334805baceed137c736a9 Mon Sep 17 00:00:00 2001 From: Guillaume Tucker Date: Wed, 20 May 2020 22:44:40 +0100 Subject: [PATCH 53/66] bootrr: upgrade to fix kernel version helpers install Upgrade bootrr to the latest revision from the kernelci fork. This includes a fix to install the kernel version helpers used in tests that are version-specific. Signed-off-by: Guillaume Tucker --- package/bootrr/bootrr.hash | 2 +- package/bootrr/bootrr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bootrr/bootrr.hash b/package/bootrr/bootrr.hash index 295b1b04b520..fd13214313a5 100644 --- a/package/bootrr/bootrr.hash +++ b/package/bootrr/bootrr.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 bb8c1b534c741f6cfa0f71338c1c72f555b5f98449485ec95fb6a0bd0f6210bd bootrr-5ba7f37eeac503ef9b5cba4a1060990384d5c32c.tar.gz +sha256 f125029bff0cc659b9073b993c710a14994d9cd46de9b29ea5d205b6b1997173 bootrr-e0a316de59153ecd4373b14063b0280505ce6e2e.tar.gz diff --git a/package/bootrr/bootrr.mk b/package/bootrr/bootrr.mk index cf983434d0cd..4ce857ab960e 100644 --- a/package/bootrr/bootrr.mk +++ b/package/bootrr/bootrr.mk @@ -5,7 +5,7 @@ ################################################################################ BOOTRR_SITE = https://github.com/kernelci/bootrr.git -BOOTRR_VERSION = 5ba7f37eeac503ef9b5cba4a1060990384d5c32c +BOOTRR_VERSION = e0a316de59153ecd4373b14063b0280505ce6e2e BOOTRR_SITE_METHOD = git BOOTRR_LICENSE = LGPL-2.1+ From 5d06ce715b0342f7a15d2e4ca3ac0d638456c64b Mon Sep 17 00:00:00 2001 From: Guillaume Tucker Date: Fri, 25 Sep 2020 11:49:55 +0100 Subject: [PATCH 54/66] bootrr: upgrade with support for ACPI and new devices Upgrade bootrr to kernelci-20200925 which adds support for determining the platform name on ACPI devices, and test scripts for the "hana" and "grunt" Chromebooks. Signed-off-by: Guillaume Tucker --- package/bootrr/bootrr.hash | 2 +- package/bootrr/bootrr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bootrr/bootrr.hash b/package/bootrr/bootrr.hash index fd13214313a5..0b272305d8aa 100644 --- a/package/bootrr/bootrr.hash +++ b/package/bootrr/bootrr.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f125029bff0cc659b9073b993c710a14994d9cd46de9b29ea5d205b6b1997173 bootrr-e0a316de59153ecd4373b14063b0280505ce6e2e.tar.gz +sha256 ab4e26ea846c0d99dd3008c491e0f56fc0fa91d0871fb54d1a9f97b212d480a2 bootrr-fdd52e16572ec16811a1303f4d781d9ba4195f07.tar.gz diff --git a/package/bootrr/bootrr.mk b/package/bootrr/bootrr.mk index 4ce857ab960e..c3c8fcebb6b3 100644 --- a/package/bootrr/bootrr.mk +++ b/package/bootrr/bootrr.mk @@ -5,7 +5,7 @@ ################################################################################ BOOTRR_SITE = https://github.com/kernelci/bootrr.git -BOOTRR_VERSION = e0a316de59153ecd4373b14063b0280505ce6e2e +BOOTRR_VERSION = fdd52e16572ec16811a1303f4d781d9ba4195f07 # kernelci-20200925 BOOTRR_SITE_METHOD = git BOOTRR_LICENSE = LGPL-2.1+ From 61393d2796146b318b32b4a1969400ef2197b73a Mon Sep 17 00:00:00 2001 From: Guillaume Tucker Date: Fri, 25 Sep 2020 21:31:41 +0100 Subject: [PATCH 55/66] bootrr: fix updated revision with kernelci-20200925.1 The previous commit was using a revision from the main branch whereas the PRs to add the scripts were merged on staging.kernelci.org, so they were not included. This has now been fixed in the bootrr repository, so update the revision again. Fixes: 5d06ce715b03 ("bootrr: upgrade with support for ACPI and new devices") Signed-off-by: Guillaume Tucker --- package/bootrr/bootrr.hash | 2 +- package/bootrr/bootrr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bootrr/bootrr.hash b/package/bootrr/bootrr.hash index 0b272305d8aa..75b76d18386d 100644 --- a/package/bootrr/bootrr.hash +++ b/package/bootrr/bootrr.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ab4e26ea846c0d99dd3008c491e0f56fc0fa91d0871fb54d1a9f97b212d480a2 bootrr-fdd52e16572ec16811a1303f4d781d9ba4195f07.tar.gz +sha256 2b711a75986b0ee981c3fb9433fa5b961c1f0a85fedcec9e744becd431a4bc4c bootrr-809288b2a1f9530e44ed7ae306fb76908427cfbc.tar.gz diff --git a/package/bootrr/bootrr.mk b/package/bootrr/bootrr.mk index c3c8fcebb6b3..ec8ff8a79baa 100644 --- a/package/bootrr/bootrr.mk +++ b/package/bootrr/bootrr.mk @@ -5,7 +5,7 @@ ################################################################################ BOOTRR_SITE = https://github.com/kernelci/bootrr.git -BOOTRR_VERSION = fdd52e16572ec16811a1303f4d781d9ba4195f07 # kernelci-20200925 +BOOTRR_VERSION = 809288b2a1f9530e44ed7ae306fb76908427cfbc BOOTRR_SITE_METHOD = git BOOTRR_LICENSE = LGPL-2.1+ From 27eeeac7da2dd3b975069509119cf39dd2efd4f9 Mon Sep 17 00:00:00 2001 From: Guillaume Tucker Date: Fri, 2 Oct 2020 11:11:52 +0100 Subject: [PATCH 56/66] bootrr: upgrade again with fix to install new board files Upgrade the version of bootrr again to match kernelci-20201002 which has a fix to install the newly board files. Signed-off-by: Guillaume Tucker --- package/bootrr/bootrr.hash | 2 +- package/bootrr/bootrr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bootrr/bootrr.hash b/package/bootrr/bootrr.hash index 75b76d18386d..5e4f7c07535c 100644 --- a/package/bootrr/bootrr.hash +++ b/package/bootrr/bootrr.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2b711a75986b0ee981c3fb9433fa5b961c1f0a85fedcec9e744becd431a4bc4c bootrr-809288b2a1f9530e44ed7ae306fb76908427cfbc.tar.gz +sha256 265d4e1fa8d7ac85d8e6429e827fee56520119d4eafe3230e1ccf3612b59dc96 bootrr-9c0eff7b2c382690e56156dcec08c29cadb86914.tar.gz diff --git a/package/bootrr/bootrr.mk b/package/bootrr/bootrr.mk index ec8ff8a79baa..21aa8940b715 100644 --- a/package/bootrr/bootrr.mk +++ b/package/bootrr/bootrr.mk @@ -5,7 +5,7 @@ ################################################################################ BOOTRR_SITE = https://github.com/kernelci/bootrr.git -BOOTRR_VERSION = 809288b2a1f9530e44ed7ae306fb76908427cfbc +BOOTRR_VERSION = 9c0eff7b2c382690e56156dcec08c29cadb86914 BOOTRR_SITE_METHOD = git BOOTRR_LICENSE = LGPL-2.1+ From 97706c5d95673a21c3b14be83336d7f3448bcd4d Mon Sep 17 00:00:00 2001 From: Guillaume Tucker Date: Tue, 20 Oct 2020 00:06:04 +0100 Subject: [PATCH 57/66] bootrr: upgrade with fix for kernel version on google,kevin Upgrade to kernelci-20201020 which has a fix for checking the kernel version on google,kevin. This used to cause some false positive failures because the version check was done with v5.4 rather than v5.5, when a driver used on the google,kevin platform got renamed. Signed-off-by: Guillaume Tucker --- package/bootrr/bootrr.hash | 2 +- package/bootrr/bootrr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bootrr/bootrr.hash b/package/bootrr/bootrr.hash index 5e4f7c07535c..3ffd99d48ad9 100644 --- a/package/bootrr/bootrr.hash +++ b/package/bootrr/bootrr.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 265d4e1fa8d7ac85d8e6429e827fee56520119d4eafe3230e1ccf3612b59dc96 bootrr-9c0eff7b2c382690e56156dcec08c29cadb86914.tar.gz +sha256 ac78474489bb1a922b5cdd81c7d45ee32d07e1a4b3b44b9628f347d81575e0f2 bootrr-190921182ef98da0ff9028beff5beb367a6c26d9.tar.gz diff --git a/package/bootrr/bootrr.mk b/package/bootrr/bootrr.mk index 21aa8940b715..a4a321765c4c 100644 --- a/package/bootrr/bootrr.mk +++ b/package/bootrr/bootrr.mk @@ -5,7 +5,7 @@ ################################################################################ BOOTRR_SITE = https://github.com/kernelci/bootrr.git -BOOTRR_VERSION = 9c0eff7b2c382690e56156dcec08c29cadb86914 +BOOTRR_VERSION = 190921182ef98da0ff9028beff5beb367a6c26d9 BOOTRR_SITE_METHOD = git BOOTRR_LICENSE = LGPL-2.1+ From 2f114cc7102b436e386f990bef1abeff8390086c Mon Sep 17 00:00:00 2001 From: Guillaume Tucker Date: Tue, 23 Mar 2021 22:17:56 +0000 Subject: [PATCH 58/66] bootrr: upgrade with scripts for kontron sl28 boards Upgrade to the latest kernelci bootrr version with extra scripts to cover Kontron sl28 boards. Signed-off-by: Guillaume Tucker --- package/bootrr/bootrr.hash | 2 +- package/bootrr/bootrr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bootrr/bootrr.hash b/package/bootrr/bootrr.hash index 3ffd99d48ad9..9d48515bbfe1 100644 --- a/package/bootrr/bootrr.hash +++ b/package/bootrr/bootrr.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ac78474489bb1a922b5cdd81c7d45ee32d07e1a4b3b44b9628f347d81575e0f2 bootrr-190921182ef98da0ff9028beff5beb367a6c26d9.tar.gz +sha256 98d553c439064dd32043f3f74d56f7b0daced2307993751c72a1dead605561c0 bootrr-f15e3f8b13254bcf586130b2603f1bdddfcf630d.tar.gz diff --git a/package/bootrr/bootrr.mk b/package/bootrr/bootrr.mk index a4a321765c4c..e10abbc237ff 100644 --- a/package/bootrr/bootrr.mk +++ b/package/bootrr/bootrr.mk @@ -5,7 +5,7 @@ ################################################################################ BOOTRR_SITE = https://github.com/kernelci/bootrr.git -BOOTRR_VERSION = 190921182ef98da0ff9028beff5beb367a6c26d9 +BOOTRR_VERSION = f15e3f8b13254bcf586130b2603f1bdddfcf630d BOOTRR_SITE_METHOD = git BOOTRR_LICENSE = LGPL-2.1+ From 8983f3b738df4876707c9b4d383ab0a8a31fb38e Mon Sep 17 00:00:00 2001 From: Michal Galka Date: Fri, 25 Jun 2021 08:50:28 +0200 Subject: [PATCH 59/66] Update bootrr commit id bootrr: Include bootrr tests for online cpus in production builds. Signed-off-by: Michal Galka --- package/bootrr/bootrr.hash | 2 +- package/bootrr/bootrr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bootrr/bootrr.hash b/package/bootrr/bootrr.hash index 9d48515bbfe1..cab8fecdbecc 100644 --- a/package/bootrr/bootrr.hash +++ b/package/bootrr/bootrr.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 98d553c439064dd32043f3f74d56f7b0daced2307993751c72a1dead605561c0 bootrr-f15e3f8b13254bcf586130b2603f1bdddfcf630d.tar.gz +sha256 e94dede73040fd08f418f51615aa8d4272c67b433c77a27226024715a97e7b22 bootrr-35d4023f4a53374b5985432ed1f57893665da024.tar.gz diff --git a/package/bootrr/bootrr.mk b/package/bootrr/bootrr.mk index e10abbc237ff..a328df9d9db1 100644 --- a/package/bootrr/bootrr.mk +++ b/package/bootrr/bootrr.mk @@ -5,7 +5,7 @@ ################################################################################ BOOTRR_SITE = https://github.com/kernelci/bootrr.git -BOOTRR_VERSION = f15e3f8b13254bcf586130b2603f1bdddfcf630d +BOOTRR_VERSION = 35d4023f4a53374b5985432ed1f57893665da024 BOOTRR_SITE_METHOD = git BOOTRR_LICENSE = LGPL-2.1+ From e82568c5a7f7e59fb6edbc01eafd90ff91223447 Mon Sep 17 00:00:00 2001 From: Adrian Ratiu Date: Mon, 11 Oct 2021 21:09:50 +0300 Subject: [PATCH 60/66] baseline: add tpm2-tools bootrr dependency Starting with PR #12, bootrr will depend on tpm2-tools to run some TPM chip sanity checks on boot, so we need to make this dependency explicit and for safety also enable it directly in the baseline config fragment. [1] https://github.com/kernelci/bootrr/pull/12 Signed-off-by: Adrian Ratiu --- configs/frags/baseline.config | 1 + package/bootrr/Config.in | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/frags/baseline.config b/configs/frags/baseline.config index d856714664ce..182e489722cd 100644 --- a/configs/frags/baseline.config +++ b/configs/frags/baseline.config @@ -1,4 +1,5 @@ BR2_PACKAGE_BOOTRR=y +BR2_PACKAGE_TPM2_TOOLS=y BR2_PACKAGE_UTIL_LINUX_DMESG=y BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="package/busybox/busybox-no-dmesg.config" BR2_ROOTFS_OVERLAY="overlay kernelci/baseline/rootfs_overlay/" diff --git a/package/bootrr/Config.in b/package/bootrr/Config.in index c2d7852f0806..6baca4411865 100644 --- a/package/bootrr/Config.in +++ b/package/bootrr/Config.in @@ -1,4 +1,5 @@ config BR2_PACKAGE_BOOTRR bool "bootrr" + depends on BR2_PACKAGE_TPM2_TOOLS help The bootrr test scripts. From f6c62205f0b9e4e47d8ccb406217e69a7eb2c76a Mon Sep 17 00:00:00 2001 From: Guillaume Tucker Date: Fri, 11 Feb 2022 22:29:55 +0000 Subject: [PATCH 61/66] Update bootrr commit id This new revision includes some TPM tests which can be run now that the required dependencies have been added to the baseline fragment. It could also have been done by defining dependencies in the bootrr package, but it may not be required to have those tools when not running the TPM tests. Signed-off-by: Guillaume Tucker --- package/bootrr/bootrr.hash | 2 +- package/bootrr/bootrr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bootrr/bootrr.hash b/package/bootrr/bootrr.hash index cab8fecdbecc..0a64be8ee076 100644 --- a/package/bootrr/bootrr.hash +++ b/package/bootrr/bootrr.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 e94dede73040fd08f418f51615aa8d4272c67b433c77a27226024715a97e7b22 bootrr-35d4023f4a53374b5985432ed1f57893665da024.tar.gz +sha256 5f6b4f0cf0814b2a44bc02f60f00bd33fe958947c3e19c11167071647e9336f6 bootrr-eb40eaeda023fbf313a25165887b3338ff73c93b.tar.gz diff --git a/package/bootrr/bootrr.mk b/package/bootrr/bootrr.mk index a328df9d9db1..9bcffcfbd8a3 100644 --- a/package/bootrr/bootrr.mk +++ b/package/bootrr/bootrr.mk @@ -5,7 +5,7 @@ ################################################################################ BOOTRR_SITE = https://github.com/kernelci/bootrr.git -BOOTRR_VERSION = 35d4023f4a53374b5985432ed1f57893665da024 +BOOTRR_VERSION = eb40eaeda023fbf313a25165887b3338ff73c93b BOOTRR_SITE_METHOD = git BOOTRR_LICENSE = LGPL-2.1+ From bd0151019e8799f873d3c9fd7ca0a6ce63d7d27f Mon Sep 17 00:00:00 2001 From: Corentin Labbe Date: Tue, 31 Aug 2021 11:26:32 +0000 Subject: [PATCH 62/66] Copy buildroot config with other artifacts For debugging, it is helpfull to have final config along with rootfs. So after build let's copy buildroot config. Signed-off-by: Corentin Labbe --- configs/frags/build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/frags/build b/configs/frags/build index ea007db62da0..f679f89d89fd 100755 --- a/configs/frags/build +++ b/configs/frags/build @@ -41,3 +41,5 @@ if [ $? = 0 ]; then tar -C output/host -Jcf output/images/host.tar.xz . (cd output/images; md5sum host.tar.xz > host.tar.xz.md5) fi + +cp .config output/images/config From 2a7cc29a2cb0316b5c89df5918ecbfa7900d0353 Mon Sep 17 00:00:00 2001 From: Guillaume Tucker Date: Wed, 23 Mar 2022 07:47:29 +0000 Subject: [PATCH 63/66] bootrr: update revision to kernelci-20220323 Update bootrr revision to kernelci-20220323 with extra test cases for imx8mm-kontron-n801x-s and sl28. Signed-off-by: Guillaume Tucker --- package/bootrr/bootrr.hash | 2 +- package/bootrr/bootrr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bootrr/bootrr.hash b/package/bootrr/bootrr.hash index 0a64be8ee076..c37b254fe456 100644 --- a/package/bootrr/bootrr.hash +++ b/package/bootrr/bootrr.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5f6b4f0cf0814b2a44bc02f60f00bd33fe958947c3e19c11167071647e9336f6 bootrr-eb40eaeda023fbf313a25165887b3338ff73c93b.tar.gz +sha256 c6805bb4ddfb451944c00e6272ea46899da01da699a36c3e86fce25e0a8420fb bootrr-86ee73737f2e03c858b5ab57b890664edf5a23b3.tar.gz diff --git a/package/bootrr/bootrr.mk b/package/bootrr/bootrr.mk index 9bcffcfbd8a3..cd9b7ea2ad29 100644 --- a/package/bootrr/bootrr.mk +++ b/package/bootrr/bootrr.mk @@ -5,7 +5,7 @@ ################################################################################ BOOTRR_SITE = https://github.com/kernelci/bootrr.git -BOOTRR_VERSION = eb40eaeda023fbf313a25165887b3338ff73c93b +BOOTRR_VERSION = 86ee73737f2e03c858b5ab57b890664edf5a23b3 BOOTRR_SITE_METHOD = git BOOTRR_LICENSE = LGPL-2.1+ From 3cf7c48e9b35e5ef4fba1096f1cfc9c8d45494e4 Mon Sep 17 00:00:00 2001 From: Corentin Labbe Date: Tue, 27 Jul 2021 18:19:18 +0000 Subject: [PATCH 64/66] kernelci need UDEV for LAVA test disk LAVA mount test disk via /dev/disk/by-uuid/$UUID. Thoses links are created by UDEV. Nearly all BR arches have UDEV by default, but mips dont and so test disk are not mounted when doing qemu+mips. Signed-off-by: Corentin Labbe --- configs/frags/base.config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/frags/base.config b/configs/frags/base.config index 5959367db638..bfa4240b6967 100644 --- a/configs/frags/base.config +++ b/configs/frags/base.config @@ -41,3 +41,7 @@ BR2_ENABLE_LOCALE_WHITELIST="C en_US" # fs utils BR2_PACKAGE_E2FSPROGS=y + +# udev needed for generating /dev/disk/by-uuid +BR2_TOOLCHAIN_BUILDROOT_WCHAR=y +BR2_PACKAGE_EUDEV=y From e8ba3f669c8e7bce993e34e32204983cf9a2d2cc Mon Sep 17 00:00:00 2001 From: Guillaume Tucker Date: Fri, 10 Jun 2022 07:18:31 +0100 Subject: [PATCH 65/66] bootrr: update revision to kernelci-20220610 Update bootrr with added tests for the Kontron KSwitch D10 MMT boards. Signed-off-by: Guillaume Tucker --- package/bootrr/bootrr.hash | 2 +- package/bootrr/bootrr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bootrr/bootrr.hash b/package/bootrr/bootrr.hash index c37b254fe456..1800b6d2997f 100644 --- a/package/bootrr/bootrr.hash +++ b/package/bootrr/bootrr.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c6805bb4ddfb451944c00e6272ea46899da01da699a36c3e86fce25e0a8420fb bootrr-86ee73737f2e03c858b5ab57b890664edf5a23b3.tar.gz +sha256 03336f34a6434da109ec1cd438b3752b78009a2969c3b04c2c5f152351c1ef76 bootrr-f00862c8406f81ef62449b5c0267e010e3be3d3f.tar.gz diff --git a/package/bootrr/bootrr.mk b/package/bootrr/bootrr.mk index cd9b7ea2ad29..d4e8ad944773 100644 --- a/package/bootrr/bootrr.mk +++ b/package/bootrr/bootrr.mk @@ -5,7 +5,7 @@ ################################################################################ BOOTRR_SITE = https://github.com/kernelci/bootrr.git -BOOTRR_VERSION = 86ee73737f2e03c858b5ab57b890664edf5a23b3 +BOOTRR_VERSION = f00862c8406f81ef62449b5c0267e010e3be3d3f BOOTRR_SITE_METHOD = git BOOTRR_LICENSE = LGPL-2.1+ From 9f058f7ce856c69c205c702abecb330ec547a1dd Mon Sep 17 00:00:00 2001 From: Jan Luebbe Date: Fri, 26 Aug 2022 09:09:20 +0200 Subject: [PATCH 66/66] busybox: enable cttyhack for /dev/console This allows using job control in the shell, avoiding the 'CTRL-C does not work' frustration. Signed-off-by: Jan Luebbe --- package/busybox/busybox.config | 2 +- package/busybox/inittab | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index 2f09314a3251..429e2c7ee01e 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -1092,7 +1092,7 @@ CONFIG_ASH_TEST=y CONFIG_ASH_HELP=y CONFIG_ASH_GETOPTS=y CONFIG_ASH_CMDCMD=y -# CONFIG_CTTYHACK is not set +CONFIG_CTTYHACK=y # CONFIG_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set # CONFIG_HUSH_BRACE_EXPANSION is not set diff --git a/package/busybox/inittab b/package/busybox/inittab index 6332c590e2af..fc4dfd67ce9d 100644 --- a/package/busybox/inittab +++ b/package/busybox/inittab @@ -27,7 +27,7 @@ null::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr # now run any rc scripts ::sysinit:/etc/init.d/rcS -console::respawn:/bin/sh +console::respawn:/bin/cttyhack /bin/sh # Put a getty on the serial port #ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100 # GENERIC_SERIAL