powerpc/boot/dts: Install dts from the right directory
PATCH 1/2 powerpc/boot/dts: Install dts from the right directory
The dts-installed variable is initialised using a wildcard path that will be expanded relative to the build directory. Use the existing variable dtstree to generate an absolute wildcard path that will work when building in a separate directory.
--- arch/powerpc/boot/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/powerpc/boot/Makefile +0 -0
@@ -368,7 +368,7 @@ INSTALL :=3D install extra-installed :=3D $(patsubst $(obj)/%, $(DESTDIR)$(WRAPPER_OBJDIR)/%, =
$(extra-y))
hostprogs-installed :=3D $(patsubst %, $(DESTDIR)$(WRAPPER_BINDIR)/%, $(ho=
stprogs-y))
wrapper-installed :=3D $(DESTDIR)$(WRAPPER_BINDIR)/wrapper
-dts-installed :=3D $(patsubst $(obj)/dts/%, $(DESTDIR)$(WRAPPER_DTSDIR)/%=
, $(wildcard $(obj)/dts/*.dts))
+dts-installed :=3D $(patsubst $(dtstree)/%, $(DESTDIR)$(WRAPPER_DTSDIR)/%=
, $(wildcard $(dtstree)/*.dts))
=20
all-installed :=3D $(extra-installed) $(hostprogs-installed) $(wrapper-in=
stalled) $(dts-installed)
=20
--=20
1.7.2.3
PATCH 2/2 powerpc/boot/Makefile: Use $(src) and $(obj) as per makefiles.txt
$(src) and $(obj) are normally the same, but are supposed to be used for paths under $(srctree) and $(objtree) respectively.
Also use $(dtstree) and $(wrapper) as appropriate.
---
This is totally untested, so please review carefully!
Ben.
arch/powerpc/boot/Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
arch/powerpc/boot/Makefile +0 -0
@@ -33,7 +33,7 @@ ifeq ($(call cc-option-yn, -fstack-protector),y) BOOTCFLAGS +=3D -fno-stack-protector endif
=20
-BOOTCFLAGS +=3D -I$(obj) -I$(srctree)/$(obj)
+BOOTCFLAGS +=3D -I$(obj) -I$(srctree)/$(src)
=20
DTC_FLAGS ?=3D -p 1024
=20
@@ -399,10 +399,10 @@ $(extra-installed) : $(DESTDIR)$(WRAPPER_OBJDIR)/% : =
$(obj)/% | $(DESTDIR)$(WRAP
$(hostprogs-installed) : $(DESTDIR)$(WRAPPER_BINDIR)/% : $(obj)/% | $(DES=
TDIR)$(WRAPPER_BINDIR)
$(call cmd,install_exe)
=20
-$(dts-installed) : $(DESTDIR)$(WRAPPER_DTSDIR)/% : $(srctree)/$(obj)/dts/%=
| $(DESTDIR)$(WRAPPER_DTSDIR)
+$(dts-installed) : $(DESTDIR)$(WRAPPER_DTSDIR)/% : $(dtstree)/% | $(DESTDI=
R)$(WRAPPER_DTSDIR)
$(call cmd,install_dts)
=20
-$(wrapper-installed): $(DESTDIR)$(WRAPPER_BINDIR) $(srctree)/$(obj)/wrappe= r | $(DESTDIR)$(WRAPPER_BINDIR)
+$(wrapper-installed): $(DESTDIR)$(WRAPPER_BINDIR) $(wrapper) | $(DESTDIR)$= (WRAPPER_BINDIR)
$(call cmd,install_wrapper)
=20
$(obj)/bootwrapper_install: $(all-installed)
--=20
1.7.2.3
-------- Original-Nachricht --------
Quoted 10 lines
Datum: Sun, 09 Jan 2011 00:24:01 +0000
Von: Ben Hutchings <[email protected]>
An: Benjamin Herrenschmidt <[email protected]>, Paul Mackerras <[email protected]>
CC: Gerhard Pircher <[email protected]>, [email protected]
Betreff: [PATCH 1/2] powerpc/boot/dts: Install dts from the right directoryThe dts-installed variable is initialised using a wildcard path that will be expanded relative to the build directory. Use the existing variable dtstree to generate an absolute wildcard path that will work when building in a separate directory.
Wouldn't this patch be a good candidate for the stable kernel series?
Quoted 22 lines
Reported-by Gerhard Pircher <[email protected]>Signed-off-by Ben Hutchings <[email protected]>--- arch/powerpc/boot/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)arch/powerpc/boot/Makefile +1
-1@@ -368,7 +368,7 @@ INSTALL := install extra-installed := $(patsubst $(obj)/%, $(DESTDIR)$(WRAPPER_OBJDIR)/%, $(extra-y)) hostprogs-installed := $(patsubst %, $(DESTDIR)$(WRAPPER_BINDIR)/%, $(hostprogs-y)) wrapper-installed := $(DESTDIR)$(WRAPPER_BINDIR)/wrapper -dts-installed := $(patsubst $(obj)/dts/%, $(DESTDIR)$(WRAPPER_DTSDIR)/%, $(wildcard $(obj)/dts/*.dts)) +dts-installed := $(patsubst $(dtstree)/%, $(DESTDIR)$(WRAPPER_DTSDIR)/%,$(wildcard $(dtstree)/*.dts))
Quoted 5 lines
all-installed := $(extra-installed) $(hostprogs-installed)
$(wrapper-installed) $(dts-installed)Signature · 1 line
1.7.2.3
Gerhard
Signature · 2 lines
NEU: FreePhone - kostenlos mobil telefonieren und surfen! Jetzt informieren: http://www.gmx.net/de/go/freephone