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, email to debian-kernel-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/alpine.lnx.2.01.1208141710580.18...@frira.zrqbmnf.qr
Re: [PATCH] scripts/package/builddeb: upgrade to current practices
Martin-Éric Racine writes: > Does the kernel look for modules in versioned, then non-versioned > directories, in that order? More importantly, does it even attempt > looking in the versioned directory at all? /lib/udev/firmware.agent does this: FIRMWARE_DIRS="/lib/firmware/$(uname -r) /lib/firmware /usr/local/lib/firmware /usr/lib/hotplug/firmware" for DIR in $FIRMWARE_DIRS; do [ -e "$DIR/$FIRMWARE" ] || continue Bjørn -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/871uk9bikl@nemi.mork.no
Re: [PATCH] scripts/package/builddeb: upgrade to current practices
maximilian attems writes: > Jonathan already answered it, saying that firmwares are put > in versioned dir. > > Just use git to look it up, easy: > ~/src/linux-next (master %=)$ git log scripts/package/builddeb > > 6607ddadf93d19c7f64139f1475c342152f39fe5 But..but.. won't that prevent installing firmware for more than one builddeb kernel? I.e., shouldn't the fw package name also be versioned if you are going to do this (which it seems you are)? But then again, I thought versioned firmware was dropped from the official packages for good reasons. Any reason why you couldn't add /lib/firmware/something (where "something" is fixed and independent of version) to the firmware.agent search path, and use that for unofficial linux-firmware packages? That would allow unofficial firmware packages from different kernel versions to continue sharing their package name without conflicting with the official packages in any way. Bjørn -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/87629lbjdy@nemi.mork.no
Re: [PATCH] scripts/package/builddeb: upgrade to current practices
2012/7/18 maximilian attems : > On Wed, Jul 18, 2012 at 02:19:25AM +0300, Martin-Éric Racine wrote: >> 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. >> >> Exactly what is wrong with this fix? Could you tell us exactly what >> you did differently and why? > > Jonathan already answered it, saying that firmwares are put > in versioned dir. Does the kernel look for modules in versioned, then non-versioned directories, in that order? More importantly, does it even attempt looking in the versioned directory at all? Martin-Éric -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/capzxpqdkfw5udaj-ufqlxkqtrq+jvoffodu9cq4wlyq0zha...@mail.gmail.com
Re: [PATCH] scripts/package/builddeb: upgrade to current practices
On Wed, Jul 18, 2012 at 02:19:25AM +0300, Martin-Éric Racine wrote: > 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. > > Exactly what is wrong with this fix? Could you tell us exactly what > you did differently and why? Jonathan already answered it, saying that firmwares are put in versioned dir. Just use git to look it up, easy: ~/src/linux-next (master %=)$ git log scripts/package/builddeb 6607ddadf93d19c7f64139f1475c342152f39fe5 Your conflict would mean to kick out the official debian firmware packages which is not something we want! -- maks -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20120718065615.gw28...@vostochny.stro.at
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, email to debian-kernel-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/CAPZXPQfBPXaRtK3QdY_PA=3grruz9+y3au-2avedvtwn8to...@mail.gmail.com
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, email to debian-kernel-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20120717232741.GE25325@burratino
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, email to debian-kernel-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20120717212305.gv28...@vostochny.stro.at
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, email to debian-kernel-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/CAPZXPQc02onTb_RmgfpW+A4=N_huZW1FUYdjJ=nt0y3pq...@mail.gmail.com
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, email to debian-kernel-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20120717193951.GA15208@burratino
