Message ID | 87bltgller.fsf@husum.klickitat.com |
---|---|
State | Accepted |
Headers | show |
Series | [OpenWrt-Devel] base-files: add /usr/share/libubox/jshn.sh to sysupgrade stage2 | expand |
Hi Russell, On Tue, Nov 12, 2019 at 03:33:48PM -0800, Russell Senior wrote: > > Discovered recent changes had broken sysupgrade for ar71xx mikrotik > rb-493g, traced the problem to missing /usr/share/libubox/jshn.sh after > switching to tmpfs. I've applied your patch to master. Do we need to apply it for openwrt-19.07 as well? Cheers Daniel > > > Signed-off-by: Russell Senior <russell@personaltelco.net> > --- > package/base-files/files/lib/upgrade/stage2 | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2 > index 5d3d46ee80..41a3b2aeb3 100755 > --- a/package/base-files/files/lib/upgrade/stage2 > +++ b/package/base-files/files/lib/upgrade/stage2 > @@ -48,7 +48,7 @@ switch_to_ramfs() { > local file="$(which "$binary" 2>/dev/null)" > [ -n "$file" ] && install_bin "$file" > done > - install_file /etc/resolv.conf /lib/*.sh /lib/functions/*.sh /lib/upgrade/*.sh /lib/upgrade/do_stage2 $RAMFS_COPY_DATA > + install_file /etc/resolv.conf /lib/*.sh /lib/functions/*.sh /lib/upgrade/*.sh /lib/upgrade/do_stage2 /usr/share/libubox/jshn.sh $RAMFS_COPY_DATA > > [ -L "/lib64" ] && ln -s /lib $RAM_ROOT/lib64 > > -- > 2.24.0 > > > > -- > Russell Senior, President > russell@personaltelco.net > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel
>>>>> "Daniel" == Daniel Golle <daniel@makrotopia.org> writes: Daniel> Hi Russell, Daniel> On Tue, Nov 12, 2019 at 03:33:48PM -0800, Russell Senior wrote: >> >> Discovered recent changes had broken sysupgrade for ar71xx mikrotik >> rb-493g, traced the problem to missing /usr/share/libubox/jshn.sh >> after switching to tmpfs. Daniel> I've applied your patch to master. Do we need to apply it for Daniel> openwrt-19.07 as well? I'm not sure, I haven't tested 19.07.
Hi, > -----Original Message----- > From: openwrt-devel [mailto:openwrt-devel-bounces@lists.openwrt.org] > On Behalf Of Russell Senior > Sent: Donnerstag, 14. November 2019 00:16 > To: Daniel Golle <daniel@makrotopia.org> > Cc: openwrt-devel@lists.openwrt.org > Subject: Re: [OpenWrt-Devel] [PATCH] base-files: add > /usr/share/libubox/jshn.sh to sysupgrade stage2 > > >>>>> "Daniel" == Daniel Golle <daniel@makrotopia.org> writes: > > Daniel> Hi Russell, > Daniel> On Tue, Nov 12, 2019 at 03:33:48PM -0800, Russell Senior wrote: > >> > >> Discovered recent changes had broken sysupgrade for ar71xx mikrotik > >> rb-493g, traced the problem to missing /usr/share/libubox/jshn.sh > >> after switching to tmpfs. > > Daniel> I've applied your patch to master. Do we need to apply it for > Daniel> openwrt-19.07 as well? > > I'm not sure, I haven't tested 19.07. I think most of the sysupgrade changes have been backported. Despite, we are fixing ar71xx here, it makes no sense to fix ar71xx in master only ... And adding a file should not break anything, in worst case the file would be just useless? So, I'd vote for backport. Best Adrian
It should be harmless. +1 On Wed, Nov 13, 2019 at 3:22 PM <mail@adrianschmutzler.de> wrote: > Hi, > > > -----Original Message----- > > From: openwrt-devel [mailto:openwrt-devel-bounces@lists.openwrt.org] > > On Behalf Of Russell Senior > > Sent: Donnerstag, 14. November 2019 00:16 > > To: Daniel Golle <daniel@makrotopia.org> > > Cc: openwrt-devel@lists.openwrt.org > > Subject: Re: [OpenWrt-Devel] [PATCH] base-files: add > > /usr/share/libubox/jshn.sh to sysupgrade stage2 > > > > >>>>> "Daniel" == Daniel Golle <daniel@makrotopia.org> writes: > > > > Daniel> Hi Russell, > > Daniel> On Tue, Nov 12, 2019 at 03:33:48PM -0800, Russell Senior wrote: > > >> > > >> Discovered recent changes had broken sysupgrade for ar71xx mikrotik > > >> rb-493g, traced the problem to missing /usr/share/libubox/jshn.sh > > >> after switching to tmpfs. > > > > Daniel> I've applied your patch to master. Do we need to apply it for > > Daniel> openwrt-19.07 as well? > > > > I'm not sure, I haven't tested 19.07. > > I think most of the sysupgrade changes have been backported. Despite, we > are fixing ar71xx here, it makes no sense to fix ar71xx in master only ... > And adding a file should not break anything, in worst case the file would > be just useless? > > So, I'd vote for backport. > > Best > > Adrian >
diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2 index 5d3d46ee80..41a3b2aeb3 100755 --- a/package/base-files/files/lib/upgrade/stage2 +++ b/package/base-files/files/lib/upgrade/stage2 @@ -48,7 +48,7 @@ switch_to_ramfs() { local file="$(which "$binary" 2>/dev/null)" [ -n "$file" ] && install_bin "$file" done - install_file /etc/resolv.conf /lib/*.sh /lib/functions/*.sh /lib/upgrade/*.sh /lib/upgrade/do_stage2 $RAMFS_COPY_DATA + install_file /etc/resolv.conf /lib/*.sh /lib/functions/*.sh /lib/upgrade/*.sh /lib/upgrade/do_stage2 /usr/share/libubox/jshn.sh $RAMFS_COPY_DATA [ -L "/lib64" ] && ln -s /lib $RAM_ROOT/lib64
Discovered recent changes had broken sysupgrade for ar71xx mikrotik rb-493g, traced the problem to missing /usr/share/libubox/jshn.sh after switching to tmpfs. Signed-off-by: Russell Senior <russell@personaltelco.net> --- package/base-files/files/lib/upgrade/stage2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)