| Message ID | 20130202101835.GY23529@axis.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Feb 02, 2013 at 11:18:35AM +0100, Jesper Nilsson wrote: > Commit 10b63956fce7f369cc37fd4d994f09bd5203efe4 which plumbed in UAPI > broke the destination-y functionality of scripts/Makefile.headersinst. > > The variable destination-y is used in a := assignment and so is expanded at > declaration time, and the include of the Kbuild fragments that set > destination-y to something is after this time, so it now always expands empty. > > There are no in-tree users of destination-y, but it allows any > Kbuild-fragment to redirect where headers are installed. > > Just move the assignment of the variable that uses it below the include > of the Kbuild fragment. > > Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com> > Cc: Michal Marek <mmarek@suse.cz> > Cc: David Howells <dhowells@redhat.com> > --- > Makefile.headersinst | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git scripts/Makefile.headersinst scripts/Makefile.headersinst I applied your patch to kbuild.git#kbuild, but please send -p1 patches next time. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git scripts/Makefile.headersinst scripts/Makefile.headersinst index 06ba4a7..25f216a 100644 --- scripts/Makefile.headersinst +++ scripts/Makefile.headersinst @@ -7,15 +7,15 @@ # # ========================================================================== -# called may set destination dir (when installing to asm/) -_dst := $(or $(destination-y),$(dst),$(obj)) - # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) +# called may set destination dir (when installing to asm/) +_dst := $(or $(destination-y),$(dst),$(obj)) + old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) include $(old-kbuild-file)
Commit 10b63956fce7f369cc37fd4d994f09bd5203efe4 which plumbed in UAPI broke the destination-y functionality of scripts/Makefile.headersinst. The variable destination-y is used in a := assignment and so is expanded at declaration time, and the include of the Kbuild fragments that set destination-y to something is after this time, so it now always expands empty. There are no in-tree users of destination-y, but it allows any Kbuild-fragment to redirect where headers are installed. Just move the assignment of the variable that uses it below the include of the Kbuild fragment. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com> Cc: Michal Marek <mmarek@suse.cz> Cc: David Howells <dhowells@redhat.com> --- Makefile.headersinst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) /^JN - Jesper Nilsson