CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

kexecboot: upgrade to rev. 4c01d6960aa6

Browse Source 
Remove upstreamed patches, get new options for kexec.

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Andrea Adami 2018-09-07 12:45:34 +02:00 committed by Khem Raj
parent f96b327a46
commit 6bed5b3d74
3 changed files with 2 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
meta-initramfs/recipes-bsp/kexecboot/files/0001-Add-top_srcdir-to-compiler-include-paths.patch
View File

@ -1,27 +0,0 @@
From d302547305727797e0172ba89e7519252c400021 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 11 Aug 2018 14:37:22 -0700
Subject: [PATCH 1/2] Add top_srcdir to compiler include paths
Helps in compiling with out of tree build dir
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/Makefile.am b/src/Makefile.am
index d04a3a8..6449c5a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,7 @@
bin_PROGRAMS=kexecboot
+kexecboot_CFLAGS = -I$(top_srcdir)
+
kexecboot_SOURCES = \
util.c \
cfgparser.c \
--
2.18.0

30
meta-initramfs/recipes-bsp/kexecboot/files/0002-include-sys-sysmacros.h.patch
View File

@ -1,30 +0,0 @@
From c587012cbe448c9295f50497812ca3530cabbb51 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 11 Aug 2018 14:39:01 -0700
Subject: [PATCH 2/2] include sys/sysmacros.h
glibc 2.28+ does not include this header implicitly via other system
headers anymore
src/devicescan.c:373: undefined reference to `makedev'
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/devicescan.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/devicescan.c b/src/devicescan.c
index 4f2f497..0b2b253 100644
--- a/src/devicescan.c
+++ b/src/devicescan.c
@@ -20,6 +20,7 @@
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
+#include <sys/sysmacros.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
--
2.18.0

40
meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb
View File

@ -1,36 +1,3 @@
###########################
# Configure options:
#
# --enable-static-linking compile kexecboot as static executable [default=no]
# --enable-fbui support framebuffer menu [default=yes]
# --enable-fbui-width limit FB UI width to specified value [default=no]
# --enable-fbui-height limit FB UI height to specified value [default=no]
# --enable-textui support console text user interface [default=no]
# --enable-cfgfiles support config files [default=yes]
# --enable-icons support custom icons (depends on fbui) [default=yes]
# --enable-zaurus compile Sharp Zaurus specific code [default=no]
# --enable-zimage compile with zImage support [default=yes]
# --enable-uimage compile with uImage support [default=no]
# --enable-machine-kernel look for machine-specific zImage kernel [default=no]
# --enable-devices-recreating
# enable devices re-creating [default=yes]
# --enable-debug enable debug output [default=no]
# --enable-host-debug allow for non-destructive executing of kexecboot on
# host system [default=no]
# --enable-numkeys enable menu item selection by keys [0-9] [default=yes]
# --enable-bg-buffer enable buffer for pre-drawed FB GUI background
#
# --enable-timeout allow to boot 1st kernel after timeout in seconds
# [default=no]
# --enable-delay specify delay before device scanning, allowing
# initialization of old CF/SD cards [default=1]
# --enable-bpp enable support of specified bpp modes
# (all,32,24,18,16,4,2,1) [default=all]
# --enable-evdev-rate change evdev (keyboard/mouse) repeat rate
# in milliseconds e.g. "1000,250" [default=no]
# --with-kexec-binary look for kexec binary at path
# [default="/usr/sbin/kexec"]
##########################
SUMMARY = "kexecboot linux-as-bootloader"
DESCRIPTION = "kexecboot is a graphical linux-as-bootloader implementation based on kexec."
HOMEPAGE = "http://kexecboot.org"
@ -38,11 +5,8 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
PV = "0.6+git${SRCPV}"
S = "${WORKDIR}/git"
SRC_URI = "git://github.com/kexecboot/kexecboot.git \
file://0001-Add-top_srcdir-to-compiler-include-paths.patch \
file://0002-include-sys-sysmacros.h.patch \
"
SRCREV = "d5ffd81bf6a1a2087cdc6c606cae98099229131c"
SRC_URI = "git://github.com/kexecboot/kexecboot.git"
SRCREV = "4c01d6960aa6a9d03675605062469ab777fa2b01"
inherit autotools
EXTRA_OECONF = "--enable-textui --enable-delay=2 --enable-evdev-rate=1000,250"