Hi Petr, > -----Original Message----- > From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org] On > Behalf Of Petr Štetiar > Sent: Montag, 7. Oktober 2019 10:22 > To: openwrt-devel@lists.openwrt.org > Cc: Petr Štetiar <yn...@true.cz> > Subject: [OpenWrt-Devel] [PATCH] ath79: make UBNT Nano/Loco AC factory images > reproducible > > Current factory images are built on top of sysupgrade images which > contains metadata which are causing image reproducibility issues, so > let's build factory images from the scratch. While at it, refactor the > shared vars into common base as well. > > Ref: > http://lists.infradead.org/pipermail/openwrt-devel/2019-October/019205.html > Reported-by: Paul Spooren <m...@aparcar.org> > Signed-off-by: Petr Štetiar <yn...@true.cz> > --- > target/linux/ath79/image/generic-ubnt.mk | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/target/linux/ath79/image/generic-ubnt.mk > b/target/linux/ath79/image/generic-ubnt.mk > index 6ae766e29331..9ab11324b411 100644 > --- a/target/linux/ath79/image/generic-ubnt.mk > +++ b/target/linux/ath79/image/generic-ubnt.mk > @@ -114,40 +114,40 @@ define Device/ubnt_bullet-m-xw > endef > TARGET_DEVICES += ubnt_bullet-m-xw > > +define Device/ubnt-nano-ac > + DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct > + IMAGE_SIZE := 15744k > + IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ > + append-rootfs | pad-rootfs | mkubntimage-split | \ > + check-size $$$$(IMAGE_SIZE) > +endef > + > define Device/ubnt_lap-120 > $(Device/ubnt-wa) > DEVICE_MODEL := LiteAP ac > DEVICE_VARIANT := LAP-120 > - DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct > - IMAGE_SIZE := 15744k > - IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage-split > + $(Device/ubnt-nano-ac)
If you call it ubnt-nano-ac anyway, you could also include the "$(Device/ubnt-wa)" in the common node. One could also think about naming it ubnt_nano-ac (with underscore) for consistency, like what we have for ubnt_routerstation_common and ubnt_unifiac. Best Adrian
openpgp-digital-signature.asc
Description: PGP signature
_______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
