Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+12
-11
+2
-2
Documentation/DocBook/media/Makefile
+2
-2
Documentation/DocBook/media/Makefile
···
202
202
203
203
$(MEDIA_OBJ_DIR)/v4l2.xml: $(OBJIMGFILES)
204
204
@$($(quiet)gen_xml)
205
-
@(ln -sf $(MEDIA_SRC_DIR)/v4l/*xml $(MEDIA_OBJ_DIR)/)
206
-
@(ln -sf $(MEDIA_SRC_DIR)/dvb/*xml $(MEDIA_OBJ_DIR)/)
205
+
@(ln -sf `cd $(MEDIA_SRC_DIR) && /bin/pwd`/v4l/*xml $(MEDIA_OBJ_DIR)/)
206
+
@(ln -sf `cd $(MEDIA_SRC_DIR) && /bin/pwd`/dvb/*xml $(MEDIA_OBJ_DIR)/)
207
207
208
208
$(MEDIA_OBJ_DIR)/videodev2.h.xml: $(srctree)/include/uapi/linux/videodev2.h $(MEDIA_OBJ_DIR)/v4l2.xml
209
209
@$($(quiet)gen_xml)
+1
-1
Documentation/kbuild/makefiles.txt
+1
-1
Documentation/kbuild/makefiles.txt
···
1171
1171
obvious reason.
1172
1172
1173
1173
dtc
1174
-
Create flattend device tree blob object suitable for linking
1174
+
Create flattened device tree blob object suitable for linking
1175
1175
into vmlinux. Device tree blobs linked into vmlinux are placed
1176
1176
in an init section in the image. Platform code *must* copy the
1177
1177
blob to non-init memory prior to calling unflatten_device_tree().
+8
-6
scripts/package/builddeb
+8
-6
scripts/package/builddeb
···
289
289
290
290
fi
291
291
292
-
# Build header package
293
-
(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
294
-
(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
295
-
(cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
292
+
# Build kernel header package
293
+
(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl) > "$objtree/debian/hdrsrcfiles"
294
+
(cd $srctree; find arch/$SRCARCH/include include scripts -type f) >> "$objtree/debian/hdrsrcfiles"
295
+
(cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"
296
+
(cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"
297
+
(cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles"
296
298
destdir=$kernel_headers_dir/usr/src/linux-headers-$version
297
299
mkdir -p "$destdir"
298
-
(cd $srctree; tar -c -f - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -)
299
-
(cd $objtree; tar -c -f - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; tar -xf -)
300
+
(cd $srctree; tar -c -f - -T -) < "$objtree/debian/hdrsrcfiles" | (cd $destdir; tar -xf -)
301
+
(cd $objtree; tar -c -f - -T -) < "$objtree/debian/hdrobjfiles" | (cd $destdir; tar -xf -)
300
302
(cd $objtree; cp $KCONFIG_CONFIG $destdir/.config) # copy .config manually to be where it's expected to be
301
303
ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
302
304
rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
+1
-2
scripts/package/buildtar
+1
-2
scripts/package/buildtar
···
125
125
# Create the tarball
126
126
#
127
127
(
128
-
cd "${tmpdir}"
129
128
opts=
130
129
if tar --owner=root --group=root --help >/dev/null 2>&1; then
131
130
opts="--owner=root --group=root"
132
131
fi
133
-
tar cf - boot/* lib/* $opts | ${compress} > "${tarball}${file_ext}"
132
+
tar cf - -C "$tmpdir" boot/ lib/ $opts | ${compress} > "${tarball}${file_ext}"
134
133
)
135
134
136
135
echo "Tarball successfully created in ${tarball}${file_ext}"