[OpenWrt-Devel] [PATCH v4] ramips: Add support for Head Weblink HDRM200

[Petr Štetiar]

Kristian Evensen <kristian.evensen at gmail.com> [2019-05-16 10:19:59]:

Hi,

> On Wed, May 15, 2019 at 9:21 PM Petr Štetiar <ynezz at true.cz> wrote:
> > Thanks, I've merged it into my staging tree[1], but I had to fix one merge
> > conflict in target.mk so please check it if I did it properly.
> 
> Thanks and strange about the conflict + whitespace, as patch applies
> cleanly to master and checkpatch does not complain.

Just FYI

$ git describe

 reboot-10011-g71ab2c9d1796

$ ../maintainer-tools/patchwork-apply.sh 1100158

 Applying: ramips: Add support for Head Weblink HDRM200
 /opt/devel/openwrt/openwrt.git/.git/rebase-apply/patch:289: space before tab in indent.
	  	     uqmi kmod-usb-serial kmod-usb-serial-option

                 ^
                 |
                 `-- whitespace issue

 error: patch failed: target/linux/ramips/mt7620/target.mk:4
 error: target/linux/ramips/mt7620/target.mk: patch does not apply
 Patch failed at 0001 ramips: Add support for Head Weblink HDRM200

 which was caused by:

  commit 367813b9b17c50b9e1bc25933a3ccd252c0813e4
  Author: Deng Qingfang <dengqf6 at mail2.sysu.edu.cn>

    ramips: mt7620: fix dependencies

  diff --git a/target/linux/ramips/mt7620/target.mk b/target/linux/ramips/mt7620/target.mk
  index 544254604e5c..788c9a1dfc1a 100644
  --- a/target/linux/ramips/mt7620/target.mk
  +++ b/target/linux/ramips/mt7620/target.mk
  @@ -7,7 +7,7 @@ BOARDNAME:=MT7620 based boards
  FEATURES+=usb
  CPU_TYPE:=24kc
 
  -DEFAULT_PACKAGES += kmod-rt2800-pci kmod-rt2800-soc wpad-basic
  +DEFAULT_PACKAGES += kmod-rt2800-soc wpad-basic

-- ynezz

_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel