Bug#917857: NMU diff for aufs 4.19+20181217-0.1
On Tue, 2019-01-08 at 13:08 +0100, Jan Luca Naumann wrote: > Hey, > > thank you for the upload and your work. I am sorry that I did not manage > to upload the new version due to too much other workload. There's nothing to be sorry about. I usually check that out-of-tree module packages are up-to-date as we approach the freeze. This time I took the time to update some of them too. > I have seen that your delete the dependency on linux-kbuild. I have > added it to avoid transition of the aufs-packages to testing before the > linux package is available in the requested version. One time there was > the problem that the aufs-package already migrated but the linux package > had some RC-bug. That's a good point, which perhaps should have been recorded in the git commit log or the changelog, so that I didn't think it was a mistake. :-) To expand on what I wrote in the changelog: - In order to use aufs-dkms, it's necessary to install a linux-headers package for a suitable kernel version. - If that linux-headers package is one built by Debian, it already depends on linux-kbuild-4.19. - However, if it's a custom package built using "make deb-pkg", it includes all the kbuild scripts and other tools. Then there's no need to install linux-kbuild-4.19 at all. But I suppose the extra dependency doesn't matter that much. You're the maintainer and should of course add it back if you still think it's justified. It's unfortunate that backwards-compatibility for aufs is maintained through separate git branches rather than conditional code. None of the other out-of-tree modules packaged for Debian seem to be like this. I wonder if it would be possible to support multiple kernel versions like this: - When preparing the source package, run a script to generate diffs from the latest upstream branch to each older branch that's still maintained, and add those under the debian directory. - When building the binary packages, include the diffs in aufs-dkms. - When building under dkms, start by applying the appropriate diff for the target kernel version. (You might need to copy-and-patch, as I'm not sure whether dkms will unpack the source again when building for a different version.) I haven't spent a whole lot of time thinking about this, so this might well be impractical. Ben. -- Ben Hutchings Every program is either trivial or else contains at least one bug signature.asc Description: This is a digitally signed message part
Bug#917857: NMU diff for aufs 4.19+20181217-0.1
Hey, thank you for the upload and your work. I am sorry that I did not manage to upload the new version due to too much other workload. I have seen that your delete the dependency on linux-kbuild. I have added it to avoid transition of the aufs-packages to testing before the linux package is available in the requested version. One time there was the problem that the aufs-package already migrated but the linux package had some RC-bug. Jan Am 07.01.19 um 20:08 schrieb Ben Hutchings: > I made an NMU to fix this bug (and related ones). I also fixed some > more minor issues with the packaging that I noticed. > > The attached debdiff is restricted to the debian/ directory. I created > the new orig tarball from upstream git commit > dc68432bc8fed5faf20f2a0889739a13110abdc1. > > Ben. >
Bug#917857: NMU diff for aufs 4.19+20181217-0.1
I made an NMU to fix this bug (and related ones). I also fixed some
more minor issues with the packaging that I noticed.
The attached debdiff is restricted to the debian/ directory. I created
the new orig tarball from upstream git commit
dc68432bc8fed5faf20f2a0889739a13110abdc1.
Ben.
--
Ben Hutchings
Design a system any fool can use, and only a fool will want to use it.
diff -Nru aufs-4.18+20180903/debian/aufs-dkms.dkms aufs-4.19+20181217/debian/aufs-dkms.dkms
--- aufs-4.18+20180903/debian/aufs-dkms.dkms 2018-09-07 09:45:49.0 +0100
+++ aufs-4.19+20181217/debian/aufs-dkms.dkms 2019-01-07 18:31:37.0 +
@@ -6,4 +6,4 @@
DEST_MODULE_NAME[0]="aufs"
DEST_MODULE_LOCATION[0]="/kernel/fs/aufs"
AUTOINSTALL="yes"
-BUILD_EXCLUSIVE_KERNEL="^4.18.*"
+BUILD_EXCLUSIVE_KERNEL="^4.19.*"
diff -Nru aufs-4.18+20180903/debian/changelog aufs-4.19+20181217/debian/changelog
--- aufs-4.18+20180903/debian/changelog 2018-09-07 09:45:49.0 +0100
+++ aufs-4.19+20181217/debian/changelog 2019-01-07 18:47:57.0 +
@@ -1,3 +1,18 @@
+aufs (4.19+20181217-0.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * New upstream release:
+- Update to Linux 4.19 (Closes: #905651, #911578, #917857)
+ * Update build-dependency on linux-kbuild
+ * aufs-dkms: Delete dependency on linux-kbuild, since the linux-headers
+package will depend on if it's separate
+ * aufs-dkms: Update DKMS kernel version match to 4.19
+ * Delete undefined ${shlibs:Depends} from dependencies
+ * Change binary packages to be arch:all, since their contents are not
+architecture-dependent
+
+ -- Ben Hutchings Mon, 07 Jan 2019 18:47:57 +
+
aufs (4.18+20180903-1) unstable; urgency=medium
* New upstream release.
diff -Nru aufs-4.18+20180903/debian/control aufs-4.19+20181217/debian/control
--- aufs-4.18+20180903/debian/control 2018-09-07 09:45:49.0 +0100
+++ aufs-4.19+20181217/debian/control 2019-01-07 18:45:00.0 +
@@ -2,16 +2,16 @@
Section: kernel
Priority: optional
Maintainer: Jan Luca Naumann
-Build-Depends: debhelper (>=11), dkms, linux-kbuild-4.18
+Build-Depends: debhelper (>=11), dkms, linux-kbuild-4.19
Standards-Version: 4.2.1
Homepage: http://aufs.sourceforge.net/
Vcs-Browser: https://salsa.debian.org/janluca-guest/aufs-debian
Vcs-Git: https://salsa.debian.org/janluca-guest/aufs-debian.git
Package: aufs-dkms
-Architecture: linux-any
+Architecture: all
Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}, linux-kbuild-4.18
+Depends: ${misc:Depends}
Recommends: aufs-tools
Suggests: aufs-dev
Description: DKMS files to build and install aufs
@@ -26,9 +26,9 @@
kernel manually (usually included in the "linux-headers-").
Package: aufs-dev
-Architecture: linux-any
+Architecture: all
Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}
Recommends: aufs-dkms
Replaces: linux-libc-dev (<< 3.18-1~exp1)
Breaks: linux-libc-dev (<< 3.18-1~exp1)
signature.asc
Description: This is a digitally signed message part
