On 2015-12-17 21:28, Christian Lamparter wrote:
> On Thursday, December 17, 2015 07:22:04 PM Christian Lamparter wrote:
>> This series completes the support for Cisco Meraki's MR18 router [0].
> [...]
>>
>> v7 -> v8:
>> - Architecure and Support files (mach-mr18.c and ar71xx_regs.h) have
>> been merged (dropped from this change set)
>> - fixed sysupgrade for other platforms
>
> Wait. There is another error. The . /lib/upgrade/nand.sh issue is back
> again in this version. This time /etc/hotplug.d/firmware/10-ath9k-eeprom.
>
> ATM, we are looking for two potential fixes:
>
> 1. [ -e /lib/upgrade/nand.sh ] && source /lib/upgrade/nand.sh
>
> --- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
> +++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
> @@ -6,6 +6,6 @@
> . /lib/functions.sh
> . /lib/functions/system.sh
> -. /lib/upgrade/nand.sh
> +[ -e /lib/upgrade/nand.sh ] && source /lib/upgrade/nand.sh
>
> ath9k_eeprom_die() {
>
>
> ---
>
>
> 2. move the . /lib/upgrade/nand.sh to the mr18 section
>
> --- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
> +++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
> @@ -56,6 +56,8 @@ case "$FIRMWARE" in
> "soc_wmac.eeprom")
> case $board in
> mr18)
> + . /lib/upgrade/nand.sh
> +
> if [ -n "$(nand_find_volume ubi0 caldata)" ]; then
> ath9k_ubi_eeprom_extract "caldata" 4096 2048
> else
>
> Is there a preference which of the options we should take?
I prefer option 2.
- Felix
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
