All of lore.kernel.org
 help / color / mirror / Atom feed
From: Khem Raj <raj.khem@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [meta-initramfs][PATCH 02/21] kexecboot: Fix build with glibc 2.28+
Date: Mon, 13 Aug 2018 01:17:23 -0700	[thread overview]
Message-ID: <20180813081742.6961-2-raj.khem@gmail.com> (raw)
In-Reply-To: <20180813081742.6961-1-raj.khem@gmail.com>

Update to latest srcrev at the same time.
Fix out of tree builds

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...top_srcdir-to-compiler-include-paths.patch | 27 +++++++++++++++++
 .../files/0002-include-sys-sysmacros.h.patch  | 30 +++++++++++++++++++
 .../recipes-bsp/kexecboot/kexecboot_git.bb    | 10 ++++---
 3 files changed, 63 insertions(+), 4 deletions(-)
 create mode 100644 meta-initramfs/recipes-bsp/kexecboot/files/0001-Add-top_srcdir-to-compiler-include-paths.patch
 create mode 100644 meta-initramfs/recipes-bsp/kexecboot/files/0002-include-sys-sysmacros.h.patch

diff --git a/meta-initramfs/recipes-bsp/kexecboot/files/0001-Add-top_srcdir-to-compiler-include-paths.patch b/meta-initramfs/recipes-bsp/kexecboot/files/0001-Add-top_srcdir-to-compiler-include-paths.patch
new file mode 100644
index 0000000000..0565133d95
--- /dev/null
+++ b/meta-initramfs/recipes-bsp/kexecboot/files/0001-Add-top_srcdir-to-compiler-include-paths.patch
@@ -0,0 +1,27 @@
+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
+
diff --git a/meta-initramfs/recipes-bsp/kexecboot/files/0002-include-sys-sysmacros.h.patch b/meta-initramfs/recipes-bsp/kexecboot/files/0002-include-sys-sysmacros.h.patch
new file mode 100644
index 0000000000..f12ae99e72
--- /dev/null
+++ b/meta-initramfs/recipes-bsp/kexecboot/files/0002-include-sys-sysmacros.h.patch
@@ -0,0 +1,30 @@
+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
+
diff --git a/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb b/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb
index 9f5dad7c64..8799a3e4cc 100644
--- a/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb
+++ b/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb
@@ -38,15 +38,17 @@ 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"
-SRCREV = "4c4f127e79ac5b8d6b6e2fbb938ccbf12b04c531"
+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"
 inherit autotools
 
 EXTRA_OECONF = "--enable-textui --enable-delay=2 --enable-evdev-rate=1000,250"
 
 do_install () {
-    install -d ${D}${bindir}
-    install -m 0755 kexecboot ${D}${bindir}
+    install -D -m 0755 ${B}/src/kexecboot ${D}${bindir}/kexecboot
     install -d ${D}/proc
     install -d ${D}/mnt
     install -d ${D}/dev
-- 
2.18.0



  reply	other threads:[~2018-08-13  8:17 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-13  8:17 [meta-webserver][PATCH 01/21] sthttpd: Add dependency on virtual/crypt Khem Raj
2018-08-13  8:17 ` Khem Raj [this message]
2018-08-13  8:17 ` [meta-multimedia][PATCH 03/21] oscam: Upgrade to latest rev 11431 on trunk Khem Raj
2018-08-13  8:17 ` [meta-oe][PATCH 04/21] eject: Fix build with glibc 2.28+ Khem Raj
2018-08-13  8:17 ` [meta-xfce][PATCH 05/21] xfce4-diskperf-plugin: " Khem Raj
2018-08-13  8:17 ` [meta-networking][PATCH 06/21] yp-tools: Add dep on virtual/crypt Khem Raj
2018-08-13  8:17 ` [meta-oe][PATCH 07/21] lsscsi: Upgrade to 0.30 Khem Raj
2018-08-13  8:17 ` [meta-webserver][PATCH 08/21] hiawatha: Add missing dep on virtual/crypt Khem Raj
2018-08-13  8:17 ` [meta-filesystems][PATCH 09/21] logfsprogs: Fix build with glibc 2.28 Khem Raj
2018-08-13  8:17 ` [meta-oe][PATCH 10/21] lockdev: Fix build with glibc 2.28+ Khem Raj
2018-08-13  8:17 ` [meta-webserver][PATCH 11/21] nostromo: Add dep on virtual/crypt Khem Raj
2018-08-13  8:17 ` [meta-oe][PATCH 12/21] atop: Upgrade to 2.3.0 Khem Raj
2018-08-13  8:17 ` [meta-gnome][PATCH 13/21] usermode: Fix build with glibc 2.28+ Khem Raj
2018-08-13  8:17 ` [meta-filesystems][PATCH 14/21] f2fs-tools: Upgrade to 1.11.0 Khem Raj
2018-08-13  8:17 ` [meta-oe][PATCH 15/21] udisks: Fix build with glibc 2.28+ Khem Raj
2018-08-13  8:17 ` [meta-oe][PATCH 16/21] tcsh: Add dep on virtual/crypt Khem Raj
2018-08-13  8:17 ` [meta-networking][PATCH 17/21] owfs: " Khem Raj
2018-08-13  8:17 ` [meta-filesystems][PATCH 18/21] owfs: Upgrade to 3.2p2 and fix build with glibc 2.28+ Khem Raj
2018-08-13  8:17 ` [meta-oe][PATCH 19/21] cfengine, cfengine-masterfiles: Upgrade to 3.12.0 Khem Raj
2018-08-16 17:27   ` Martin Jansa
2018-08-16 17:58     ` Khem Raj
2018-08-16 18:14       ` Martin Jansa
2018-08-16 18:29         ` Khem Raj
2018-08-13  8:17 ` [meta-webserver][PATCH 20/21] nginx: Upgrade to 1.15.2 Khem Raj
2018-08-13  8:17 ` [meta-oe][PATCH 21/21] stress-ng: Upgrade to 0.09.36 Khem Raj

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180813081742.6961-2-raj.khem@gmail.com \
    --to=raj.khem@gmail.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.