| Message ID | 20200120194024.25841-1-ynezz@true.cz |
|---|---|
| State | Rejected |
| Delegated to: | Petr Štetiar |
| Headers | show |
| Series | [OpenWrt-Devel,19.07] ramips: mt7621: ubnt-erx: allow sysupgrade from master | expand |
Hi Petr, > -----Original Message----- > From: openwrt-devel [mailto:openwrt-devel-bounces@lists.openwrt.org] > On Behalf Of Petr Štetiar > Sent: Montag, 20. Januar 2020 20:40 > To: openwrt-devel@lists.openwrt.org > Cc: Petr Štetiar <ynezz@true.cz> > Subject: [OpenWrt-Devel] [PATCH 19.07] ramips: mt7621: ubnt-erx: allow > sysupgrade from master > > Currently it's not possible to downgrade from master: > > Device ubiquiti,edgerouterx not supported by this image Supported > devices: ubnt-erx > > So fix it by adding a DTS based device name from master into > SUPPORTED_DEVICES list. Note that I changed somewhat between 100 and 150 devices when reorganizing board names in ramips between master and 19.07. So, unless you have a specific reason to deal with this particular device, there are more to come. ;-) I thus personally would not start to actively support "downgrading". On the other side, there is no downside to adding downgrade support for this particular device, so feel free to go ... Best Adrian > > Signed-off-by: Petr Štetiar <ynezz@true.cz> > --- > target/linux/ramips/image/mt7621.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/target/linux/ramips/image/mt7621.mk > b/target/linux/ramips/image/mt7621.mk > index 53a264f527a6..a8999974731a 100644 > --- a/target/linux/ramips/image/mt7621.mk > +++ b/target/linux/ramips/image/mt7621.mk > @@ -483,6 +483,7 @@ define Device/ubnt-erx > KERNEL_INITRAMFS := $$(KERNEL) | ubnt-erx-factory-image > $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar > IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata > DEVICE_TITLE := Ubiquiti EdgeRouter X > + SUPPORTED_DEVICES += ubiquiti_edgerouterx > endef > TARGET_DEVICES += ubnt-erx > > @@ -491,6 +492,7 @@ define Device/ubnt-erx-sfp > DTS := UBNT-ERX-SFP > DEVICE_TITLE := Ubiquiti EdgeRouter X-SFP > DEVICE_PACKAGES += kmod-i2c-algo-pca kmod-gpio-pca953x kmod-i2c- > gpio-custom > + SUPPORTED_DEVICES += ubiquiti_edgerouterx-sfp > endef > TARGET_DEVICES += ubnt-erx-sfp > > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel
mail@adrianschmutzler.de <mail@adrianschmutzler.de> [2020-01-21 00:26:41]: Hi, > Note that I changed somewhat between 100 and 150 devices when reorganizing > board names in ramips between master and 19.07. and I thank you for that, it names makes more sense now. > So, unless you have a specific reason to deal with this particular device, It's one of my testing devices, and I sometimes check master -> 19.07 -> master sysupgrade, to probe different codepaths and to check, that the upgrade to the next release still works. Thanks for review. -- ynezz
Hi Petr, On 20.01.2020 20:40, Petr Štetiar wrote: > Currently it's not possible to downgrade from master: > > Device ubiquiti,edgerouterx not supported by this image > Supported devices: ubnt-erx > > So fix it by adding a DTS based device name from master into > SUPPORTED_DEVICES list. > > Signed-off-by: Petr Štetiar <ynezz@true.cz> > --- > target/linux/ramips/image/mt7621.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk > index 53a264f527a6..a8999974731a 100644 > --- a/target/linux/ramips/image/mt7621.mk > +++ b/target/linux/ramips/image/mt7621.mk > @@ -483,6 +483,7 @@ define Device/ubnt-erx > KERNEL_INITRAMFS := $$(KERNEL) | ubnt-erx-factory-image $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar > IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata > DEVICE_TITLE := Ubiquiti EdgeRouter X > + SUPPORTED_DEVICES += ubiquiti_edgerouterx Shouldn't that be: 'ubiquiti,edgerouterx' (',' vs. '_')?
Hi, > -----Original Message----- > From: openwrt-devel [mailto:openwrt-devel-bounces@lists.openwrt.org] On > Behalf Of Piotr Dymacz > Sent: Dienstag, 21. Januar 2020 20:13 > To: Petr Štetiar <ynezz@true.cz>; openwrt-devel@lists.openwrt.org > Subject: Re: [OpenWrt-Devel] [PATCH 19.07] ramips: mt7621: ubnt-erx: allow > sysupgrade from master > > Hi Petr, > > On 20.01.2020 20:40, Petr Štetiar wrote: > > Currently it's not possible to downgrade from master: > > > > Device ubiquiti,edgerouterx not supported by this image > > Supported devices: ubnt-erx > > > > So fix it by adding a DTS based device name from master into > > SUPPORTED_DEVICES list. > > > > Signed-off-by: Petr Štetiar <ynezz@true.cz> > > --- > > target/linux/ramips/image/mt7621.mk | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/target/linux/ramips/image/mt7621.mk > b/target/linux/ramips/image/mt7621.mk > > index 53a264f527a6..a8999974731a 100644 > > --- a/target/linux/ramips/image/mt7621.mk > > +++ b/target/linux/ramips/image/mt7621.mk > > @@ -483,6 +483,7 @@ define Device/ubnt-erx > > KERNEL_INITRAMFS := $$(KERNEL) | ubnt-erx-factory-image > $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar > > IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata > > DEVICE_TITLE := Ubiquiti EdgeRouter X > > + SUPPORTED_DEVICES += ubiquiti_edgerouterx > > Shouldn't that be: 'ubiquiti,edgerouterx' (',' vs. '_')? indeed, '_' needs to be changed to ',' in both cases. Best Adrian > > -- > Cheers, > Piotr > > > endef > > TARGET_DEVICES += ubnt-erx > > > > @@ -491,6 +492,7 @@ define Device/ubnt-erx-sfp > > DTS := UBNT-ERX-SFP > > DEVICE_TITLE := Ubiquiti EdgeRouter X-SFP > > DEVICE_PACKAGES += kmod-i2c-algo-pca kmod-gpio-pca953x kmod-i2c-gpio- > custom > > + SUPPORTED_DEVICES += ubiquiti_edgerouterx-sfp > > endef > > TARGET_DEVICES += ubnt-erx-sfp > > > > > > _______________________________________________ > > openwrt-devel mailing list > > openwrt-devel@lists.openwrt.org > > https://lists.openwrt.org/mailman/listinfo/openwrt-devel > > > > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 53a264f527a6..a8999974731a 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -483,6 +483,7 @@ define Device/ubnt-erx KERNEL_INITRAMFS := $$(KERNEL) | ubnt-erx-factory-image $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata DEVICE_TITLE := Ubiquiti EdgeRouter X + SUPPORTED_DEVICES += ubiquiti_edgerouterx endef TARGET_DEVICES += ubnt-erx @@ -491,6 +492,7 @@ define Device/ubnt-erx-sfp DTS := UBNT-ERX-SFP DEVICE_TITLE := Ubiquiti EdgeRouter X-SFP DEVICE_PACKAGES += kmod-i2c-algo-pca kmod-gpio-pca953x kmod-i2c-gpio-custom + SUPPORTED_DEVICES += ubiquiti_edgerouterx-sfp endef TARGET_DEVICES += ubnt-erx-sfp
Currently it's not possible to downgrade from master: Device ubiquiti,edgerouterx not supported by this image Supported devices: ubnt-erx So fix it by adding a DTS based device name from master into SUPPORTED_DEVICES list. Signed-off-by: Petr Štetiar <ynezz@true.cz> --- target/linux/ramips/image/mt7621.mk | 2 ++ 1 file changed, 2 insertions(+)