Bug#832558: [Pkg-dkms-maint] Bug#832558: Fix dkms mkdeb / mkdsc / mkbmdeb
Hello, Done here: https://github.com/dell/dkms/issues/74 BR, Pierre On 16/01/2019 11:31, Gianfranco Costamagna wrote: hello, diverging from upstream makes no sense to me, since the mkdeb approach has been introduced by us... what about discussing this with them and find a common approach? I'm not a direct user of this tool, so I can't have an opinion :) G. Il lunedì 14 gennaio 2019, 13:21:58 CET, Pierre Neyron ha scritto: Hello Gianfranco, Ok, but what mkdeb patch would you like ? a- should it actually include binaries unless source-only is set ? or b- should it generate an arch independent _all.deb package (with man page fixed accordingly) ? I'm more likely to volunteer for b, even if it makes Debian's dkms diverge from upstream in the way mkdeb works... Cheers Pierre On 14/01/2019 13:01, Gianfranco Costamagna wrote: > Hello, > I'm happy to accept an eventual patch :) > > G. > > Il domenica 13 gennaio 2019, 17:10:39 CET, Pierre Neyron > mailto:pierre.ney...@free.fr>> ha scritto: > > > On 13/01/2019 16:18, drake763 wrote: > > Thanks again for your quick and detailed response! > > > > On 1/13/19 2:49 PM, Gianfranco Costamagna wrote: > >> Now, dkms run on amd64 produces binaries for *amd64* architecture, > and if you run the same command > >> on i386 you will produce kernel modules that can run only on *i386* > architecture > > > > In my understanding, running in some src directory (which has to support > > this obviously) > > > > make dkms_mkdeb > > > > produces an architecture independent deb package (hence my thought to > > have the suffix _all.deb). When I then install that very _all.deb > > package with dpkg, DKMS is invoked again and the actual compilation > > takes place where the architecture dependent binary is produced (so dkms > > is invoked twice. Once when creating the package, and again when > installing) > > > > My usecase is applying this patch for intel processors > > (http://linux-phc.org/forum/viewtopic.php?f=7&t=267). I create a deb > > package with make dkms_mkdeb. The resulting deb package actually has no > > binaries inside but only source code and - what I assume are - some > > instructions for DKMS (dkms.conf and some .c and .patch files) for > > actually installing the deb package with dpkg. > > > > Earlier in this thread, this was also discussed > > (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=832558#20). > > > > But then again the currently produced package works. So if no one else > > complains, the behaviour may remain I guess (differentiating among > > binary and non-binary packages just by name is probably not really > needed). > > > > Thanks again for fixing this bug. > > > > Cheers > > Hello, > > I also think `dkms mkdeb' should produce a architecture independent > "_all.deb" package as long as content is source only. > > My patch was taking "source-only" as de facto for mkdeb, because it > seemed to me to make sense with regard to the way I understand the usage > of dkms by Debian. However it does not match what the man page explains > and possibly breaks the way the command should act in some places. > > As a result, keeping mkdeb possibly include the binary modules, hence > have an architecture dependent package (e.g. amd64.deb) seems safer. > > That said however, running `dkms mkdeb' does not seem to include the > binary modules in my tests anyway, either with or without the > --binaries-only flag. > > As a result, it seems to me that the mkdeb command is broken anyway ? > > > All that explains why it was not easy to choose to report the fix > upstream or to just fix it in Debian, I guess. > > Hope this helps > (Hope I got it right...) > > Pierre >
Bug#832558: [Pkg-dkms-maint] Bug#832558: Fix dkms mkdeb / mkdsc / mkbmdeb
hello, diverging from upstream makes no sense to me, since the mkdeb approach has been introduced by us...what about discussing this with them and find a common approach? I'm not a direct user of this tool, so I can't have an opinion :) G. Il lunedì 14 gennaio 2019, 13:21:58 CET, Pierre Neyron ha scritto: Hello Gianfranco, Ok, but what mkdeb patch would you like ? a- should it actually include binaries unless source-only is set ? or b- should it generate an arch independent _all.deb package (with man page fixed accordingly) ? I'm more likely to volunteer for b, even if it makes Debian's dkms diverge from upstream in the way mkdeb works... Cheers Pierre On 14/01/2019 13:01, Gianfranco Costamagna wrote: > Hello, > I'm happy to accept an eventual patch :) > > G. > > Il domenica 13 gennaio 2019, 17:10:39 CET, Pierre Neyron > ha scritto: > > > On 13/01/2019 16:18, drake763 wrote: > > Thanks again for your quick and detailed response! > > > > On 1/13/19 2:49 PM, Gianfranco Costamagna wrote: > >> Now, dkms run on amd64 produces binaries for *amd64* architecture, > and if you run the same command > >> on i386 you will produce kernel modules that can run only on *i386* > architecture > > > > In my understanding, running in some src directory (which has to support > > this obviously) > > > > make dkms_mkdeb > > > > produces an architecture independent deb package (hence my thought to > > have the suffix _all.deb). When I then install that very _all.deb > > package with dpkg, DKMS is invoked again and the actual compilation > > takes place where the architecture dependent binary is produced (so dkms > > is invoked twice. Once when creating the package, and again when > installing) > > > > My usecase is applying this patch for intel processors > > (http://linux-phc.org/forum/viewtopic.php?f=7&t=267). I create a deb > > package with make dkms_mkdeb. The resulting deb package actually has no > > binaries inside but only source code and - what I assume are - some > > instructions for DKMS (dkms.conf and some .c and .patch files) for > > actually installing the deb package with dpkg. > > > > Earlier in this thread, this was also discussed > > (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=832558#20). > > > > But then again the currently produced package works. So if no one else > > complains, the behaviour may remain I guess (differentiating among > > binary and non-binary packages just by name is probably not really > needed). > > > > Thanks again for fixing this bug. > > > > Cheers > > Hello, > > I also think `dkms mkdeb' should produce a architecture independent > "_all.deb" package as long as content is source only. > > My patch was taking "source-only" as de facto for mkdeb, because it > seemed to me to make sense with regard to the way I understand the usage > of dkms by Debian. However it does not match what the man page explains > and possibly breaks the way the command should act in some places. > > As a result, keeping mkdeb possibly include the binary modules, hence > have an architecture dependent package (e.g. amd64.deb) seems safer. > > That said however, running `dkms mkdeb' does not seem to include the > binary modules in my tests anyway, either with or without the > --binaries-only flag. > > As a result, it seems to me that the mkdeb command is broken anyway ? > > > All that explains why it was not easy to choose to report the fix > upstream or to just fix it in Debian, I guess. > > Hope this helps > (Hope I got it right...) > > Pierre >
Bug#832558: [Pkg-dkms-maint] Bug#832558: Fix dkms mkdeb / mkdsc / mkbmdeb
Hello Gianfranco, Ok, but what mkdeb patch would you like ? a- should it actually include binaries unless source-only is set ? or b- should it generate an arch independent _all.deb package (with man page fixed accordingly) ? I'm more likely to volunteer for b, even if it makes Debian's dkms diverge from upstream in the way mkdeb works... Cheers Pierre On 14/01/2019 13:01, Gianfranco Costamagna wrote: Hello, I'm happy to accept an eventual patch :) G. Il domenica 13 gennaio 2019, 17:10:39 CET, Pierre Neyron ha scritto: On 13/01/2019 16:18, drake763 wrote: > Thanks again for your quick and detailed response! > > On 1/13/19 2:49 PM, Gianfranco Costamagna wrote: >> Now, dkms run on amd64 produces binaries for *amd64* architecture, and if you run the same command >> on i386 you will produce kernel modules that can run only on *i386* architecture > > In my understanding, running in some src directory (which has to support > this obviously) > > make dkms_mkdeb > > produces an architecture independent deb package (hence my thought to > have the suffix _all.deb). When I then install that very _all.deb > package with dpkg, DKMS is invoked again and the actual compilation > takes place where the architecture dependent binary is produced (so dkms > is invoked twice. Once when creating the package, and again when installing) > > My usecase is applying this patch for intel processors > (http://linux-phc.org/forum/viewtopic.php?f=7&t=267). I create a deb > package with make dkms_mkdeb. The resulting deb package actually has no > binaries inside but only source code and - what I assume are - some > instructions for DKMS (dkms.conf and some .c and .patch files) for > actually installing the deb package with dpkg. > > Earlier in this thread, this was also discussed > (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=832558#20). > > But then again the currently produced package works. So if no one else > complains, the behaviour may remain I guess (differentiating among > binary and non-binary packages just by name is probably not really needed). > > Thanks again for fixing this bug. > > Cheers Hello, I also think `dkms mkdeb' should produce a architecture independent "_all.deb" package as long as content is source only. My patch was taking "source-only" as de facto for mkdeb, because it seemed to me to make sense with regard to the way I understand the usage of dkms by Debian. However it does not match what the man page explains and possibly breaks the way the command should act in some places. As a result, keeping mkdeb possibly include the binary modules, hence have an architecture dependent package (e.g. amd64.deb) seems safer. That said however, running `dkms mkdeb' does not seem to include the binary modules in my tests anyway, either with or without the --binaries-only flag. As a result, it seems to me that the mkdeb command is broken anyway ? All that explains why it was not easy to choose to report the fix upstream or to just fix it in Debian, I guess. Hope this helps (Hope I got it right...) Pierre
Bug#832558: [Pkg-dkms-maint] Bug#832558: Fix dkms mkdeb / mkdsc / mkbmdeb
Hello,I'm happy to accept an eventual patch :) G. Il domenica 13 gennaio 2019, 17:10:39 CET, Pierre Neyron ha scritto: On 13/01/2019 16:18, drake763 wrote: > Thanks again for your quick and detailed response! > > On 1/13/19 2:49 PM, Gianfranco Costamagna wrote: >> Now, dkms run on amd64 produces binaries for *amd64* architecture, and if >> you run the same command >> on i386 you will produce kernel modules that can run only on *i386* >> architecture > > In my understanding, running in some src directory (which has to support > this obviously) > > make dkms_mkdeb > > produces an architecture independent deb package (hence my thought to > have the suffix _all.deb). When I then install that very _all.deb > package with dpkg, DKMS is invoked again and the actual compilation > takes place where the architecture dependent binary is produced (so dkms > is invoked twice. Once when creating the package, and again when installing) > > My usecase is applying this patch for intel processors > (http://linux-phc.org/forum/viewtopic.php?f=7&t=267). I create a deb > package with make dkms_mkdeb. The resulting deb package actually has no > binaries inside but only source code and - what I assume are - some > instructions for DKMS (dkms.conf and some .c and .patch files) for > actually installing the deb package with dpkg. > > Earlier in this thread, this was also discussed > (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=832558#20). > > But then again the currently produced package works. So if no one else > complains, the behaviour may remain I guess (differentiating among > binary and non-binary packages just by name is probably not really needed). > > Thanks again for fixing this bug. > > Cheers Hello, I also think `dkms mkdeb' should produce a architecture independent "_all.deb" package as long as content is source only. My patch was taking "source-only" as de facto for mkdeb, because it seemed to me to make sense with regard to the way I understand the usage of dkms by Debian. However it does not match what the man page explains and possibly breaks the way the command should act in some places. As a result, keeping mkdeb possibly include the binary modules, hence have an architecture dependent package (e.g. amd64.deb) seems safer. That said however, running `dkms mkdeb' does not seem to include the binary modules in my tests anyway, either with or without the --binaries-only flag. As a result, it seems to me that the mkdeb command is broken anyway ? Question is: how should it be fixed ? - should it actually include binaries unless source-only is set ? or - should it generate an arch independent _all.deb package (with man page fixed accordingly) ? All that explains why it was not easy to choose to report the fix upstream or to just fix it in Debian, I guess. Hope this helps (Hope I got it right...) Pierre
Bug#832558: [Pkg-dkms-maint] Bug#832558: Fix dkms mkdeb / mkdsc / mkbmdeb
On 13/01/2019 16:18, drake763 wrote: Thanks again for your quick and detailed response! On 1/13/19 2:49 PM, Gianfranco Costamagna wrote: Now, dkms run on amd64 produces binaries for *amd64* architecture, and if you run the same command on i386 you will produce kernel modules that can run only on *i386* architecture In my understanding, running in some src directory (which has to support this obviously) make dkms_mkdeb produces an architecture independent deb package (hence my thought to have the suffix _all.deb). When I then install that very _all.deb package with dpkg, DKMS is invoked again and the actual compilation takes place where the architecture dependent binary is produced (so dkms is invoked twice. Once when creating the package, and again when installing) My usecase is applying this patch for intel processors (http://linux-phc.org/forum/viewtopic.php?f=7&t=267). I create a deb package with make dkms_mkdeb. The resulting deb package actually has no binaries inside but only source code and - what I assume are - some instructions for DKMS (dkms.conf and some .c and .patch files) for actually installing the deb package with dpkg. Earlier in this thread, this was also discussed (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=832558#20). But then again the currently produced package works. So if no one else complains, the behaviour may remain I guess (differentiating among binary and non-binary packages just by name is probably not really needed). Thanks again for fixing this bug. Cheers Hello, I also think `dkms mkdeb' should produce a architecture independent "_all.deb" package as long as content is source only. My patch was taking "source-only" as de facto for mkdeb, because it seemed to me to make sense with regard to the way I understand the usage of dkms by Debian. However it does not match what the man page explains and possibly breaks the way the command should act in some places. As a result, keeping mkdeb possibly include the binary modules, hence have an architecture dependent package (e.g. amd64.deb) seems safer. That said however, running `dkms mkdeb' does not seem to include the binary modules in my tests anyway, either with or without the --binaries-only flag. As a result, it seems to me that the mkdeb command is broken anyway ? Question is: how should it be fixed ? - should it actually include binaries unless source-only is set ? or - should it generate an arch independent _all.deb package (with man page fixed accordingly) ? All that explains why it was not easy to choose to report the fix upstream or to just fix it in Debian, I guess. Hope this helps (Hope I got it right...) Pierre
Bug#832558: [Pkg-dkms-maint] Bug#832558: Fix dkms mkdeb / mkdsc / mkbmdeb
Thanks again for your quick and detailed response! On 1/13/19 2:49 PM, Gianfranco Costamagna wrote: > Now, dkms run on amd64 produces binaries for *amd64* architecture, and if you > run the same command > on i386 you will produce kernel modules that can run only on *i386* > architecture In my understanding, running in some src directory (which has to support this obviously) make dkms_mkdeb produces an architecture independent deb package (hence my thought to have the suffix _all.deb). When I then install that very _all.deb package with dpkg, DKMS is invoked again and the actual compilation takes place where the architecture dependent binary is produced (so dkms is invoked twice. Once when creating the package, and again when installing) My usecase is applying this patch for intel processors (http://linux-phc.org/forum/viewtopic.php?f=7&t=267). I create a deb package with make dkms_mkdeb. The resulting deb package actually has no binaries inside but only source code and - what I assume are - some instructions for DKMS (dkms.conf and some .c and .patch files) for actually installing the deb package with dpkg. Earlier in this thread, this was also discussed (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=832558#20). But then again the currently produced package works. So if no one else complains, the behaviour may remain I guess (differentiating among binary and non-binary packages just by name is probably not really needed). Thanks again for fixing this bug. Cheers
Bug#832558: [Pkg-dkms-maint] Bug#832558: Fix dkms mkdeb / mkdsc / mkbmdeb
OP here, Am So, 13. Jan 2019 um 14:49:06 +0100 schrieb Gianfranco Costamagna: On Sun, 13 Jan 2019 13:29:13 +0100 drake763 wrote: 2) The fix in 2.6.1-3 produces (when creating a deb package) a package named PACKAGENAME_amd64.deb, where amd64 is my compiling computer's architecture. However, it was my understanding that dkms created debs should have *_all.deb as a naming convention? But this may well be a misunderstanding on my side. Now, dkms run on amd64 produces binaries for *amd64* architecture, and if you run the same command on i386 you will produce kernel modules that can run only on *i386* architecture For binary packages that's what I would expect. So dkms does the right thing. *all* is a suffix used when the built artifacts are the same in every architecture (e.g. an image, a pdf, an html file, a documentation package, that is the same everywhere). Having _all.deb was a mistake on the module generation, because the same file would have had no information about its content, and would have been called exactly the same on different architectures. So, I'm confident enough that the fix now is "correct", and I hope somebody else would ack my changes, because I'm not a direct user of this feature, so my blind fix might have been incorrectly applied. In my case I use dkms --source-only. The package does not contain arch specific binaries but with the current dkms version the result will also get the arch suffix. I would have expected the package to contain a non-arch suffix as there is no need for such a thing in that case. But I also don't mind if the current behaviour stays. It still works for me. Regards, Dirk
Bug#832558: [Pkg-dkms-maint] Bug#832558: Fix dkms mkdeb / mkdsc / mkbmdeb
On Sun, 13 Jan 2019 13:29:13 +0100 drake763 wrote: > Dear maintainers, > > Thank you very much for your work and reply! I have three issues/questions: > > 1) The bug is *NOT* fixed in 2.6.1-1 (which is in stretch-backports) but > first in 2.6.1-3 (testing/sid). > this is normal, I'll backport the fix once you ack my changes :) > 2) The fix in 2.6.1-3 produces (when creating a deb package) a package > named PACKAGENAME_amd64.deb, where amd64 is my compiling computer's > architecture. However, it was my understanding that dkms created debs > should have *_all.deb as a naming convention? But this may well be a > misunderstanding on my side. ok lets make this clear on *both* sides :) dkms is a tool to build custom kernel modules, with the user-pc (e.g. when they aren't ship with the kernel itself). Now, dkms run on amd64 produces binaries for *amd64* architecture, and if you run the same command on i386 you will produce kernel modules that can run only on *i386* architecture (see the other bug that introduced this change: #832558). *all* is a suffix used when the built artifacts are the same in every architecture (e.g. an image, a pdf, an html file, a documentation package, that is the same everywhere). Having _all.deb was a mistake on the module generation, because the same file would have had no information about its content, and would have been called exactly the same on different architectures. So, I'm confident enough that the fix now is "correct", and I hope somebody else would ack my changes, because I'm not a direct user of this feature, so my blind fix might have been incorrectly applied. > 3) Will this fix be backported to Stretch? Or only to Stretch backports? > What would be the debian way to deal with such bugs? I uploaded the fix in stretch-backports, will be available in a day or two > > Of course, these issues shall not reopen this bug, it's just things that > are unclear on my side. the bug is fixed, really no need to reopen (unless my explanation is wrong, and the bug is not really fixed, in that case yes, please reopen it). Updating stable is useful to fix bugs, but I honestly don't care that much, since stable-backports is going fixed soon. (fixing stable means that somebody should confirm that version 2.3-2 is affected, and provide a debdiff with the bug fixed) G. > > Again thank you very much. > > All best > > On 1/2/19 4:28 PM, Gianfranco Costamagna wrote: > > Hello, > > > > On Mon, 3 Dec 2018 14:17:32 +0100 drake763 wrote: > >> Hi, > >> > >> I'd also second the request to patch this bug. This bug is not present > >> in upstream but only in debian and thus ubuntu. It was introduced in > >> debian specific patch [1]. > >> > >> The part of Pierre's patch mentioned in this thread would fix this and > >> it would be highly appreciated if at least the relevant part of the > >> patch could be applied. > >> > >> Thanks a lot! > >> > >> [1] > >> https://salsa.debian.org/debian/dkms/blob/master/debian/patches/0004-mkbmdeb-support-for-lean-binary-package-with-only-th.patch > >> > > can you please confirm that version 2.6.1-1 is good, and we can close this > > bug? > > > > thanks > > > > Gianfranco > > > >
Bug#832558: [Pkg-dkms-maint] Bug#832558: Fix dkms mkdeb / mkdsc / mkbmdeb
Dear maintainers, Thank you very much for your work and reply! I have three issues/questions: 1) The bug is *NOT* fixed in 2.6.1-1 (which is in stretch-backports) but first in 2.6.1-3 (testing/sid). 2) The fix in 2.6.1-3 produces (when creating a deb package) a package named PACKAGENAME_amd64.deb, where amd64 is my compiling computer's architecture. However, it was my understanding that dkms created debs should have *_all.deb as a naming convention? But this may well be a misunderstanding on my side. 3) Will this fix be backported to Stretch? Or only to Stretch backports? What would be the debian way to deal with such bugs? Of course, these issues shall not reopen this bug, it's just things that are unclear on my side. Again thank you very much. All best On 1/2/19 4:28 PM, Gianfranco Costamagna wrote: > Hello, > > On Mon, 3 Dec 2018 14:17:32 +0100 drake763 wrote: >> Hi, >> >> I'd also second the request to patch this bug. This bug is not present >> in upstream but only in debian and thus ubuntu. It was introduced in >> debian specific patch [1]. >> >> The part of Pierre's patch mentioned in this thread would fix this and >> it would be highly appreciated if at least the relevant part of the >> patch could be applied. >> >> Thanks a lot! >> >> [1] >> https://salsa.debian.org/debian/dkms/blob/master/debian/patches/0004-mkbmdeb-support-for-lean-binary-package-with-only-th.patch >> > can you please confirm that version 2.6.1-1 is good, and we can close this > bug? > > thanks > > Gianfranco >
Bug#832558: [Pkg-dkms-maint] Bug#832558: Fix dkms mkdeb / mkdsc / mkbmdeb
Hello, On Mon, 3 Dec 2018 14:17:32 +0100 drake763 wrote: > Hi, > > I'd also second the request to patch this bug. This bug is not present > in upstream but only in debian and thus ubuntu. It was introduced in > debian specific patch [1]. > > The part of Pierre's patch mentioned in this thread would fix this and > it would be highly appreciated if at least the relevant part of the > patch could be applied. > > Thanks a lot! > > [1] > https://salsa.debian.org/debian/dkms/blob/master/debian/patches/0004-mkbmdeb-support-for-lean-binary-package-with-only-th.patch > can you please confirm that version 2.6.1-1 is good, and we can close this bug? thanks Gianfranco
Bug#832558: [Pkg-dkms-maint] Bug#832558: Fix dkms mkdeb / mkdsc / mkbmdeb
Hi, I'd also second the request to patch this bug. This bug is not present in upstream but only in debian and thus ubuntu. It was introduced in debian specific patch [1]. The part of Pierre's patch mentioned in this thread would fix this and it would be highly appreciated if at least the relevant part of the patch could be applied. Thanks a lot! [1] https://salsa.debian.org/debian/dkms/blob/master/debian/patches/0004-mkbmdeb-support-for-lean-binary-package-with-only-th.patch
Bug#832558: [Pkg-dkms-maint] Bug#832558: Fix dkms mkdeb / mkdsc / mkbmdeb
Hello, I understand the exchange between upstream and Debian is a bit sluggish here, but besides that, is there a reason why Pierre's patch has never been applied? The current situation breaks mkdeb (in some cases?) (e.g. phc_intel [1]) and this part of Pierre's patch would fix this: > - fix mkdeb (1): mkdeb failed because a mv command was looking for a > package filename with -${debian_build_arch} instead of -all. This situation has been kind of annoying ever since the Stretch release, and I (and some others) would really appreciate having this fixed for Buster. [1] http://linux-phc.org/forum/viewtopic.php?f=7&t=267 (power saving module for older Intel CPUs) Thanks, and kind regards hikaru
Bug#832558: [Pkg-dkms-maint] Bug#832558: Fix dkms mkdeb / mkdsc / mkbmdeb
Pierre, There have been a few times the patches got synced between the two, but I'll admit I don't know the current home to the patches that live in the Debian package. Hopefully some of the Debian maintainers can speak up since I haven't tracked it. I think it would be good to make sure that all patches that are currently in 2.3 in Debian are no longer applicable in 2.5 and then update to 2.5 in Debian as well. Thanks, > -Original Message- > From: Pierre Neyron [mailto:pierre.ney...@free.fr] > Sent: Monday, February 12, 2018 11:54 AM > To: Limonciello, Mario ; 832...@bugs.debian.org; > pkg-dkms-ma...@lists.alioth.debian.org > Subject: Re: [Pkg-dkms-maint] Bug#832558: Fix dkms mkdeb / mkdsc / mkbmdeb > > Hi Marco, > > Problem is Debian dkms (v2.3) seems to be an old fork of github/dell > dkms (v2.5). Support for mkbmdeb comes from a patch in the Debian > package but does not exist upstream. As a result my patch is not so > relevant for upstream. > > Do you know if the current Debian patches were already proposed to > upstream ? Do you know the roadmap for a possible merge from upstream > (bump Debian package version to 2.5) ? > > Last be not least, since I do not have all the test cases in mind, I'd > be glad to get a review from the Debian maintainers before sending upstream. > > > Thanks, > Best regards, > Pierre > > On 02/12/2018 06:27 PM, mario.limoncie...@dell.com wrote: > >> -Original Message- > >> From: Pkg-dkms-maint [mailto:pkg-dkms-maint- > >> bounces+mario_limonciello=dell@lists.alioth.debian.org] On Behalf Of > Pierre > >> Neyron > >> Sent: Monday, February 12, 2018 11:21 AM > >> To: 832...@bugs.debian.org > >> Subject: [Pkg-dkms-maint] Bug#832558: Fix dkms mkdeb / mkdsc / mkbmdeb > >> > >> Please find attached a patch for the dkms script (package version 2.3-3) > >> that fixes the following issues: > >> > >> - fix mkdeb (1): mkdeb failed because a mv command was looking for a > >> package filename with -${debian_build_arch} instead of -all. > >> > >> - fix mkdeb (2): allow creating a dkms package without requiring to > >> build the binary module beforehand . The patch actually makes > >> --source-only de facto for mkdeb and mkdsc. > >> > >> - fix mkbmdeb: make --binary-only de facto for mkbmdeb > >> > >> - fix usage: lacked mkdsc > >> > >> Regards > >> Pierre > > > > Pierre, > > > > Can you please submit the patches to upstream at github? > >
Bug#832558: [Pkg-dkms-maint] Bug#832558: Fix dkms mkdeb / mkdsc / mkbmdeb
Hi Marco, Problem is Debian dkms (v2.3) seems to be an old fork of github/dell dkms (v2.5). Support for mkbmdeb comes from a patch in the Debian package but does not exist upstream. As a result my patch is not so relevant for upstream. Do you know if the current Debian patches were already proposed to upstream ? Do you know the roadmap for a possible merge from upstream (bump Debian package version to 2.5) ? Last be not least, since I do not have all the test cases in mind, I'd be glad to get a review from the Debian maintainers before sending upstream. Thanks, Best regards, Pierre On 02/12/2018 06:27 PM, mario.limoncie...@dell.com wrote: >> -Original Message- >> From: Pkg-dkms-maint [mailto:pkg-dkms-maint- >> bounces+mario_limonciello=dell@lists.alioth.debian.org] On Behalf Of >> Pierre >> Neyron >> Sent: Monday, February 12, 2018 11:21 AM >> To: 832...@bugs.debian.org >> Subject: [Pkg-dkms-maint] Bug#832558: Fix dkms mkdeb / mkdsc / mkbmdeb >> >> Please find attached a patch for the dkms script (package version 2.3-3) >> that fixes the following issues: >> >> - fix mkdeb (1): mkdeb failed because a mv command was looking for a >> package filename with -${debian_build_arch} instead of -all. >> >> - fix mkdeb (2): allow creating a dkms package without requiring to >> build the binary module beforehand . The patch actually makes >> --source-only de facto for mkdeb and mkdsc. >> >> - fix mkbmdeb: make --binary-only de facto for mkbmdeb >> >> - fix usage: lacked mkdsc >> >> Regards >> Pierre > > Pierre, > > Can you please submit the patches to upstream at github? >
Bug#832558: [Pkg-dkms-maint] Bug#832558: Fix dkms mkdeb / mkdsc / mkbmdeb
> -Original Message- > From: Pkg-dkms-maint [mailto:pkg-dkms-maint- > bounces+mario_limonciello=dell@lists.alioth.debian.org] On Behalf Of > Pierre > Neyron > Sent: Monday, February 12, 2018 11:21 AM > To: 832...@bugs.debian.org > Subject: [Pkg-dkms-maint] Bug#832558: Fix dkms mkdeb / mkdsc / mkbmdeb > > Please find attached a patch for the dkms script (package version 2.3-3) > that fixes the following issues: > > - fix mkdeb (1): mkdeb failed because a mv command was looking for a > package filename with -${debian_build_arch} instead of -all. > > - fix mkdeb (2): allow creating a dkms package without requiring to > build the binary module beforehand . The patch actually makes > --source-only de facto for mkdeb and mkdsc. > > - fix mkbmdeb: make --binary-only de facto for mkbmdeb > > - fix usage: lacked mkdsc > > Regards > Pierre Pierre, Can you please submit the patches to upstream at github?
Bug#832558: Fix dkms mkdeb / mkdsc / mkbmdeb
Please find attached a patch for the dkms script (package version 2.3-3) that fixes the following issues: - fix mkdeb (1): mkdeb failed because a mv command was looking for a package filename with -${debian_build_arch} instead of -all. - fix mkdeb (2): allow creating a dkms package without requiring to build the binary module beforehand . The patch actually makes --source-only de facto for mkdeb and mkdsc. - fix mkbmdeb: make --binary-only de facto for mkbmdeb - fix usage: lacked mkdsc Regards Pierre --- dkms-2.3/dkms 2018-02-12 18:03:16.454187565 +0100 +++ dkms.fixed/dkms 2018-02-12 18:02:24.901872644 +0100 @@ -132,8 +132,8 @@ show_usage() { echo $"Usage: $0 [action] [options]" -echo $" [action] = { add | remove | build | install | uninstall | match | autoinstall" -echo $" | mkdriverdisk | mktarball | ldtarball | mkrpm | mkkmp | mkdeb | mkbmdeb | status }" +echo $" [action] = { add | remove | build | install | uninstall | match | autoinstall | mkdriverdisk |" +echo $"mktarball | ldtarball | mkrpm | mkkmp | mkdeb | mkdsc | mkbmdeb | status }" echo $" [options] = [-m module] [-v module-version] [-k kernel-version] [-a arch]" echo $" [-d distro] [-c dkms.conf-location] [-q] [--force] [--all]" echo $" [--templatekernel=kernel] [--directive='cli-directive=cli-value']" @@ -3087,23 +3087,6 @@ invoke_command "cp '$PREFIX/usr/lib/dkms/common.postinst' '$temp_dir_debian'" "copying legacy postinstall template" fi -# Copy in the source tree -if [[ ! $binaries_only ]]; then -invoke_command "cp -Lpr '$dkms_tree/$module/$module_version/source' '$temp_dir_debian/$module-$module_version'" "Copying source tree" -fi - -# Only if we are shipping binary modules, make a .tgz for the deb -local archive_location="$dkms_tree/$module/$module_version/tarball/$module-$module_version.dkms.tar.gz" -if [[ ! $source_only ]]; then -binaries_only="binaries-only" -invoke_command "make_tarball" "Gathering binaries" -if [[ -f $archive_location ]]; then -invoke_command "cp '$archive_location' '$temp_dir_debian'" "Copying DKMS tarball into DKMS tree" -else -die 12 $"Unable to find created tarball." -fi -fi - # Calculate destination directory deb_basedir=$dkms_tree/$module/$module_version/${create_type} mkdir -p ${deb_basedir} >/dev/null 2>&1 @@ -3112,6 +3095,7 @@ pushd "$temp_dir_debian" > /dev/null 2>&1 case "$create_type" in dsc) +invoke_command "cp -Lpr '$dkms_tree/$module/$module_version/source' '$temp_dir_debian/$module-$module_version'" "Copying source tree" invoke_command "dpkg-buildpackage -S -us -uc 1>/dev/null" "Building source package" || \ die 7 $"There was a problem creating your ${create_type}." echo $"" @@ -3119,13 +3103,24 @@ invoke_command "mv '$temp_dir/${debian_package}-dkms_${module_version}_source.changes' '$temp_dir/${debian_package}-dkms_${module_version}.dsc' '$temp_dir/${debian_package}-dkms_${module_version}.tar.gz' '$deb_basedir'" "Moving built files to $deb_basedir" ;; deb) +invoke_command "cp -Lpr '$dkms_tree/$module/$module_version/source' '$temp_dir_debian/$module-$module_version'" "Copying source tree" invoke_command "dpkg-buildpackage -rfakeroot -d -b -us -uc 1>/dev/null" "Building binary package" || \ die 7 $"There was a problem creating your ${create_type}." echo $"" echo $"DKMS: mk${create_type} completed." - invoke_command "mv '$temp_dir/${debian_package}-dkms_${module_version}_${debian_build_arch}.deb' '$deb_basedir'" "Moving built files to $deb_basedir" + invoke_command "mv '$temp_dir/${debian_package}-dkms_${module_version}_all.deb' '$deb_basedir'" "Moving built files to $deb_basedir" ;; bmdeb) + # Only if we are shipping binary modules, make a .tgz for the deb + local archive_location="$dkms_tree/$module/$module_version/tarball/$module-$module_version.dkms.tar.gz" + binaries_only="binaries-only" + invoke_command "make_tarball" "Gathering binaries" + if [[ -f $archive_location ]]; then + invoke_command "cp '$archive_location' '$temp_dir_debian'" "Copying DKMS tarball into DKMS tree" + else + die 12 $"Unable to find created tarball." + fi + export KVER="$kernelver" export KARCH="$arch" invoke_command "dpkg-buildpackage -rfakeroot -d -b -us -uc 1>/dev/null" "Building binary package" || \