On 4 October 2017 at 12:12, Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx> wrote: > Hi Riku, > 2017-10-02 19:43 GMT+09:00 <riku.voipio@xxxxxxxxxx>: >> From: Riku Voipio <riku.voipio@xxxxxxxxxx> >> >> Move debian/ directory generation out of builddeb to a new script, >> mkdebian. The package build commands are kept in builddeb, which >> is now an internal command called from debian/rules. >> >> With these changes in place, we can now use dpkg-buildpackage from >> deb-pkg and bindeb-pkg removing need for handrolled source/changes >> generation. >> >> This patch is based on the criticism of the current state of builddeb >> discussed on: >> >> https://patchwork.kernel.org/patch/9656403/ >> >> Signed-off-by: Riku Voipio <riku.voipio@xxxxxxxxxx> >> --- >> changes since v2: >> - revert back to intdeb-pkg target >> - fix parellel builds from deb-pkg targets > No. Not fixed. > I see the same problem for bindeb-pkg as in v2. The parallel build overload? I'm totally puzzled then. Debian is still stuck with make 4.1, so I guess there is a change in behaviour on later makes. > "make deb-pkg" gave me tons of warnings, then finally fails to build: > rm -rf debian/*tmp debian/files > mv debian/ debian.backup # debian/ might be cleaned away > make clean > mv debian.backup debian > dpkg-source -i.git -b linux > dpkg-source: warning: no source format specified in > debian/source/format, see dpkg-source(1) > dpkg-source: info: using source format '1.0' > dpkg-source: warning: source directory 'linux' is not > <sourcepackage>-<upstreamversion> 'linux-4.13.0+-4.13.0+' > dpkg-source: warning: .orig directory name linux.orig is not > <package>-<upstreamversion> (wanted linux-4.13.0+-4.13.0+.orig) > dpkg-source: info: building linux-4.13.0+ using existing > linux-4.13.0+_4.13.0+.orig.tar.gz > dpkg-source: info: building linux-4.13.0+ in linux-4.13.0+_4.13.0+-7.diff.gz > dpkg-source: warning: ignoring deletion of file .scmversion, use > --include-removal to override > dpkg-source: warning: ignoring deletion of directory drivers/lguest > dpkg-source: warning: ignoring deletion of file > drivers/video/console/fbcon_rotate.h, use --include-removal to > override > dpkg-source: warning: ignoring deletion of file > drivers/video/console/fbcon.h, use --include-removal to override > dpkg-source: warning: ignoring deletion of file > drivers/video/console/fbcon_cw.c, use --include-removal to override > dpkg-source: warning: ignoring deletion of file > drivers/video/console/fbcon_rotate.c, use --include-removal to > override > dpkg-source: warning: ignoring deletion of file > drivers/video/console/fbcon.c, use --include-removal to override > > > ... > > > dpkg-source: info: use the '3.0 (quilt)' format to have separate and > documented changes to upstream files, see dpkg-source(1) > dpkg-source: error: unrepresentable changes to source > > > Do you have a clue? It looks like making the tarball (or renaming it) failed, and dpkg-source picked up and older orig.tar.gz with same name. I think a full log would be useful here, because there probably is bug here in my patch. >> +cat <<EOF > debian/rules >> +#!/usr/bin/make -f >> + >> +build: >> + \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} KBUILD_SRC= >> + >> +binary-arch: >> + \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} KBUILD_SRC= intdeb-pkg >> + >> +clean: >> + rm -rf debian/*tmp debian/files >> + mv debian/ debian.backup # debian/ might be cleaned away >> + \$(MAKE) clean >> + mv debian.backup debian > > > "mv debian debian.backup" is unnecessary, I think. > > > I think you saw > > clean-dirs += $(objtree)/debian/ > > in scripts/package/Makefile. > Please notice this is cleaned-up by "make mrproper" > because Kbuild does not descend under scripts/ for "make clean". That is how it was in the old version of builddeb as well. I'll submit another patch to remove the mv-in-clean hack. Riku -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
