| Message ID | 1434010298-21445-1-git-send-email-riku.voipio@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2015-06-11 10:11, riku.voipio@linaro.org wrote: > From: Riku Voipio <riku.voipio@linaro.org> > > Make deb-pkg build both source and binary package like make rpm-pkg does. > For people who only need binary kernel package, there is now bindeb-pkg > target, same target also used to build the .deb files if built from the > source package using dpkg-buildpackage. > > Generated source package will build the same kernel .config than what > was available for make deb-pkg. The name of the source package can > be set with KDEB_SOURCENAME enviroment variable. > > The source package is useful for gpl compliance, or for feeding to a > automated debian package builder. > > Cc: Chris J Arges <chris.j.arges@canonical.com> > Cc: maximilian attems <maks@stro.at> > Cc: Ben Hutchings <ben@decadent.org.uk> > Signed-off-by: Riku Voipio <riku.voipio@linaro.org> > --- > v3, > * Allow setting source package name with KDEB_SOURCENAME > * Fix issues noted by Ben: drop python and fix target in debian/rules > * Merge "ensure $MAKE can use jobserver" oneliner from Chris J Arges Ben, are you OK with the v3 of this patch? Thanks, Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 2015-08-19 at 15:36 +0200, Michal Marek wrote: > On 2015-06-11 10:11, riku.voipio@linaro.org wrote: > > From: Riku Voipio <riku.voipio@linaro.org> > > > > Make deb-pkg build both source and binary package like make rpm-pkg does. > > For people who only need binary kernel package, there is now bindeb-pkg > > target, same target also used to build the .deb files if built from the > > source package using dpkg-buildpackage. > > > > Generated source package will build the same kernel .config than what > > was available for make deb-pkg. The name of the source package can > > be set with KDEB_SOURCENAME enviroment variable. > > > > The source package is useful for gpl compliance, or for feeding to a > > automated debian package builder. > > > > Cc: Chris J Arges <chris.j.arges@canonical.com> > > Cc: maximilian attems <maks@stro.at> > > Cc: Ben Hutchings <ben@decadent.org.uk> > > Signed-off-by: Riku Voipio <riku.voipio@linaro.org> > > --- > > v3, > > * Allow setting source package name with KDEB_SOURCENAME > > * Fix issues noted by Ben: drop python and fix target in debian/rules > > * Merge "ensure $MAKE can use jobserver" oneliner from Chris J Arges > > Ben, > > are you OK with the v3 of this patch? I've gone through this with Riku and found a couple of problems: - The 'clean' rule in the generated debian/rules calls 'make clean', but scripts/package/Makefile includes debian/ in clean-dirs. Currently that directory does not get removed for some reason, but I think that's a bug and the clean rule in debian/rules should guard against removal. - Building of the 'orig' tarball uses git, i.e. it depends on the kernel source being in a git repository and not simply unpacked from a tarball (or from other VCS). The rpmpkg target doesn't have this same restriction. I leave it to you to decide whether these are important enough to block it. Ben.
On Fri, Aug 21, 2015 at 11:08:44AM +0200, Ben Hutchings wrote: > I've gone through this with Riku and found a couple of problems: > > - The 'clean' rule in the generated debian/rules calls 'make clean', > but scripts/package/Makefile includes debian/ in clean-dirs. > Currently that directory does not get removed for some reason, but I > think that's a bug and the clean rule in debian/rules should guard > against removal. Good catch. make clean is indeed supposed to delete the debian/ directory. > - Building of the 'orig' tarball uses git, i.e. it depends on the > kernel source being in a git repository and not simply unpacked from > a tarball (or from other VCS). The rpmpkg target doesn't have this > same restriction. Right. make rpm uses the KBUILD_ALLDIRS to generate the tarball. It's not perfect, but it behaves consistently. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 21 August 2015 at 15:38, Michal Marek <mmarek@suse.cz> wrote: > > On Fri, Aug 21, 2015 at 11:08:44AM +0200, Ben Hutchings wrote: > > I've gone through this with Riku and found a couple of problems: > > > > - The 'clean' rule in the generated debian/rules calls 'make clean', > > but scripts/package/Makefile includes debian/ in clean-dirs. > > Currently that directory does not get removed for some reason, but I > > think that's a bug and the clean rule in debian/rules should guard > > against removal. > > Good catch. make clean is indeed supposed to delete the debian/ > directory. It looks like debian/ directory isn't cleaned because "scripts" is missing from "clean-dirs" in the kernel top-level Makefile - it is in mroper-dirs, and thus debian/ vanishes when "make mrproper" is run. I'm quite surprised that "clean-dirs" in toplevel makefile means "recurse" but deeper in directory tree it starts meaning "rm -rf this".. If clean-dirs is fixed to remove debian/, this will be annoying to fix in this patch. > > - Building of the 'orig' tarball uses git, i.e. it depends on the > > kernel source being in a git repository and not simply unpacked from > > a tarball (or from other VCS). The rpmpkg target doesn't have this > > same restriction. > > Right. make rpm uses the KBUILD_ALLDIRS to generate the tarball. It's > not perfect, but it behaves consistently. Changing this to match rpmpkg behaviour makes sense. -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/scripts/package/Makefile b/scripts/package/Makefile index 99ca6e7..f97857c 100644 --- a/scripts/package/Makefile +++ b/scripts/package/Makefile @@ -84,11 +84,15 @@ quiet_cmd_builddeb = BUILDDEB } && \ \ $$KBUILD_PKG_ROOTCMD $(CONFIG_SHELL) \ - $(srctree)/scripts/package/builddeb + $(srctree)/scripts/package/builddeb $@ deb-pkg: FORCE $(MAKE) KBUILD_SRC= - $(call cmd,builddeb) + +$(call cmd,builddeb) + +bindeb-pkg: FORCE + $(MAKE) KBUILD_SRC= + +$(call cmd,builddeb) clean-dirs += $(objtree)/debian/ @@ -133,8 +137,9 @@ perf-%pkg: FORCE # --------------------------------------------------------------------------- help: FORCE @echo ' rpm-pkg - Build both source and binary RPM kernel packages' - @echo ' binrpm-pkg - Build only the binary kernel package' - @echo ' deb-pkg - Build the kernel as a deb package' + @echo ' binrpm-pkg - Build only the binary kernel RPM package' + @echo ' deb-pkg - Build both source and binary deb kernel packages' + @echo ' bindeb-pkg - Build only the binary kernel deb package' @echo ' tar-pkg - Build the kernel as an uncompressed tarball' @echo ' targz-pkg - Build the kernel as a gzip compressed tarball' @echo ' tarbz2-pkg - Build the kernel as a bzip2 compressed tarball' diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 0ccd7ee..079a84b 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -79,6 +79,12 @@ if [ -n "$KDEB_PKGVERSION" ]; then else packageversion=$version-$revision fi +if [ -n "$KDEB_SOURCENAME" ]; then + sourcename=$KDEB_SOURCENAME +else + sourcename=linux-upstream +fi +tmpdir="$objtree/debian/tmp" tmpdir="$objtree/debian/tmp" fwdir="$objtree/debian/fwtmp" kernel_headers_dir="$objtree/debian/hdrtmp" @@ -238,7 +244,7 @@ fi # Generate a simple changelog template cat <<EOF > debian/changelog -linux-upstream ($packageversion) $distribution; urgency=low +$sourcename ($packageversion) $distribution; urgency=low * Custom built Linux kernel. @@ -265,12 +271,16 @@ On Debian GNU/Linux systems, the complete text of the GNU General Public License version 2 can be found in \`/usr/share/common-licenses/GPL-2'. EOF + +build_depends="bc, kmod, cpio " + # Generate a control file cat <<EOF > debian/control -Source: linux-upstream +Source: $sourcename Section: kernel Priority: optional Maintainer: $maintainer +Build-Depends: $build_depends Standards-Version: 3.8.4 Homepage: http://www.kernel.org/ EOF @@ -391,4 +401,33 @@ EOF create_package "$dbg_packagename" "$dbg_dir" fi +if [ "x$1" = "xdeb-pkg" ] +then + cat <<EOF > debian/rules +#!/usr/bin/make -f + +build: + cp debian/config .config + \$(MAKE) oldconfig + +binary-arch: + \$(MAKE) KDEB_SOURCENAME=${sourcename} KDEB_PKGVERSION=${packageversion} bindeb-pkg + +clean: + \$(MAKE) clean + +binary: binary-arch +EOF + + (cd $KBUILD_SRC; git archive --prefix=${sourcename}-${version}/ HEAD)|gzip -9 > ../${sourcename}_${version}.orig.tar.gz + cp $KCONFIG_CONFIG debian/config + tar caf ../${sourcename}_${packageversion}.debian.tar.gz debian/{config,copyright,rules,changelog,control} + dpkg-source -cdebian/control -ldebian/changelog --format="3.0 (custom)" --target-format="3.0 (quilt)" \ + -b / ../${sourcename}_${version}.orig.tar.gz ../${sourcename}_${packageversion}.debian.tar.gz + mv ${sourcename}_${packageversion}*dsc .. + dpkg-genchanges > ../${sourcename}_${packageversion}_${debarch}.changes +else + dpkg-genchanges -b > ../${sourcename}_${packageversion}_${debarch}.changes +fi + exit 0