From 25bc5c7d6d6a3f02bdbdb496f93c76a7943059cc Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 21 Mar 2018 15:41:04 +0100 Subject: [PATCH] Update barebox --- buildroot-external/board/ova/barebox.config | 3 -- buildroot-external/board/ova/genimage.cfg | 4 +- buildroot-external/board/ova/kernel.config | 19 +++---- buildroot-external/configs/ova_defconfig | 1 + ...11-barebox-bump-to-version-2018.03.0.patch | 49 +++++++++++++++++++ buildroot/boot/barebox/Config.in | 4 +- buildroot/boot/barebox/barebox.hash | 6 +-- 7 files changed, 64 insertions(+), 22 deletions(-) create mode 100644 buildroot-patches/0011-barebox-bump-to-version-2018.03.0.patch diff --git a/buildroot-external/board/ova/barebox.config b/buildroot-external/board/ova/barebox.config index f8359d7c8..1af7fd403 100644 --- a/buildroot-external/board/ova/barebox.config +++ b/buildroot-external/board/ova/barebox.config @@ -9,8 +9,6 @@ CONFIG_BOOTCHOOSER=y CONFIG_CMD_UIMAGE=y CONFIG_CMD_STATE=y CONFIG_CMD_BOOTCHOOSER=y -CONFIG_OFDEVICE=y -CONFIG_OF_BAREBOX_DRIVERS=y CONFIG_DRIVER_SERIAL_EFI=y CONFIG_DRIVER_SERIAL_EFI_STDIO=y # CONFIG_SPI is not set @@ -20,7 +18,6 @@ CONFIG_USB_HOST=y CONFIG_VIDEO=y CONFIG_DRIVER_VIDEO_EFI_GOP=y CONFIG_CLOCKSOURCE_EFI=y -# CONFIG_PINCTRL is not set CONFIG_FS_EXT4=y CONFIG_FS_EFI=y CONFIG_FS_EFIVARFS=y diff --git a/buildroot-external/board/ova/genimage.cfg b/buildroot-external/board/ova/genimage.cfg index 63f45df51..989c7d9a2 100644 --- a/buildroot-external/board/ova/genimage.cfg +++ b/buildroot-external/board/ova/genimage.cfg @@ -1,6 +1,6 @@ image boot.vfat { vfat { - extraargs = "-n boot -F32" + extraargs = "-n boot" files = { "bzImage" } @@ -9,7 +9,7 @@ image boot.vfat { image = "barebox.bin" } } - size = 64M + size = 32M } image sdcard.img { diff --git a/buildroot-external/board/ova/kernel.config b/buildroot-external/board/ova/kernel.config index 7e80fb062..1420e256e 100644 --- a/buildroot-external/board/ova/kernel.config +++ b/buildroot-external/board/ova/kernel.config @@ -1,6 +1,6 @@ # CONFIG_LOCALVERSION_AUTO is not set CONFIG_KERNEL_LZ4=y -CONFIG_EFI_STUB=y +# CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_NO_HZ=y @@ -20,6 +20,7 @@ CONFIG_CPUSETS=y CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_PERF=y +CONFIG_USER_NS=y # CONFIG_COMPAT_BRK is not set CONFIG_PROFILING=y CONFIG_KPROBES=y @@ -28,16 +29,10 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_PARTITION_ADVANCED=y -CONFIG_OSF_PARTITION=y -CONFIG_AMIGA_PARTITION=y -CONFIG_MAC_PARTITION=y CONFIG_BSD_DISKLABEL=y CONFIG_MINIX_SUBPARTITION=y CONFIG_SOLARIS_X86_PARTITION=y CONFIG_UNIXWARE_DISKLABEL=y -CONFIG_SGI_PARTITION=y -CONFIG_SUN_PARTITION=y -CONFIG_KARMA_PARTITION=y CONFIG_SMP=y CONFIG_CALGARY_IOMMU=y CONFIG_SCHED_SMT=y @@ -50,10 +45,10 @@ CONFIG_NUMA=y CONFIG_X86_CHECK_BIOS_CORRUPTION=y # CONFIG_MTRR_SANITIZER is not set CONFIG_EFI=y +CONFIG_EFI_STUB=y CONFIG_HZ_1000=y CONFIG_KEXEC=y CONFIG_CRASH_DUMP=y -CONFIG_HIBERNATION=y CONFIG_PM_DEBUG=y CONFIG_PM_TRACE_RTC=y CONFIG_ACPI_DOCK=y @@ -98,6 +93,7 @@ CONFIG_TCP_MD5SIG=y CONFIG_INET6_AH=y CONFIG_INET6_ESP=y CONFIG_NETLABEL=y +CONFIG_NETWORK_SECMARK=y CONFIG_NETFILTER=y # CONFIG_NETFILTER_ADVANCED is not set CONFIG_NF_CONNTRACK=y @@ -250,7 +246,9 @@ CONFIG_VFAT_FS=y CONFIG_PROC_KCORE=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_HUGETLBFS=y -CONFIG_SQUASHFS=m +CONFIG_EFIVAR_FS=y +CONFIG_SQUASHFS=y +CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_LZ4=y # CONFIG_NETWORK_FILESYSTEMS is not set CONFIG_NLS_DEFAULT="utf8" @@ -273,9 +271,6 @@ CONFIG_EARLY_PRINTK_DBGP=y CONFIG_DEBUG_BOOT_PARAMS=y CONFIG_OPTIMIZE_INLINING=y CONFIG_SECURITY=y -CONFIG_SECURITY_SELINUX=y -CONFIG_SECURITY_SELINUX_BOOTPARAM=y -CONFIG_SECURITY_SELINUX_DISABLE=y CONFIG_SECURITY_APPARMOR=y CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_GCM=y diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig index 54e6383f3..15a26828a 100644 --- a/buildroot-external/configs/ova_defconfig +++ b/buildroot-external/configs/ova_defconfig @@ -7,6 +7,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TARGET_GENERIC_HOSTNAME="hassio.local" BR2_TARGET_GENERIC_ISSUE="Welcome to Hass.io" BR2_INIT_SYSTEMD=y +# BR2_TARGET_ENABLE_ROOT_LOGIN is not set BR2_SYSTEM_BIN_SH_BASH=y # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSIO_PATH)/overlay/" diff --git a/buildroot-patches/0011-barebox-bump-to-version-2018.03.0.patch b/buildroot-patches/0011-barebox-bump-to-version-2018.03.0.patch new file mode 100644 index 000000000..ad9b89547 --- /dev/null +++ b/buildroot-patches/0011-barebox-bump-to-version-2018.03.0.patch @@ -0,0 +1,49 @@ +From ce08194279b6debecfa6105ec0db8afb24977f65 Mon Sep 17 00:00:00 2001 +From: Pascal Vizeli +Date: Wed, 21 Mar 2018 11:21:00 +0100 +Subject: [PATCH 1/1] barebox: bump to version 2018.03.0 + +Signed-off-by: Pascal Vizeli +--- + boot/barebox/Config.in | 4 ++-- + boot/barebox/barebox.hash | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in +index fd22d90..e703b07 100644 +--- a/boot/barebox/Config.in ++++ b/boot/barebox/Config.in +@@ -12,7 +12,7 @@ choice + Select the specific Barebox version you want to use + + config BR2_TARGET_BAREBOX_LATEST_VERSION +- bool "2017.09.0" ++ bool "2018.03.0" + + config BR2_TARGET_BAREBOX_CUSTOM_VERSION + bool "Custom version" +@@ -40,7 +40,7 @@ endif + + config BR2_TARGET_BAREBOX_VERSION + string +- default "2017.09.0" if BR2_TARGET_BAREBOX_LATEST_VERSION ++ default "2018.03.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION + default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL + default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT +diff --git a/boot/barebox/barebox.hash b/boot/barebox/barebox.hash +index b241970..a34e228 100644 +--- a/boot/barebox/barebox.hash ++++ b/boot/barebox/barebox.hash +@@ -1,5 +1,5 @@ +-# http://www.barebox.org/download/barebox-2017.09.0.tar.bz2.md5 +-md5 b92e9c99cda7fbb61d01baf5679df261 barebox-2017.09.0.tar.bz2 ++# http://www.barebox.org/download/barebox-2018.03.0.tar.bz2.md5 ++md5 5a7692364684ad681c6a3c7a46e5000e barebox-2018.03.0.tar.bz2 + + # Locally calculated +-sha256 43283edc019f95a53fdb7d1b7c294afc4741bfcace348d6beeded5fe5147a81b barebox-2017.09.0.tar.bz2 ++sha256 dbd1d3b21bcc7c885709bec6a7d728c51e05ae08b0552004e071fa09c3ec541e barebox-2018.03.0.tar.bz2 +-- +2.7.4 + diff --git a/buildroot/boot/barebox/Config.in b/buildroot/boot/barebox/Config.in index fd22d904b..e703b0701 100644 --- a/buildroot/boot/barebox/Config.in +++ b/buildroot/boot/barebox/Config.in @@ -12,7 +12,7 @@ choice Select the specific Barebox version you want to use config BR2_TARGET_BAREBOX_LATEST_VERSION - bool "2017.09.0" + bool "2018.03.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2017.09.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2018.03.0" if BR2_TARGET_BAREBOX_LATEST_VERSION default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT diff --git a/buildroot/boot/barebox/barebox.hash b/buildroot/boot/barebox/barebox.hash index b24197024..a34e22883 100644 --- a/buildroot/boot/barebox/barebox.hash +++ b/buildroot/boot/barebox/barebox.hash @@ -1,5 +1,5 @@ -# http://www.barebox.org/download/barebox-2017.09.0.tar.bz2.md5 -md5 b92e9c99cda7fbb61d01baf5679df261 barebox-2017.09.0.tar.bz2 +# http://www.barebox.org/download/barebox-2018.03.0.tar.bz2.md5 +md5 5a7692364684ad681c6a3c7a46e5000e barebox-2018.03.0.tar.bz2 # Locally calculated -sha256 43283edc019f95a53fdb7d1b7c294afc4741bfcace348d6beeded5fe5147a81b barebox-2017.09.0.tar.bz2 +sha256 dbd1d3b21bcc7c885709bec6a7d728c51e05ae08b0552004e071fa09c3ec541e barebox-2018.03.0.tar.bz2