jeans/operating-system
jeans/operating-system
1
0
Fork 0
mirror of https://github.com/home-assistant/operating-system.git synced 2025-07-24 13:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update rauch & fix kernel bug

Browse Source
This commit is contained in:
Pascal Vizeli 2018-03-19 11:36:20 +01:00
parent bad7dafc6b
commit eb7e63cc0f
7 changed files with 131 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildroot-external/configs/ova_defconfig
View File

@ -8,12 +8,14 @@ BR2_TARGET_GENERIC_HOSTNAME="hassio.local"
BR2_TARGET_GENERIC_ISSUE="Welcome to Hass.io"
BR2_INIT_SYSTEMD=y
BR2_SYSTEM_BIN_SH_BASH=y
# BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSIO_PATH)/overlay/"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSIO_PATH)/board/ova/kernel.config"
BR2_LINUX_KERNEL_LZ4=y
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
# BR2_PACKAGE_BUSYBOX is not set
BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_E2FSPROGS=y

64
buildroot-patches/0007-linux-add-BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF.patch Normal file
View File

@ -0,0 +1,64 @@
From f7cd72b3d4e2b1d993c293e355e350bedbed4eab Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Date: Sun, 4 Mar 2018 22:31:16 +0100
Subject: [PATCH 1/1] linux: add BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF
Some Linux kernel configuration options (such as CONFIG_UNWINDER_ORC)
require building a host program that needs libelf.
Users who have libelf installed on their system won't see a problem,
but users who don't have libelf installed will get a build
failure. Therefore, this commit adds an option that allows a user to
indicate that his Linux kernel configuration requires libelf. When
this option is enabled, we add host-elfutils to the dependencies of
the linux package (host-elfutils provides the libelf library).
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
linux/Config.in | 13 +++++++++++++
linux/linux.mk | 4 ++++
2 files changed, 17 insertions(+)
diff --git a/linux/Config.in b/linux/Config.in
index 57bb11c..e299af4 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -420,6 +420,19 @@ config BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL
such as "scripts/extract-cert.c:21:25: fatal error:
openssl/bio.h: No such file or directory".
+config BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF
+ bool "Needs host libelf"
+ help
+ Some Linux kernel configuration options (such as
+ CONFIG_UNWINDER_ORC) require building a host program that
+ needs libelf. Enabling this option will ensure host-elfutils
+ (which provides libelf) gets built before the Linux kernel.
+
+ Enable this option if you get a Linux kernel build failure
+ such as "Cannot generate ORC metadata for
+ CONFIG_UNWINDER_ORC=y, please install libelf-dev,
+ libelf-devel or elfutils-libelf-devel".
+
# Linux extensions
source "linux/Config.ext.in"
diff --git a/linux/linux.mk b/linux/linux.mk
index 91d8751..28d799f 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -84,6 +84,10 @@ ifeq ($(BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL),y)
LINUX_DEPENDENCIES += host-openssl
endif
+ifeq ($(BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF),y)
+LINUX_DEPENDENCIES += host-elfutils
+endif
+
# If host-uboot-tools is selected by the user, assume it is needed to
# create a custom image
ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS),y)
--
2.7.4

45
buildroot-patches/0008-package-rauc-Version-bump-to-0.3.patch Normal file
View File

@ -0,0 +1,45 @@
From ab863898812a926f0ee687269c2e2ed61bc7adc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jan.kundrat@cesnet.cz>
Date: Thu, 8 Feb 2018 10:27:47 +0100
Subject: [PATCH 1/1] package/rauc: Version bump to 0.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
There's a bug in 0.2 which prevents proper operation when activated via
D-Bus, which is why I'm bumping this.
Signed-off-by: Jan Kundrát <jan.kundrat@cesnet.cz>
Link: https://github.com/rauc/rauc/issues/125
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
package/rauc/rauc.hash | 4 ++--
package/rauc/rauc.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash
index 649d195..91d7c1d 100644
--- a/package/rauc/rauc.hash
+++ b/package/rauc/rauc.hash
@@ -1,3 +1,3 @@
# Locally calculated, after verifying against
-# https://github.com/rauc/rauc/releases/download/v0.2/rauc-0.2.tar.xz.asc
-sha256 83aa3ac3716e1c29315162e3cbf5d4db79f26dd95efe1bc634bbce364b95491a rauc-0.2.tar.xz
+# https://github.com/rauc/rauc/releases/download/v0.3/rauc-0.3.tar.xz.asc
+sha256 dc01bfb08b1830376782f9a51cfec290171519267ab97cc909435da9ac6d6d98 rauc-0.3.tar.xz
diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk
index 4909062..63fbc53 100644
--- a/package/rauc/rauc.mk
+++ b/package/rauc/rauc.mk
@@ -4,7 +4,7 @@
#
################################################################################
-RAUC_VERSION = 0.2
+RAUC_VERSION = 0.3
RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)
RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz
RAUC_LICENSE = LGPL-2.1
--
2.7.4

13
buildroot/linux/Config.in
View File

@ -412,6 +412,19 @@ config BR2_LINUX_KERNEL_INSTALL_TARGET
/boot if DTBs have been generated by the kernel build
process.
config BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF
bool "Needs host libelf"
help
Some Linux kernel configuration options (such as
CONFIG_UNWINDER_ORC) require building a host program that
needs libelf. Enabling this option will ensure host-elfutils
(which provides libelf) gets built before the Linux kernel.
Enable this option if you get a Linux kernel build failure
such as "Cannot generate ORC metadata for
CONFIG_UNWINDER_ORC=y, please install libelf-dev,
libelf-devel or elfutils-libelf-devel".
# Linux extensions
source "linux/Config.ext.in"

4
buildroot/linux/linux.mk
View File

@ -80,6 +80,10 @@ LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_LZMA) += CONFIG_KERNEL_LZMA
LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_LZO) += CONFIG_KERNEL_LZO
LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_XZ) += CONFIG_KERNEL_XZ
ifeq ($(BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF),y)
LINUX_DEPENDENCIES += host-elfutils
endif
# If host-uboot-tools is selected by the user, assume it is needed to
# create a custom image
ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS),y)

4
buildroot/package/rauc/rauc.hash
View File

@ -1,3 +1,3 @@
# Locally calculated, after verifying against
# https://github.com/rauc/rauc/releases/download/v0.2/rauc-0.2.tar.xz.asc
sha256 83aa3ac3716e1c29315162e3cbf5d4db79f26dd95efe1bc634bbce364b95491a rauc-0.2.tar.xz
# https://github.com/rauc/rauc/releases/download/v0.3/rauc-0.3.tar.xz.asc
sha256 dc01bfb08b1830376782f9a51cfec290171519267ab97cc909435da9ac6d6d98 rauc-0.3.tar.xz

2
buildroot/package/rauc/rauc.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
RAUC_VERSION = 0.2
RAUC_VERSION = 0.3
RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)
RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz
RAUC_LICENSE = LGPL-2.1