| Message ID | 1420210672-12712-1-git-send-email-sedat.dilek@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jan 02, 2015 at 03:57:52PM +0100, Sedat Dilek wrote: > Happy new 2015! > > I have combined two patches which I had already sent to linux-kbuild ML. Applied to kbuild.git#misc, 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 Fri, Jan 2, 2015 at 4:12 PM, Michal Marek <mmarek@suse.cz> wrote: > On Fri, Jan 02, 2015 at 03:57:52PM +0100, Sedat Dilek wrote: >> Happy new 2015! >> >> I have combined two patches which I had already sent to linux-kbuild ML. > > Applied to kbuild.git#misc, thanks. > /o\ Just FYI... I will send out the 3rd in the original triple as "[RFC RESEND] builddeb: Try to determine distribution" against kbuild-next. From the discussion: max had some concerns and if I remember correctly I got no alternativ proposal from him. Today, I asked friends on #grml on how to do it better. I will try to find out if I can ensure lsb_release binary is available in all supported Debian/Ubuntu release. Not sure if this really necessary. - Sedat - -- 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 Fri, 2015-01-02 at 16:18 +0100, Sedat Dilek wrote: > On Fri, Jan 2, 2015 at 4:12 PM, Michal Marek <mmarek@suse.cz> wrote: > > On Fri, Jan 02, 2015 at 03:57:52PM +0100, Sedat Dilek wrote: > >> Happy new 2015! > >> > >> I have combined two patches which I had already sent to linux-kbuild ML. > > > > Applied to kbuild.git#misc, thanks. > > > > /o\ > > Just FYI... > I will send out the 3rd in the original triple as "[RFC RESEND] > builddeb: Try to determine distribution" against kbuild-next. > From the discussion: > max had some concerns and if I remember correctly I got no alternativ > proposal from him. > Today, I asked friends on #grml on how to do it better. > I will try to find out if I can ensure lsb_release binary is available > in all supported Debian/Ubuntu release. > Not sure if this really necessary. lsb-release is still not essential or build-essential in Debian. The distribution (queue) name in the changelog only matters when uploading to a distribution's package repository, and a builddeb- generated binary package generally won't be accepted into such a repository as there is no corresponding Debian-format source package. In case some Debian derivative or private repository does accept builddeb-generated binary packages, perhaps it is useful to allow changing the distribution name from 'unstable'. But the distribution (queue) name doesn't necessarily match the codename of the running release, so we would need to provide some way to set it explicitly. (E.g. even the official Debian repositories for wheezy have some different queue names: wheezy-proposed-updates, wheezy-security, wheezy-backports.) Apparently this is not needed by most users of builddeb, so we shouldn't warn very loudly if lsb_release fails. So how about something like: if [ -n "$KDEB_CHANGELOG_DIST" ]; then distribution="$KDEB_CHANGELOG_DIST" elif ! distribution="$(lsb_release --codename --short 2>/dev/null)"; then distribution=unstable echo "I: Using default distribution of 'unstable' in the changelog" echo "I: Install lsb-release or set \$KDEB_CHANGELOG_DIST to change this" fi Ben.
On Fri, Jan 2, 2015 at 7:04 PM, Ben Hutchings <ben@decadent.org.uk> wrote: > On Fri, 2015-01-02 at 16:18 +0100, Sedat Dilek wrote: >> On Fri, Jan 2, 2015 at 4:12 PM, Michal Marek <mmarek@suse.cz> wrote: >> > On Fri, Jan 02, 2015 at 03:57:52PM +0100, Sedat Dilek wrote: >> >> Happy new 2015! >> >> >> >> I have combined two patches which I had already sent to linux-kbuild ML. >> > >> > Applied to kbuild.git#misc, thanks. >> > >> >> /o\ >> >> Just FYI... >> I will send out the 3rd in the original triple as "[RFC RESEND] >> builddeb: Try to determine distribution" against kbuild-next. >> From the discussion: >> max had some concerns and if I remember correctly I got no alternativ >> proposal from him. >> Today, I asked friends on #grml on how to do it better. >> I will try to find out if I can ensure lsb_release binary is available >> in all supported Debian/Ubuntu release. >> Not sure if this really necessary. > > lsb-release is still not essential or build-essential in Debian. > > The distribution (queue) name in the changelog only matters when > uploading to a distribution's package repository, and a builddeb- > generated binary package generally won't be accepted into such a > repository as there is no corresponding Debian-format source package. > > In case some Debian derivative or private repository does accept > builddeb-generated binary packages, perhaps it is useful to allow > changing the distribution name from 'unstable'. But the distribution > (queue) name doesn't necessarily match the codename of the running > release, so we would need to provide some way to set it explicitly. > (E.g. even the official Debian repositories for wheezy have some > different queue names: wheezy-proposed-updates, wheezy-security, > wheezy-backports.) > > Apparently this is not needed by most users of builddeb, so we shouldn't > warn very loudly if lsb_release fails. > > So how about something like: > > if [ -n "$KDEB_CHANGELOG_DIST" ]; then > distribution="$KDEB_CHANGELOG_DIST" > elif ! distribution="$(lsb_release --codename --short 2>/dev/null)"; then > distribution=unstable > echo "I: Using default distribution of 'unstable' in the changelog" > echo "I: Install lsb-release or set \$KDEB_CHANGELOG_DIST to change this" > fi > Hi Ben Cool, thanks for your feedback even before I resent my own patch. OK, the idea of setting $KDEB_CHANGELOG_DIST explicitly is excellent I tested with the attached snippet which is more readable to me and all 3 options work. ... # Try to determine distribution codename=$(lsb_release --codename --short) ##codename="" if [ -n "$KDEB_CHANGELOG_DIST" ]; then distribution=$KDEB_CHANGELOG_DIST ##echo "builddeb: Using \$KDEB_CHANGELOG_DIST" elif [ -n "$codename" ]; then distribution=$codename ##echo "builddeb: Using \$codename" else distribution="unstable" echo "builddeb: Using default distribution of 'unstable' in the changelog" echo "builddeb: Install lsb-release or set \$KDEB_CHANGELOG_DIST to change this" fi ... How can I pass the script-name (builddeb) into the echo line without hardcoding it... ... INSTALL debian/headertmp/usr/include/asm/ (65 files) builddeb: Using default distribution of 'unstable' in the changelog builddeb: Install lsb-release or set $KDEB_CHANGELOG_DIST to change this dpkg-deb: building package `linux-headers-3.19.0-rc2-3-loopmq-small' in `../linux-headers-3.19.0-rc2-3-loopmq-small_3.19.0~rc2-3~precise+dileks1_amd64.deb'. dpkg-deb: building package `linux-libc-dev' in `../linux-libc-dev_3.19.0~rc2-3~precise+dileks1_amd64.deb'. dpkg-deb: building package `linux-image-3.19.0-rc2-3-loopmq-small' in `../linux-image-3.19.0-rc2-3-loopmq-small_3.19.0~rc2-3~precise+dileks1_amd64.deb'. ...or "deb-pkg: ..." like above. - Sedat - -- 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 5972624..2c68c8b 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -233,10 +233,10 @@ This is a packacked upstream version of the Linux kernel. The sources may be found at most Linux ftp sites, including: ftp://ftp.kernel.org/pub/linux/kernel -Copyright: 1991 - 2009 Linus Torvalds and others. +Copyright: 1991 - 2015 Linus Torvalds and others. The git repository for mainline kernel development is at: -git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git +git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by
Happy new 2015! I have combined two patches which I had already sent to linux-kbuild ML. Today, I prefer "builddeb" as a label for such patches. [1] http://marc.info/?l=linux-kbuild&m=133521955904706 [2] http://marc.info/?l=linux-kbuild&m=133521955004705 CC: Michal Marek <mmarek@suse.cz> CC: Ben Hutchings <ben@decadent.org.uk> CC: maximilian attems <max@stro.at> CC: linux-kbuild@vger.kernel.org Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com> --- scripts/package/builddeb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)