| Message ID | 20181213080711.8907-1-riku.voipio@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | deb-pkg: generate correct build dependencies | expand |
On Thu, Dec 13, 2018 at 5:07 PM <riku.voipio@linaro.org> wrote: > > From: Riku Voipio <riku.voipio@linaro.org> The code looks good to me. Just a comment about the commit log. > bison/flex is now needed always for building since genksyms is always > generated. I do not think this is true. genksyms is built when CONFIG_MODVERSIONS=y (See scripts/Makefile) Rather, bison/flex is always needed for kconfig. > Some build dependencies depend on kernel configuration, > enable them as needed: > > - libelf-dev when UNWINDER_ORC is set > - libssl-dev for SYSTEM_TRUSTED_KEYRING > > Since the libssl-dev is needed for extract_cert binary, denote with > :native to install the libssl-dev for the build machines architecture, > rather than for the architecture of the kernel being built. > > Signed-off-by: Riku Voipio <riku.voipio@linaro.org> > --- > scripts/package/mkdebian | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian > index edcad61fe3cd..c858abf4569e 100755 > --- a/scripts/package/mkdebian > +++ b/scripts/package/mkdebian > @@ -134,6 +134,8 @@ fi > > mkdir -p debian/ > echo $debarch > debian/arch > +extra_build_depends=", $(if_enabled_echo UNWINDER_ORC libelf-dev)" > +extra_build_depends="$extra_build_depends, $(if_enabled_echo SYSTEM_TRUSTED_KEYRING libssl-dev:native)" > > # Generate a simple changelog template > cat <<EOF > debian/changelog > @@ -170,7 +172,7 @@ Source: $sourcename > Section: kernel > Priority: optional > Maintainer: $maintainer > -Build-Depends: bc, kmod, cpio > +Build-Depends: bc, kmod, cpio, bison, flex $extra_build_depends > Homepage: http://www.kernel.org/ > > Package: $packagename > -- > 2.19.2 >
On Thu, Dec 13, 2018 at 10:07:11AM +0200, riku.voipio@linaro.org wrote: > From: Riku Voipio <riku.voipio@linaro.org> > > bison/flex is now needed always for building since genksyms is always > generated. Some build dependencies depend on kernel configuration, > enable them as needed: > > - libelf-dev when UNWINDER_ORC is set > - libssl-dev for SYSTEM_TRUSTED_KEYRING > > Since the libssl-dev is needed for extract_cert binary, denote with > :native to install the libssl-dev for the build machines architecture, > rather than for the architecture of the kernel being built. > > Signed-off-by: Riku Voipio <riku.voipio@linaro.org> Tested-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Regards, Mani > --- > scripts/package/mkdebian | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian > index edcad61fe3cd..c858abf4569e 100755 > --- a/scripts/package/mkdebian > +++ b/scripts/package/mkdebian > @@ -134,6 +134,8 @@ fi > > mkdir -p debian/ > echo $debarch > debian/arch > +extra_build_depends=", $(if_enabled_echo UNWINDER_ORC libelf-dev)" > +extra_build_depends="$extra_build_depends, $(if_enabled_echo SYSTEM_TRUSTED_KEYRING libssl-dev:native)" > > # Generate a simple changelog template > cat <<EOF > debian/changelog > @@ -170,7 +172,7 @@ Source: $sourcename > Section: kernel > Priority: optional > Maintainer: $maintainer > -Build-Depends: bc, kmod, cpio > +Build-Depends: bc, kmod, cpio, bison, flex $extra_build_depends > Homepage: http://www.kernel.org/ > > Package: $packagename > -- > 2.19.2 >
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index edcad61fe3cd..c858abf4569e 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -134,6 +134,8 @@ fi mkdir -p debian/ echo $debarch > debian/arch +extra_build_depends=", $(if_enabled_echo UNWINDER_ORC libelf-dev)" +extra_build_depends="$extra_build_depends, $(if_enabled_echo SYSTEM_TRUSTED_KEYRING libssl-dev:native)" # Generate a simple changelog template cat <<EOF > debian/changelog @@ -170,7 +172,7 @@ Source: $sourcename Section: kernel Priority: optional Maintainer: $maintainer -Build-Depends: bc, kmod, cpio +Build-Depends: bc, kmod, cpio, bison, flex $extra_build_depends Homepage: http://www.kernel.org/ Package: $packagename