| Message ID | 20180426155114.GA47866@beast |
|---|---|
| State | New |
| Headers | show |
| Series | [bionic,v2] UBUNTU: [Packaging] Fix missing watchdog for Raspberry Pi | expand |
On Thu, Apr 26, 2018 at 08:51:14AM -0700, Kees Cook wrote: > The bcm2835_wdt.ko module is required for Raspberry Pi systems to actually > reboot and shutdown. It should not get automatically blacklisted. See > https://github.com/raspberrypi/linux/issues/2523 > > Closes LP: #1766052 > > Signed-off-by: Kees Cook <kees@ubuntu.com> Seems reasonable. Acked-by: Seth Forshee <seth.forshee@canonical.com>
On 2018-04-26 08:51:14 , Kees Cook wrote: > The bcm2835_wdt.ko module is required for Raspberry Pi systems to actually > reboot and shutdown. It should not get automatically blacklisted. See > https://github.com/raspberrypi/linux/issues/2523 > > Closes LP: #1766052 > > Signed-off-by: Kees Cook <kees@ubuntu.com> > --- > v2: add missing pipe (sforshee) > --- > debian/rules.d/2-binary-arch.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk > index 72e55fc6815c..f9d1d792019e 100644 > --- a/debian/rules.d/2-binary-arch.mk > +++ b/debian/rules.d/2-binary-arch.mk > @@ -183,6 +183,7 @@ endif > echo "# Autogenerated watchdog blacklist" \ > >>$(pkgdir)/lib/modprobe.d/blacklist_$(src_pkg_name)_$(abi_release)-$*.conf > ls -1 $(pkgdir)/lib/modules/$(abi_release)-$*/kernel/drivers/watchdog/ | \ > + grep -v '^bcm2835_wdt$$' | \ > sed -e 's/^/blacklist /' -e 's/.ko$$//' | \ > sort -u \ > >>$(pkgdir)/lib/modprobe.d/blacklist_$(src_pkg_name)_$(abi_release)-$*.conf Acked-by: Khalid Elmously <khalid.elmously@canonical.com>
On 04/26/2018 11:58 AM, Seth Forshee wrote: > On Thu, Apr 26, 2018 at 08:51:14AM -0700, Kees Cook wrote: >> The bcm2835_wdt.ko module is required for Raspberry Pi systems to actually >> reboot and shutdown. It should not get automatically blacklisted. See >> https://github.com/raspberrypi/linux/issues/2523 >> >> Closes LP: #1766052 >> >> Signed-off-by: Kees Cook <kees@ubuntu.com> > Seems reasonable. > > Acked-by: Seth Forshee <seth.forshee@canonical.com> > I see there are two acks for this patch. Any chance it will be applied soon?
On 05/10/18 19:29, Joseph Salisbury wrote: > On 04/26/2018 11:58 AM, Seth Forshee wrote: >> On Thu, Apr 26, 2018 at 08:51:14AM -0700, Kees Cook wrote: >>> The bcm2835_wdt.ko module is required for Raspberry Pi systems to actually >>> reboot and shutdown. It should not get automatically blacklisted. See >>> https://github.com/raspberrypi/linux/issues/2523 >>> >>> Closes LP: #1766052 >>> >>> Signed-off-by: Kees Cook <kees@ubuntu.com> >> Seems reasonable. >> >> Acked-by: Seth Forshee <seth.forshee@canonical.com> >> > I see there are two acks for this patch. Any chance it will be applied > soon? The deadline for getting patches applied for the next SRU cycle is this Friday (May 18th), so this patch will be probably applied by the end of the week. Thanks, Kleber
On 04/26/18 17:51, Kees Cook wrote: > The bcm2835_wdt.ko module is required for Raspberry Pi systems to actually > reboot and shutdown. It should not get automatically blacklisted. See > https://github.com/raspberrypi/linux/issues/2523 > > Closes LP: #1766052 The Launchpad bug link needs to be in the format: BugLink: http://bugs.launchpad.net/bugs/<bug#> I have fixed it while applying the patch. > > Signed-off-by: Kees Cook <kees@ubuntu.com> > --- > v2: add missing pipe (sforshee) > --- > debian/rules.d/2-binary-arch.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk > index 72e55fc6815c..f9d1d792019e 100644 > --- a/debian/rules.d/2-binary-arch.mk > +++ b/debian/rules.d/2-binary-arch.mk > @@ -183,6 +183,7 @@ endif > echo "# Autogenerated watchdog blacklist" \ > >>$(pkgdir)/lib/modprobe.d/blacklist_$(src_pkg_name)_$(abi_release)-$*.conf > ls -1 $(pkgdir)/lib/modules/$(abi_release)-$*/kernel/drivers/watchdog/ | \ > + grep -v '^bcm2835_wdt$$' | \ > sed -e 's/^/blacklist /' -e 's/.ko$$//' | \ > sort -u \ > >>$(pkgdir)/lib/modprobe.d/blacklist_$(src_pkg_name)_$(abi_release)-$*.conf > The Launchpad bug was also nominated for Artful but the patch is tagged against Bionic only, so I have applied it only to Bionic. Applied to bionic/master-next branch. Thanks, Kleber
Applied to unstable master branch. Thanks. Cascardo. Applied-to: unstable/master
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 72e55fc6815c..f9d1d792019e 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -183,6 +183,7 @@ endif echo "# Autogenerated watchdog blacklist" \ >>$(pkgdir)/lib/modprobe.d/blacklist_$(src_pkg_name)_$(abi_release)-$*.conf ls -1 $(pkgdir)/lib/modules/$(abi_release)-$*/kernel/drivers/watchdog/ | \ + grep -v '^bcm2835_wdt$$' | \ sed -e 's/^/blacklist /' -e 's/.ko$$//' | \ sort -u \ >>$(pkgdir)/lib/modprobe.d/blacklist_$(src_pkg_name)_$(abi_release)-$*.conf
The bcm2835_wdt.ko module is required for Raspberry Pi systems to actually reboot and shutdown. It should not get automatically blacklisted. See https://github.com/raspberrypi/linux/issues/2523 Closes LP: #1766052 Signed-off-by: Kees Cook <kees@ubuntu.com> --- v2: add missing pipe (sforshee) --- debian/rules.d/2-binary-arch.mk | 1 + 1 file changed, 1 insertion(+)