| Message ID | ce356ed3-4bee-6855-6906-a8bee29e7fde@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Dne 12.7.2016 v 21:42 Marcin Mielniczuk napsal(a): > When calling `make deb-pkg` on a system with no codename (for example > Arch Linux), lsb_release sometimes outputs `n/a` as the codename. > > This breaks dpkg-parsechangelog, which can't process the changelog > correctly. > > Signed-off-by: Marcin Mielniczuk <marmistrz.dev@gmail.com> > > --- > > diff --git a/scripts/package/builddeb b/scripts/package/builddeb > index 86e56fe..87753f5 100755 > --- a/scripts/package/builddeb > +++ b/scripts/package/builddeb > @@ -238,7 +238,8 @@ maintainer="$name <$email>" > # Try to determine distribution > if [ -n "$KDEB_CHANGELOG_DIST" ]; then > distribution=$KDEB_CHANGELOG_DIST > -elif distribution=$(lsb_release -cs 2>/dev/null) && [ -n > "$distribution" ]; then > +# In some cases lsb_release returns the codename as n/a, which breaks > dpkg-parsechangelog > +elif distribution=$(lsb_release -cs 2>/dev/null) && [ -n > "$distribution" ] && [ "$distribution" != "n/a" ]; then > : # nothing to do in this case > else > distribution="unstable" Applied, but please fix your mailer to send properly formatted patches. The easiest test is to send a patch to yourself, save it and try to apply it with 'git am'. 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
diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 86e56fe..87753f5 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -238,7 +238,8 @@ maintainer="$name <$email>" # Try to determine distribution if [ -n "$KDEB_CHANGELOG_DIST" ]; then distribution=$KDEB_CHANGELOG_DIST -elif distribution=$(lsb_release -cs 2>/dev/null) && [ -n "$distribution" ]; then +# In some cases lsb_release returns the codename as n/a, which breaks dpkg-parsechangelog +elif distribution=$(lsb_release -cs 2>/dev/null) && [ -n "$distribution" ] && [ "$distribution" != "n/a" ]; then
When calling `make deb-pkg` on a system with no codename (for example Arch Linux), lsb_release sometimes outputs `n/a` as the codename. This breaks dpkg-parsechangelog, which can't process the changelog correctly. Signed-off-by: Marcin Mielniczuk <marmistrz.dev@gmail.com> --- : # nothing to do in this case else distribution="unstable" -- 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