<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Feb 2, 2016 at 1:40 PM, Saul Wold <span dir="ltr"><<a href="mailto:sgw@linux.intel.com" target="_blank">sgw@linux.intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">On Tue, 2016-02-02 at 20:05 +0200, Alexandru But wrote:<br>
> nvme uapi header was renamed from nvme.h to nvme_ioctl.h in linux<br>
> 4.4, but the<br>
> header list was not updated. This causes efivar (and maybe other)<br>
> package build<br>
> to fail. This should fix the build while the commit is backported in<br>
> the<br>
> kernel.<br>
><br>
</span>Would it not make more sense to fix efivar (and maybe others) instead<br>
of changing the kernel headers, which were clearly changed for a reason<br>
to start with.<br></blockquote><div><br></div><div>Yep. But I recall some argument against that. I'm on a plane at the moment<br></div><div>and can't check my references.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
This patch seems to be pending: <br>
<a href="https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-libs/efivar/files/0.
21-nvme_ioctl.h.patch" rel="noreferrer" target="_blank">https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-libs/efivar/files/0.<br>
21-nvme_ioctl.h.patch</a><br>
<br>
And a more appropriate patch to the kernel headers would be backporting<br>
this already merged patch:<br>
<br>
<a href="https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/
?id=a9cf8284b45110a4d98aea180a89c857e53bf850" rel="noreferrer" target="_blank">https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/<br>
?id=a9cf8284b45110a4d98aea180a89c857e53bf850</a><br>
<br>
You can request that Bruce (the linux-yocto maintainer) backport this<br>
patch via the <a href="mailto:linux-yocto@yoctoproject.org">linux-yocto@yoctoproject.org</a> list.<br>
<br></blockquote><br></div><div class="gmail_quote">Maybe I'm missing something, but wouldn't that just fix projects that build against<br></div><div class="gmail_quote">linux-yocto ? If that's good enough, then yes, I can cherry pick the patch (or<br></div><div class="gmail_quote">better yet, get it via -stable).<br><br></div><div class="gmail_quote">but we'd still need to update the linux-libc-headers, since unless these apps<br></div><div class="gmail_quote">are building against the kernel_staging_dir, they are using the libc-headers<br></div><div class="gmail_quote">variant of the header. <br><br></div><div class="gmail_quote">Right ? .. or again, I may be missing what efivar is building against.<br></div><div class="gmail_quote"><br></div><div class="gmail_quote">Bruce<br></div><div class="gmail_quote"><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Sau!<br>
<div class="HOEnZb"><div class="h5"> <br>
> Signed-off-by: Alexandru But <<a href="mailto:alexandru.but@ni.com">alexandru.but@ni.com</a>><br>
> ---<br>
> ...i-update-install-list-after-nvme.h-rename.patch | 34<br>
> ++++++++++++++++++++++<br>
> .../linux-libc-headers/<a href="http://linux-libc-headers_4.4.bb" rel="noreferrer" target="_blank">linux-libc-headers_4.4.bb</a> | 4 +++<br>
> 2 files changed, 38 insertions(+)<br>
> create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-<br>
> libc-headers/0001-uapi-update-install-list-after-nvme.h-rename.patch<br>
><br>
> diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-<br>
> headers/0001-uapi-update-install-list-after-nvme.h-rename.patch<br>
> b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-<br>
> uapi-update-install-list-after-nvme.h-rename.patch<br>
> new file mode 100644<br>
> index 0000000..4d9f5a1<br>
> --- /dev/null<br>
> +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-<br>
> uapi-update-install-list-after-nvme.h-rename.patch<br>
> @@ -0,0 +1,34 @@<br>
> +From a9cf8284b45110a4d98aea180a89c857e53bf850 Mon Sep 17 00:00:00<br>
> 2001<br>
> +From: Mike Frysinger <<a href="mailto:vapier@gentoo.org">vapier@gentoo.org</a>><br>
> +Date: Sun, 10 Jan 2016 20:14:11 -0500<br>
> +Subject: [PATCH] uapi: update install list after nvme.h rename<br>
> +<br>
> +Commit 9d99a8dda154 ("nvme: move hardware structures out of the uapi<br>
> +version of nvme.h") renamed nvme.h to nvme_ioctl.h, but the uapi<br>
> list<br>
> +still refers to nvme.h. People trying to install the headers hit a<br>
> +failure as the header no longer exists.<br>
> +<br>
> +Cc: <a href="mailto:stable@vger.kernel.org">stable@vger.kernel.org</a><br>
> +Signed-off-by: Mike Frysinger <<a href="mailto:vapier@gentoo.org">vapier@gentoo.org</a>><br>
> +Reviewed-by: Christoph Hellwig <<a href="mailto:hch@lst.de">hch@lst.de</a>><br>
> +Signed-off-by: Jens Axboe <<a href="mailto:axboe@fb.com">axboe@fb.com</a>><br>
> +---<br>
> + include/uapi/linux/Kbuild | 2 +-<br>
> + 1 file changed, 1 insertion(+), 1 deletion(-)<br>
> +<br>
> +diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild<br>
> +index 628e6e6..88e1292 100644<br>
> +--- a/include/uapi/linux/Kbuild<br>
> ++++ b/include/uapi/linux/Kbuild<br>
> +@@ -306,7 +306,7 @@ header-y += nfs_mount.h<br>
> + header-y += nl80211.h<br>
> + header-y += n_r3964.h<br>
> + header-y += nubus.h<br>
> +-header-y += nvme.h<br>
> ++header-y += nvme_ioctl.h<br>
> + header-y += nvram.h<br>
> + header-y += omap3isp.h<br>
> + header-y += omapfb.h<br>
> +--<br>
> +2.6.1<br>
> +<br>
> diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-<br>
> <a href="http://headers_4.4.bb" rel="noreferrer" target="_blank">headers_4.4.bb</a> b/meta/recipes-kernel/linux-libc-headers/linux-libc-<br>
> <a href="http://headers_4.4.bb" rel="noreferrer" target="_blank">headers_4.4.bb</a><br>
> index 3763dc0..c8c7a10 100644<br>
> --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-<br>
> <a href="http://headers_4.4.bb" rel="noreferrer" target="_blank">headers_4.4.bb</a><br>
> +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-<br>
> <a href="http://headers_4.4.bb" rel="noreferrer" target="_blank">headers_4.4.bb</a><br>
> @@ -5,5 +5,9 @@ SRC_URI_append_libc-musl = "\<br>
> file://0002-libc-compat.h-prevent-redefinition-of-struct-<br>
> ethhdr.patch \<br>
> file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \<br>
> "<br>
> +SRC_URI_append ="\<br>
> + file://0001-uapi-update-install-list-after-nvme.h-rename.patch \<br>
> + "<br>
> +<br>
> SRC_URI[md5sum] = "9a78fa2eb6c68ca5a40ed5af08142599"<br>
> SRC_URI[sha256sum] =<br>
> "401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2"<br>
> --<br>
> 2.6.1<br>
><br>
</div></div></blockquote></div><br><br clear="all"><br>-- <br><div class="gmail_signature">"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"</div>
</div></div>