Re: [PATCH] scripts/package/builddeb: upgrade to current practices
On Tuesday 2012-07-17 21:46, Martin-Éric Racine wrote: >>> @@ -188,17 +188,17 @@ 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-2012 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 >>> +The GIT repository for mainline kernel development is at: >>> +git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git >> >> I personally like to spell it as "Git". ;-) > >That works for me too. Actually, what's the official spelling for it? The acronymic usage of "GIT" to mean Global Information Tracker has not caught on. Therefore most likely "Git"; like "Linux", a noun, a name. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] scripts/package/builddeb: upgrade to current practices
Martin-Éric Racine wrote: > Could you tell us exactly what > you did differently and why? At least the "what" should be answerable by looking at what is in linux-next. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] scripts/package/builddeb: upgrade to current practices
2012/7/18 maximilian attems : > On Tue, Jul 17, 2012 at 10:46:23PM +0300, Martin-Éric Racine wrote: >> 2012/7/17 Jonathan Nieder : >> >> >> >> Package: $fwpackagename >> >> Architecture: all >> >> +Conflicts: firmware-linux-free, firmware-linux-nonfree >> >> +Provides: firmware-linux-free, firmware-linux-nonfree >> >> +Replaces: firmware-linux-free, firmware-linux-nonfree >> > >> > I assume you mean Breaks+Replaces. Do the files actually overlap, >> > or is this change being overly cautious? I would expect the files >> > not to overlap because the package build with deb-pkg puts firmware >> > in a versioned subdirectory "/lib/firmware/". >> >> AFAIK they would overlap, hence the Conflicts. > > This is wrong and properly fixed in -next. Max, Exactly what is wrong with this fix? Could you tell us exactly what you did differently and why? Martin-Éric -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] scripts/package/builddeb: upgrade to current practices
On Tue, Jul 17, 2012 at 10:46:23PM +0300, Martin-Éric Racine wrote: > 2012/7/17 Jonathan Nieder : > >> > >> Package: $fwpackagename > >> Architecture: all > >> +Conflicts: firmware-linux-free, firmware-linux-nonfree > >> +Provides: firmware-linux-free, firmware-linux-nonfree > >> +Replaces: firmware-linux-free, firmware-linux-nonfree > > > > I assume you mean Breaks+Replaces. Do the files actually overlap, > > or is this change being overly cautious? I would expect the files > > not to overlap because the package build with deb-pkg puts firmware > > in a versioned subdirectory "/lib/firmware/". > > AFAIK they would overlap, hence the Conflicts. This is wrong and properly fixed in -next. -- maks -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] scripts/package/builddeb: upgrade to current practices
2012/7/17 Jonathan Nieder : > Hi, > > Martin-Éric Racine wrote: > >> Signed-off-by: Martin-Éric Racine > > Thanks. This patch does many things at once instead of the usual > practice of "one patch per logical change", but oh well. > > [...] >> --- a/scripts/package/builddeb >> +++ b/scripts/package/builddeb >> @@ -79,9 +79,9 @@ fwdir="$objtree/debian/fwtmp" >> kernel_headers_dir="$objtree/debian/hdrtmp" >> libc_headers_dir="$objtree/debian/headertmp" >> packagename=linux-image-$version >> -fwpackagename=linux-firmware-image >> kernel_headers_packagename=linux-headers-$version >> libc_headers_packagename=linux-libc-dev >> +fwpackagename=firmware-linux > > Micronit: any reason the lines are reordered here? Mostly to differenciate between versioned and non-versioned package targets. >> @@ -188,17 +188,17 @@ 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-2012 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 >> +The GIT repository for mainline kernel development is at: >> +git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git > > I personally like to spell it as "Git". ;-) That works for me too. Actually, what's the official spelling for it? > [...] >> @@ -273,6 +273,9 @@ if [ -e "$tmpdir/lib/firmware" ]; then >> >> Package: $fwpackagename >> Architecture: all >> +Conflicts: firmware-linux-free, firmware-linux-nonfree >> +Provides: firmware-linux-free, firmware-linux-nonfree >> +Replaces: firmware-linux-free, firmware-linux-nonfree > > I assume you mean Breaks+Replaces. Do the files actually overlap, > or is this change being overly cautious? I would expect the files > not to overlap because the package build with deb-pkg puts firmware > in a versioned subdirectory "/lib/firmware/". AFAIK they would overlap, hence the Conflicts. Martin-Éric -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] scripts/package/builddeb: upgrade to current practices
Hi, Martin-Éric Racine wrote: > Signed-off-by: Martin-Éric Racine Thanks. This patch does many things at once instead of the usual practice of "one patch per logical change", but oh well. [...] > --- a/scripts/package/builddeb > +++ b/scripts/package/builddeb > @@ -79,9 +79,9 @@ fwdir="$objtree/debian/fwtmp" > kernel_headers_dir="$objtree/debian/hdrtmp" > libc_headers_dir="$objtree/debian/headertmp" > packagename=linux-image-$version > -fwpackagename=linux-firmware-image > kernel_headers_packagename=linux-headers-$version > libc_headers_packagename=linux-libc-dev > +fwpackagename=firmware-linux Micronit: any reason the lines are reordered here? > @@ -188,17 +188,17 @@ 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-2012 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 > +The GIT repository for mainline kernel development is at: > +git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git I personally like to spell it as "Git". ;-) [...] > @@ -273,6 +273,9 @@ if [ -e "$tmpdir/lib/firmware" ]; then > > Package: $fwpackagename > Architecture: all > +Conflicts: firmware-linux-free, firmware-linux-nonfree > +Provides: firmware-linux-free, firmware-linux-nonfree > +Replaces: firmware-linux-free, firmware-linux-nonfree I assume you mean Breaks+Replaces. Do the files actually overlap, or is this change being overly cautious? I would expect the files not to overlap because the package build with deb-pkg puts firmware in a versioned subdirectory "/lib/firmware/". Hope that helps, Jonathan -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] scripts/package/builddeb: upgrade to current practices
This patch sanitizes and updates the Debian package building script: 1) Updates $fwpackagename to 'firmware-linux' as used by Debian, 2) Removes trailing whitespace, 3) Updates Linus' copyright in the generated packaging files, 4) Updates URL of Linus' GIT tree in the generated packaging files, 5) Removes obsolete references to linux-2.6, 6) Adds installation of missing subarch components to header package, 7) Adds dependency relationships to the firmware package. Signed-off-by: Martin-Éric Racine --- scripts/package/builddeb | 25 ++--- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index c95fdda..44ef3d1 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -79,9 +79,9 @@ fwdir="$objtree/debian/fwtmp" kernel_headers_dir="$objtree/debian/hdrtmp" libc_headers_dir="$objtree/debian/headertmp" packagename=linux-image-$version -fwpackagename=linux-firmware-image kernel_headers_packagename=linux-headers-$version libc_headers_packagename=linux-libc-dev +fwpackagename=firmware-linux if [ "$ARCH" = "um" ] ; then packagename=user-mode-linux-$version @@ -109,7 +109,7 @@ if [ "$ARCH" = "um" ] ; then cp .config "$tmpdir/usr/share/doc/$packagename/config" gzip "$tmpdir/usr/share/doc/$packagename/config" cp $KBUILD_IMAGE "$tmpdir/usr/bin/linux-$version" -else +else cp System.map "$tmpdir/boot/System.map-$version" cp .config "$tmpdir/boot/config-$version" # Not all arches include the boot path in KBUILD_IMAGE @@ -188,17 +188,17 @@ 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-2012 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 +The GIT repository for mainline kernel development is at: +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 the Free Software Foundation; version 2 dated June, 1991. On Debian GNU/Linux systems, the complete text of the GNU General Public -License version 2 can be found in \`/usr/share/common-licenses/GPL-2'. +License version 2 can be found in /usr/share/common-licenses/GPL-2. EOF # Generate a control file @@ -215,7 +215,7 @@ if [ "$ARCH" = "um" ]; then cat <> debian/control Package: $packagename -Provides: linux-image, linux-image-2.6, linux-modules-$version +Provides: linux-image, linux-modules-$version Architecture: any Description: User Mode Linux kernel, version $version User-mode Linux is a port of the Linux kernel to its own system call @@ -232,7 +232,7 @@ else cat <> debian/control Package: $packagename -Provides: linux-image, linux-image-2.6, linux-modules-$version +Provides: linux-image, linux-modules-$version Suggests: $fwpackagename Architecture: any Description: Linux kernel, version $version @@ -243,7 +243,7 @@ EOF fi # Build header package -(cd $srctree; find . -name Makefile -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles") +(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles") (cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles") (cd $objtree; find arch/$SRCARCH/include .config Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles") destdir=$kernel_headers_dir/usr/src/linux-headers-$version @@ -257,12 +257,12 @@ arch=$(dpkg --print-architecture) cat <> debian/control Package: $kernel_headers_packagename -Provides: linux-headers, linux-headers-2.6 +Provides: linux-headers Architecture: $arch Description: Linux kernel headers for $KERNELRELEASE on $arch This package provides kernel header files for $KERNELRELEASE on $arch . - This is useful for people who need to build external modules + This is useful for people who need to build external modules. EOF # Do we have firmware? Move it out of the way and build it into a package. @@ -273,6 +273,9 @@ if [ -e "$tmpdir/lib/firmware" ]; then Package: $fwpackagename Architecture: all +Conflicts: firmware-linux-free, firmware-linux-nonfree +Provides: firmware-linux-free, firmware-linux-nonfree +Replaces: firmware-linux-free, firmware-linux-nonfree Description: Linux kernel firmware, version $version This package contains firmware from the Linux kernel, version $version. EOF -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.t
