| Message ID | 20200305114621.31104-1-ynezz@true.cz |
|---|---|
| State | Accepted, archived |
| Delegated to: | Yousong Zhou |
| Headers | show |
| Series | [OpenWrt-Devel] malta: fix missing watchdog dependency in hwmon-sch5627 | expand |
On Thu, 5 Mar 2020 at 19:46, Petr Štetiar <ynezz@true.cz> wrote: > > Fixes following error uncovered while building malta/be on 5.4: > > Package kmod-hwmon-sch5627 is missing dependencies for the following libraries: > watchdog.ko > > That dependency was introduced in upstream via 2d8c7ff52c24 > ("hwmon/sch56xx: Depend on watchdog for watchdog core functions") in > v3.5. Does it make we actually package watchdog.ko as a module? Lots of targets already set it as builtin, but I do not remember ever interacting with it directly on ar71xx, ramips. Regards, yousong > > Cc: Yousong Zhou <yszhou4tech@gmail.com> > Signed-off-by: Petr Štetiar <ynezz@true.cz> > --- > target/linux/malta/config-4.19 | 1 + > target/linux/malta/config-5.4 | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/target/linux/malta/config-4.19 b/target/linux/malta/config-4.19 > index f66036e27bb7..3ad7dbed7558 100644 > --- a/target/linux/malta/config-4.19 > +++ b/target/linux/malta/config-4.19 > @@ -333,4 +333,5 @@ CONFIG_VT=y > CONFIG_VT_CONSOLE=y > CONFIG_VT_HW_CONSOLE_BINDING=y > CONFIG_VXFS_FS=y > +CONFIG_WATCHDOG_CORE=y > CONFIG_XPS=y > diff --git a/target/linux/malta/config-5.4 b/target/linux/malta/config-5.4 > index 41fc9770435f..37d3dbef9ae0 100644 > --- a/target/linux/malta/config-5.4 > +++ b/target/linux/malta/config-5.4 > @@ -341,4 +341,5 @@ CONFIG_VT=y > CONFIG_VT_CONSOLE=y > CONFIG_VT_HW_CONSOLE_BINDING=y > CONFIG_VXFS_FS=y > +CONFIG_WATCHDOG_CORE=y > CONFIG_XPS=y
Hi, > -----Original Message----- > From: openwrt-devel [mailto:openwrt-devel-bounces@lists.openwrt.org] > On Behalf Of Yousong Zhou > Sent: Donnerstag, 5. März 2020 12:57 > To: Petr Štetiar <ynezz@true.cz> > Cc: OpenWrt Development List <openwrt-devel@lists.openwrt.org> > Subject: Re: [OpenWrt-Devel] [PATCH] malta: fix missing watchdog > dependency in hwmon-sch5627 > > On Thu, 5 Mar 2020 at 19:46, Petr Štetiar <ynezz@true.cz> wrote: > > > > Fixes following error uncovered while building malta/be on 5.4: > > > > Package kmod-hwmon-sch5627 is missing dependencies for the following > libraries: > > watchdog.ko > > > > That dependency was introduced in upstream via 2d8c7ff52c24 > > ("hwmon/sch56xx: Depend on watchdog for watchdog core functions") in > > v3.5. > > Does it make we actually package watchdog.ko as a module? Lots of targets > already set it as builtin, but I do not remember ever interacting with it directly > on ar71xx, ramips. Well, ar71xx obviously won't matter in master, so I'd say just ignore this case. Best Adrian > > Regards, > yousong > > > > > Cc: Yousong Zhou <yszhou4tech@gmail.com> > > Signed-off-by: Petr Štetiar <ynezz@true.cz> > > --- > > target/linux/malta/config-4.19 | 1 + > > target/linux/malta/config-5.4 | 1 + > > 2 files changed, 2 insertions(+) > > > > diff --git a/target/linux/malta/config-4.19 > > b/target/linux/malta/config-4.19 index f66036e27bb7..3ad7dbed7558 > > 100644 > > --- a/target/linux/malta/config-4.19 > > +++ b/target/linux/malta/config-4.19 > > @@ -333,4 +333,5 @@ CONFIG_VT=y > > CONFIG_VT_CONSOLE=y > > CONFIG_VT_HW_CONSOLE_BINDING=y > > CONFIG_VXFS_FS=y > > +CONFIG_WATCHDOG_CORE=y > > CONFIG_XPS=y > > diff --git a/target/linux/malta/config-5.4 > > b/target/linux/malta/config-5.4 index 41fc9770435f..37d3dbef9ae0 > > 100644 > > --- a/target/linux/malta/config-5.4 > > +++ b/target/linux/malta/config-5.4 > > @@ -341,4 +341,5 @@ CONFIG_VT=y > > CONFIG_VT_CONSOLE=y > > CONFIG_VT_HW_CONSOLE_BINDING=y > > CONFIG_VXFS_FS=y > > +CONFIG_WATCHDOG_CORE=y > > CONFIG_XPS=y > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Yousong Zhou <yszhou4tech@gmail.com> [2020-03-05 19:56:40]: > > Fixes following error uncovered while building malta/be on 5.4: > > > > Package kmod-hwmon-sch5627 is missing dependencies for the following libraries: > > watchdog.ko > > > > That dependency was introduced in upstream via 2d8c7ff52c24 > > ("hwmon/sch56xx: Depend on watchdog for watchdog core functions") in > > v3.5. > > Does it make we actually package watchdog.ko as a module? The proposed patch adds that watchdog core as built-in, that missing dependency error is probably misleading, having that watchdog core built-in is good enough. -- ynezz
On Thu, 5 Mar 2020 at 20:43, Petr Štetiar <ynezz@true.cz> wrote: > > Yousong Zhou <yszhou4tech@gmail.com> [2020-03-05 19:56:40]: > > > > Fixes following error uncovered while building malta/be on 5.4: > > > > > > Package kmod-hwmon-sch5627 is missing dependencies for the following libraries: > > > watchdog.ko > > > > > > That dependency was introduced in upstream via 2d8c7ff52c24 > > > ("hwmon/sch56xx: Depend on watchdog for watchdog core functions") in > > > v3.5. > > > > Does it make we actually package watchdog.ko as a module? > > The proposed patch adds that watchdog core as built-in, that missing dependency > error is probably misleading, having that watchdog core built-in is good > enough. > > -- ynezz My concern is still on image size which malta can't care less as we mostly (if not always) run it as qemu virtual machine. As for other targets, if it's just kmod-hwmon-sch5627, we should package watchdog.ko separately instead of making it kernel builtin, to save space. Regards, yousong
Yousong Zhou <yszhou4tech@gmail.com> [2020-03-06 14:42:07]: > As for other targets, if it's just kmod-hwmon-sch5627, we should > package watchdog.ko separately instead of making it kernel builtin, to > save space. I think, that watchdog is special case here and if available you would probably like to have it built-in actually. That patch isnt touching any other targets. I didn't looked further into the specific breakage of malta/be only. All other malta subtargets built fine without the watchdog built-in symbol enabled. -- ynezz
On Thu, 5 Mar 2020 at 19:46, Petr Štetiar <ynezz@true.cz> wrote: > > Fixes following error uncovered while building malta/be on 5.4: > > Package kmod-hwmon-sch5627 is missing dependencies for the following libraries: > watchdog.ko > > That dependency was introduced in upstream via 2d8c7ff52c24 > ("hwmon/sch56xx: Depend on watchdog for watchdog core functions") in > v3.5. > > Cc: Yousong Zhou <yszhou4tech@gmail.com> > Signed-off-by: Petr Štetiar <ynezz@true.cz> > --- > target/linux/malta/config-4.19 | 1 + > target/linux/malta/config-5.4 | 1 + > 2 files changed, 2 insertions(+) The issue appeared to be caused by CONFIG_WATCHDOG_CORE being changed from bool type to tristate type. Previously it will be selected to be builtin, now a module. Regards, yousong
diff --git a/target/linux/malta/config-4.19 b/target/linux/malta/config-4.19 index f66036e27bb7..3ad7dbed7558 100644 --- a/target/linux/malta/config-4.19 +++ b/target/linux/malta/config-4.19 @@ -333,4 +333,5 @@ CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_VXFS_FS=y +CONFIG_WATCHDOG_CORE=y CONFIG_XPS=y diff --git a/target/linux/malta/config-5.4 b/target/linux/malta/config-5.4 index 41fc9770435f..37d3dbef9ae0 100644 --- a/target/linux/malta/config-5.4 +++ b/target/linux/malta/config-5.4 @@ -341,4 +341,5 @@ CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_VXFS_FS=y +CONFIG_WATCHDOG_CORE=y CONFIG_XPS=y
Fixes following error uncovered while building malta/be on 5.4: Package kmod-hwmon-sch5627 is missing dependencies for the following libraries: watchdog.ko That dependency was introduced in upstream via 2d8c7ff52c24 ("hwmon/sch56xx: Depend on watchdog for watchdog core functions") in v3.5. Cc: Yousong Zhou <yszhou4tech@gmail.com> Signed-off-by: Petr Štetiar <ynezz@true.cz> --- target/linux/malta/config-4.19 | 1 + target/linux/malta/config-5.4 | 1 + 2 files changed, 2 insertions(+)