Commit 532f5138 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

Pull kbuild fixes from Michal Marek:
 "There are three fixes for regressions caused by the relative paths
  series: deb-pkg, tar-pkg and *docs did not work with O=.

  Plus, there is a fix for the linux-headers deb package and a fixed
  typo.  These are not regression fixes but are safe enough"

* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kbuild: fix a typo in a kbuild document
  builddeb: fix missing headers in linux-headers package
  Documentation: Fix DocBook build with relative $(srctree)
  kbuild: Fix tar-pkg with relative $(objtree)
  deb-pkg: Fix for relative paths
parents e13d100b c1410562

Documentation/DocBook/media/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -202,8 +202,8 @@ $(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64 


$(MEDIA_OBJ_DIR)/v4l2.xml: $(OBJIMGFILES)

	@$($(quiet)gen_xml)

	@(ln -sf $(MEDIA_SRC_DIR)/v4l/*xml $(MEDIA_OBJ_DIR)/)

	@(ln -sf $(MEDIA_SRC_DIR)/dvb/*xml $(MEDIA_OBJ_DIR)/)

	@(ln -sf `cd $(MEDIA_SRC_DIR) && /bin/pwd`/v4l/*xml $(MEDIA_OBJ_DIR)/)

	@(ln -sf `cd $(MEDIA_SRC_DIR) && /bin/pwd`/dvb/*xml $(MEDIA_OBJ_DIR)/)



$(MEDIA_OBJ_DIR)/videodev2.h.xml: $(srctree)/include/uapi/linux/videodev2.h $(MEDIA_OBJ_DIR)/v4l2.xml

	@$($(quiet)gen_xml)

Documentation/kbuild/makefiles.txt

+1 −1
Original line number Diff line number Diff line
@@ -1171,7 +1171,7 @@ When kbuild executes, the following steps are followed (roughly): 
	      obvious reason.



    dtc

	Create flattend device tree blob object suitable for linking

	Create flattened device tree blob object suitable for linking

	into vmlinux. Device tree blobs linked into vmlinux are placed

	in an init section in the image. Platform code *must* copy the

	blob to non-init memory prior to calling unflatten_device_tree().

scripts/package/builddeb

+8 −6
Original line number Diff line number Diff line
@@ -289,14 +289,16 @@ EOF 


fi



# Build header package

(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")

(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")

(cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")

# Build kernel header package

(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl) > "$objtree/debian/hdrsrcfiles"

(cd $srctree; find arch/$SRCARCH/include include scripts -type f) >> "$objtree/debian/hdrsrcfiles"

(cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"

(cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"

(cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles"

destdir=$kernel_headers_dir/usr/src/linux-headers-$version

mkdir -p "$destdir"

(cd $srctree; tar -c -f - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -)

(cd $objtree; tar -c -f - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; tar -xf -)

(cd $srctree; tar -c -f - -T -) < "$objtree/debian/hdrsrcfiles" | (cd $destdir; tar -xf -)

(cd $objtree; tar -c -f - -T -) < "$objtree/debian/hdrobjfiles" | (cd $destdir; tar -xf -)

(cd $objtree; cp $KCONFIG_CONFIG $destdir/.config) # copy .config manually to be where it's expected to be

ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"

rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"

scripts/package/buildtar

+1 −2
Original line number Diff line number Diff line
@@ -125,12 +125,11 @@ esac 
# Create the tarball

#

(

	cd "${tmpdir}"

	opts=

	if tar --owner=root --group=root --help >/dev/null 2>&1; then

		opts="--owner=root --group=root"

	fi

	tar cf - boot/* lib/* $opts | ${compress} > "${tarball}${file_ext}"

	tar cf - -C "$tmpdir" boot/ lib/ $opts | ${compress} > "${tarball}${file_ext}"

)



echo "Tarball successfully created in ${tarball}${file_ext}"

CRA Git | Maintained and supported by SUSTech CRA and CCSE