Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 9b4ce7bce5f30712fd926ab4599a803314a07719

Authored by Nicolas de Pesloüan
Committed by Michal Marek
1 parent 1b9a50d931
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

deb-pkg: Fix building outside of source tree (O=...). 

When building linux-headers package using deb-pkg, builddeb erroneously assume
current directory is the source tree. This is not true if building in another
directory, using make O=... deb-pkg.

This patch fix this problem.

Signed-off-by: Nicolas de Pesloüan <nicolas.2p.debian@free.fr>
Tested-by: Nikolai Kondrashov <spbnick@gmail.com>
Acked-by: maximilian attems <max@stro.at>
Signed-off-by: Michal Marek <mmarek@suse.cz>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

scripts/package/builddeb
Diff comments   View file @ 9b4ce7b
... ... @@ -238,12 +238,12 @@
238 238 fi
239 239  
240 240 # Build header package
241   -find . -name Makefile -o -name Kconfig\* -o -name \*.pl > /tmp/files$$
242   -find arch/$SRCARCH/include include scripts -type f >> /tmp/files$$
  241 +(cd $srctree; find . -name Makefile -o -name Kconfig\* -o -name \*.pl > /tmp/files$$)
  242 +(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> /tmp/files$$)
243 243 (cd $objtree; find .config Module.symvers include scripts -type f >> /tmp/objfiles$$)
244 244 destdir=$kernel_headers_dir/usr/src/linux-headers-$version
245 245 mkdir -p "$destdir"
246   -tar -c -f - -T /tmp/files$$ | (cd $destdir; tar -xf -)
  246 +(cd $srctree; tar -c -f - -T /tmp/files$$) | (cd $destdir; tar -xf -)
247 247 (cd $objtree; tar -c -f - -T /tmp/objfiles$$) | (cd $destdir; tar -xf -)
248 248 rm -f /tmp/files$$ /tmp/objfiles$$
249 249 arch=$(dpkg --print-architecture)