| Message ID | 20190309154307.23039-2-ar@cs.msu.ru (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/3] scripts/package/Makefile: put proper config in source tarball | expand |
On Sun, Mar 10, 2019 at 12:44 AM Arseny Maslennikov <ar@cs.msu.ru> wrote: > > * The man page for dpkg-source(1) notes: > > > -b, --build directory [format-specific-parameters] > > Build a source package (--build since dpkg 1.17.14). > > <...> > > > > dpkg-source will build the source package with the first > > format found in this ordered list: the format indicated > > with the --format command line option, the format > > indicated in debian/source/format, “1.0”. The fallback > > to “1.0” is deprecated and will be removed at some point > > in the future, you should always document the desired > > source format in debian/source/format. See section > > SOURCE PACKAGE FORMATS for an extensive description of > > the various source package formats. > > Thus it would be more foolproof to explicitly use 1.0 (as we always > did) than to rely on dpkg-source's defaults. > > * In a similar vein, debian/rules is not made executable by mkdebian, > and dpkg-source warns about that but still silently fixes the file. > Let's be explicit once again. > > Signed-off-by: Arseny Maslennikov <ar@cs.msu.ru> > --- Applied to linux-kbuild. Thanks. > scripts/package/mkdebian | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian > index f030961c5165..d276eb671a27 100755 > --- a/scripts/package/mkdebian > +++ b/scripts/package/mkdebian > @@ -132,7 +132,9 @@ else > echo >&2 "Install lsb-release or set \$KDEB_CHANGELOG_DIST explicitly" > fi > > -mkdir -p debian/ > +mkdir -p debian/source/ > +echo "1.0" > debian/source/format > + > echo $debarch > debian/arch > > # Generate a simple changelog template > @@ -221,5 +223,6 @@ clean: > > binary: binary-arch > EOF > +chmod +x debian/rules > > exit 0 > -- > 2.20.1 >
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index f030961c5165..d276eb671a27 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -132,7 +132,9 @@ else echo >&2 "Install lsb-release or set \$KDEB_CHANGELOG_DIST explicitly" fi -mkdir -p debian/ +mkdir -p debian/source/ +echo "1.0" > debian/source/format + echo $debarch > debian/arch # Generate a simple changelog template @@ -221,5 +223,6 @@ clean: binary: binary-arch EOF +chmod +x debian/rules exit 0