Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a91f98a2 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

kbuild: Fix bug in make deb-pkg when using seperate source and output directories 



From: Ryan Anderson <ryan@michonline.com>

When running "make O=something deb-pkg", I get a failure that claims I
haven't configured my kernel (I have).  Running it a second time tells
me to run "make mrproper"  (include/linux/version.h got built on the
first run)

Original patch from:
From: Ajay Patel <patela@gmail.com>

With modifications from:
Signed-off-By: default avatarRyan Anderson <ryan@michonline.com>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent dc5962fd

scripts/package/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ $(objtree)/binkernel.spec: $(MKSPEC) $(srctree)/Makefile 
	$(CONFIG_SHELL) $(MKSPEC) prebuilt > $@

	

binrpm-pkg: $(objtree)/binkernel.spec

	$(MAKE)

	$(MAKE) KBUILD_SRC=

	set -e; \

	$(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version

	set -e; \
@@ -74,7 +74,7 @@ clean-files += $(objtree)/binkernel.spec 
#

.PHONY: deb-pkg

deb-pkg:

	$(MAKE)

	$(MAKE) KBUILD_SRC=

	$(CONFIG_SHELL) $(srctree)/scripts/package/builddeb



clean-dirs += $(objtree)/debian/

scripts/package/builddeb

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ else 
fi



if grep -q '^CONFIG_MODULES=y' .config ; then

	INSTALL_MOD_PATH="$tmpdir" make modules_install

	INSTALL_MOD_PATH="$tmpdir" make KBUILD_SRC= modules_install

	if [ "$ARCH" == "um" ] ; then

		mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/"

		rmdir "$tmpdir/lib/modules/$version"