On Sat, Mar 09, 2019 at 06:43:05PM +0300, Arseny Maslennikov wrote: > It is widely known that one can build a kernel without a .config in the > source tree by setting KCONFIG_CONFIG equal to the actual configuration > file path. > > When making a *-pkg target, make(1) prepares a source tarball and tries > to pack `.config' in there regardless of the value of KCONFIG_CONFIG, > failing spectacularly if .config is absent and packing the wrong config > if it exists. > Let's fix that by including whatever KCONFIG_CONFIG points to in the > archive under the traditional name `.config'. > > We have to pass --absolute-names to tar, since it seems to trim the > paths of archive members first and only then consider --transform, which > breaks KCONFIG_CONFIG=../../some.config, as well as absolute paths. One way to avoid --absolute-names here is to do the dance below: > > Signed-off-by: Arseny Maslennikov <ar@xxxxxxxxx> > --- > scripts/package/Makefile | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/scripts/package/Makefile b/scripts/package/Makefile > index 2c6de21e5152..134cefee068d 100644 > --- a/scripts/package/Makefile > +++ b/scripts/package/Makefile > @@ -27,7 +27,7 @@ KDEB_SOURCENAME ?= linux-$(KERNELRELEASE) > KBUILD_PKG_ROOTCMD ?="fakeroot -u" > export KDEB_SOURCENAME > # Include only those top-level files that are needed by make, plus the GPL copy > -TAR_CONTENT := $(KBUILD_ALLDIRS) .config .scmversion Makefile \ > +TAR_CONTENT := $(KBUILD_ALLDIRS) $(KCONFIG_CONFIG) .scmversion Makefile \ > Kbuild Kconfig COPYING $(wildcard localversion*) > MKSPEC := $(srctree)/scripts/package/mkspec > > @@ -44,6 +44,7 @@ if test "$(objtree)" != "$(srctree)"; then \ > fi ; \ > $(srctree)/scripts/setlocalversion --save-scmversion; \ +cp $(KCONFIG_CONFIG) .tmp.config-tarball > tar -cz $(RCS_TAR_IGNORE) -f $(2).tar.gz \ + --absolute-names --transform 's:^.tmp.config-tarball$$:.config:S' \ > --transform 's:^:$(2)/:S' $(TAR_CONTENT) $(3); \ +rm -f .tmp.config-tarball > rm -f $(objtree)/.scmversion > > -- > 2.20.1 > I'm not sure if this is strictly better.
Attachment:
signature.asc
Description: PGP signature
