| Message ID | 20200622062317.11932-3-juergh@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,focal/linux-raspi,1/2] UBUNTU: [Config] raspi: Enable zfs modules for arm64 | expand |
On 22.06.20 08:23, Juerg Haefliger wrote: > BugLink: https://bugs.launchpad.net/bugs/1884110 > > Signed-off-by: Juerg Haefliger <juergh@canonical.com> > --- > debian/control.d/raspi | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/debian/control.d/raspi b/debian/control.d/raspi > index e14488746499..82677aaa1f43 100644 > --- a/debian/control.d/raspi > +++ b/debian/control.d/raspi > @@ -9,7 +9,7 @@ Description: Raspberry Pi Linux kernel headers > Package: linux-image-raspi${variant:suffix} > Architecture: armhf arm64 > Section: kernel > -Provides: ${dkms:wireguard-linux-compat-modules} > +Provides: ${dkms:wireguard-linux-compat-modules}, ${dkms:zfs-modules} > Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-raspi, linux-firmware > Description: Raspberry Pi Linux kernel image > This package will always depend on the latest Raspberry Pi Linux > I have not looked yet, but normally this requires some changes to update-version and debian/rules to keep debian/dkms-versions in sync with the kernel tree and inject the versions into control files. -Stefan
On Mon, 22 Jun 2020 10:23:45 +0200 Stefan Bader <stefan.bader@canonical.com> wrote: > On 22.06.20 08:23, Juerg Haefliger wrote: > > BugLink: https://bugs.launchpad.net/bugs/1884110 > > > > Signed-off-by: Juerg Haefliger <juergh@canonical.com> > > --- > > debian/control.d/raspi | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/debian/control.d/raspi b/debian/control.d/raspi > > index e14488746499..82677aaa1f43 100644 > > --- a/debian/control.d/raspi > > +++ b/debian/control.d/raspi > > @@ -9,7 +9,7 @@ Description: Raspberry Pi Linux kernel headers > > Package: linux-image-raspi${variant:suffix} > > Architecture: armhf arm64 > > Section: kernel > > -Provides: ${dkms:wireguard-linux-compat-modules} > > +Provides: ${dkms:wireguard-linux-compat-modules}, ${dkms:zfs-modules} > > Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-raspi, linux-firmware > > Description: Raspberry Pi Linux kernel image > > This package will always depend on the latest Raspberry Pi Linux > > > I have not looked yet, but normally this requires some changes to update-version > and debian/rules to keep debian/dkms-versions in sync with the kernel tree and > inject the versions into control files. I believe that logic is already present in update-version and debian/rules. In update-version: # Update things from the primary package. for thing in \ debian/dkms-versions \ debian/scripts/misc/git-ubuntu-log do ... and in debian/rules: $ grep zfs debian/rules dkms_zfs_linux_version=$(shell gawk '/^zfs-linux/ { print $$2; }' debian/dkms-versions) gencontrol_flags += -Vdkms:zfs-modules="zfs-modules (= $(dkms_zfs_linux_version))," ...Juerg > -Stefan >
diff --git a/debian/control.d/raspi b/debian/control.d/raspi index e14488746499..82677aaa1f43 100644 --- a/debian/control.d/raspi +++ b/debian/control.d/raspi @@ -9,7 +9,7 @@ Description: Raspberry Pi Linux kernel headers Package: linux-image-raspi${variant:suffix} Architecture: armhf arm64 Section: kernel -Provides: ${dkms:wireguard-linux-compat-modules} +Provides: ${dkms:wireguard-linux-compat-modules}, ${dkms:zfs-modules} Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-raspi, linux-firmware Description: Raspberry Pi Linux kernel image This package will always depend on the latest Raspberry Pi Linux
BugLink: https://bugs.launchpad.net/bugs/1884110 Signed-off-by: Juerg Haefliger <juergh@canonical.com> --- debian/control.d/raspi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)