[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#609155: linux-image-2.6.32-5-powerpc: Device tree sources not included in PPC kernel packages



On Thu, 2011-01-06 at 22:03 +0100, Gerhard Pircher wrote:
> Package: linux-image-2.6.32-5-powerpc
> Version: 2.6.32-29
> Severity: wishlist
> 
> The Lenny PPC kernel image packages included the device tree sources,
> which are normally found in arch/powerpc/boot/dts in the Linux sources.
> This isn't the case anymore for the Squeeze kernel packages. It looks
> like this change in the rules.real makefile is responsible for the
> problem:
> 
> --- linux-2.6-2.6.26/debian/rules.real 
> +++ linux-2.6-2.6.32/debian/rules.real 
> @@ -104,7 +100,7 @@
>  $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DIR=$(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
>  $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET) $(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR)
>  	rm -rf '$(DIR)'
> +	mkdir '$(DIR)'
> -	cp -al '$(SOURCE_DIR)' '$(DIR)'
>  	cp '$(CONFIG)' '$(DIR)/.config'
>  	echo '$(ABINAME)$(LOCALVERSION_IMAGE)' > '$(DIR)/localversion'
>  	echo 'override ARCH = $(KERNEL_ARCH)' >> '$(DIR)/.kernelvariables'
> 
> For Squeeze the build_$(ARCH)_$(FEATURESET)_$(FLAVOUR) directory only
> contains the compiled objects files and makefiles. Thus the
> bootwrapper_install target (called by the install target in rules.real)
> in build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)/arch/powerpc/boot/Makefile
> can't find any *.dts files and silently fails to install them.
[...]

Right, it's explicitly looking in the build directory for some reason.
Could you test whether this patch fixes it:

--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -364,7 +364,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))
 
 all-installed		:= $(extra-installed) $(hostprogs-installed) $(wrapper-installed) $(dts-installed)
 
--- END ---

If you need instructions, see
<http://kernel-handbook.alioth.debian.org/ch-common-tasks.html#s-common-official>.

Ben.

-- 
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.

Attachment: signature.asc
Description: This is a digitally signed message part


Reply to: