Browse Source

ar71xx-generic: fix BOARDNAME for UAP AC Lite

Caused by a broken backport.

Fixes #689
Matthias Schiffer 8 years ago
parent
commit
e773f686c9

+ 6 - 5
patches/openwrt/0043-ar71xx-Rename-unifiac-to-unifiac-lite.patch

@@ -143,7 +143,7 @@ index 94eff18..eac0240 100644
  define Profile/UBNTUNIFIOUTDOOR
  define Profile/UBNTUNIFIOUTDOOR
  	NAME:=Ubiquiti UniFiAP Outdoor
  	NAME:=Ubiquiti UniFiAP Outdoor
 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index dd59f2d..31aff78 100644
+index dd59f2d..3efa2e1 100644
 --- a/target/linux/ar71xx/image/Makefile
 --- a/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
 @@ -741,14 +741,19 @@ endef
 @@ -741,14 +741,19 @@ endef
@@ -156,14 +156,15 @@ index dd59f2d..31aff78 100644
    MTDPARTS = spi0.0:384k(u-boot)ro,64k(u-boot-env)ro,7744k(firmware),7744k(ubnt-airos)ro,128k(bs)ro,256k(cfg)ro,64k(EEPROM)ro
    MTDPARTS = spi0.0:384k(u-boot)ro,64k(u-boot-env)ro,7744k(firmware),7744k(ubnt-airos)ro,128k(bs)ro,256k(cfg)ro,64k(EEPROM)ro
    IMAGES := sysupgrade.bin
    IMAGES := sysupgrade.bin
    IMAGE/sysupgrade.bin = append-kernel $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE)
    IMAGE/sysupgrade.bin = append-kernel $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE)
-+endef
+-  BOARDNAME := UBNT-UF-AC
+ endef
+-TARGET_DEVICES += ubnt-unifiac
 +
 +
 +define Device/ubnt-unifiac-lite
 +define Device/ubnt-unifiac-lite
 +  $(Device/ubnt-unifiac)
 +  $(Device/ubnt-unifiac)
 +  DEVICE_PROFILE := UBNT UBNTUNIFIACLITE
 +  DEVICE_PROFILE := UBNT UBNTUNIFIACLITE
-   BOARDNAME := UBNT-UF-AC
- endef
--TARGET_DEVICES += ubnt-unifiac
++  BOARDNAME := UBNT-UF-AC-LITE
++endef
 +TARGET_DEVICES += ubnt-unifiac-lite
 +TARGET_DEVICES += ubnt-unifiac-lite
  
  
  rootfs_type=$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1)))
  rootfs_type=$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1)))

+ 2 - 2
patches/openwrt/0044-ar71xx-Add-support-for-Ubiquiti-UniFi-AP-AC-PRO.patch

@@ -193,12 +193,12 @@ index eac0240..69b8398 100644
  	NAME:=Ubiquiti UniFiAP Outdoor
  	NAME:=Ubiquiti UniFiAP Outdoor
  	PACKAGES:=
  	PACKAGES:=
 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index 31aff78..916d4e2 100644
+index 3efa2e1..58118f2 100644
 --- a/target/linux/ar71xx/image/Makefile
 --- a/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
 @@ -753,7 +753,13 @@ define Device/ubnt-unifiac-lite
 @@ -753,7 +753,13 @@ define Device/ubnt-unifiac-lite
    DEVICE_PROFILE := UBNT UBNTUNIFIACLITE
    DEVICE_PROFILE := UBNT UBNTUNIFIACLITE
-   BOARDNAME := UBNT-UF-AC
+   BOARDNAME := UBNT-UF-AC-LITE
  endef
  endef
 -TARGET_DEVICES += ubnt-unifiac-lite
 -TARGET_DEVICES += ubnt-unifiac-lite
 +
 +

+ 1 - 1
patches/openwrt/0045-ar71xx-Generate-sysupgrade-images-for-OpenMesh-devices.patch

@@ -15,7 +15,7 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
 Forwarded: https://patchwork.ozlabs.org/patch/624172/
 Forwarded: https://patchwork.ozlabs.org/patch/624172/
 
 
 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index 916d4e2..f91e20e 100644
+index 58118f2..7aee0c8 100644
 --- a/target/linux/ar71xx/image/Makefile
 --- a/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
 @@ -1877,6 +1877,9 @@ define Image/Build/OpenMesh
 @@ -1877,6 +1877,9 @@ define Image/Build/OpenMesh

+ 1 - 1
patches/openwrt/0052-ar71xx-create-profile-and-build-image-for-the-OpenMesh-MR1750-board.patch

@@ -35,7 +35,7 @@ index 41b462e..06cf135 100644
  
  
  define Profile/OPENMESH/Description
  define Profile/OPENMESH/Description
 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index f91e20e..b74aa45 100644
+index 7aee0c8..0ebb7dc 100644
 --- a/target/linux/ar71xx/image/Makefile
 --- a/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
 @@ -2045,6 +2045,7 @@ $(eval $(call SingleProfile,OpenMesh,squashfs-only,OM2P,om2p,,,,OM2P))
 @@ -2045,6 +2045,7 @@ $(eval $(call SingleProfile,OpenMesh,squashfs-only,OM2P,om2p,,,,OM2P))

+ 1 - 1
patches/openwrt/0071-ar71xx-create-profile-and-build-image-for-the-OpenMesh-OM5P-AC-board.patch

@@ -31,7 +31,7 @@ index 06cf135..64aaa24 100644
          NAME:=OpenMesh MR600
          NAME:=OpenMesh MR600
          PACKAGES:=kmod-ath9k om-watchdog
          PACKAGES:=kmod-ath9k om-watchdog
 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index b74aa45..06dbb77 100644
+index 0ebb7dc..0cf1df1 100644
 --- a/target/linux/ar71xx/image/Makefile
 --- a/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
 @@ -2043,6 +2043,7 @@ $(eval $(call SingleProfile,Netgear,64kraw,WPN824N,wpn824n,WPN824N,ttyS0,115200,
 @@ -2043,6 +2043,7 @@ $(eval $(call SingleProfile,Netgear,64kraw,WPN824N,wpn824n,WPN824N,ttyS0,115200,

+ 1 - 1
patches/openwrt/0084-ar71xx-add-GL-AR150-support.patch

@@ -261,7 +261,7 @@ index 0000000..a6ad661
 +
 +
 +$(eval $(call Profile,GL-AR150))
 +$(eval $(call Profile,GL-AR150))
 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index 06dbb77..a35ded9 100644
+index 0cf1df1..b790610 100644
 --- a/target/linux/ar71xx/image/Makefile
 --- a/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
 @@ -144,6 +144,14 @@ define Device/weio
 @@ -144,6 +144,14 @@ define Device/weio

+ 1 - 1
patches/openwrt/0109-ar71xx-add-support-for-TP-LINK-TL-WR842N-ND-v3.patch

@@ -218,7 +218,7 @@ index 3e5c2a2..0209603 100644
 +MIPS_MACHINE(ATH79_MACH_TL_WR842N_V3, "TL-WR842N-v3", "TP-LINK TL-WR842N/ND v3",
 +MIPS_MACHINE(ATH79_MACH_TL_WR842N_V3, "TL-WR842N-v3", "TP-LINK TL-WR842N/ND v3",
 +	     tl_wr842n_v3_setup);
 +	     tl_wr842n_v3_setup);
 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index a35ded9..392dec4 100644
+index b790610..e074f8a 100644
 --- a/target/linux/ar71xx/image/Makefile
 --- a/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
 @@ -607,6 +607,13 @@ define Device/tl-wr842n-v2
 @@ -607,6 +607,13 @@ define Device/tl-wr842n-v2

+ 1 - 1
patches/openwrt/0110-ar71xx-Fix-TL-WR841N-v11-LEDs-use-separate-machine.patch

@@ -175,7 +175,7 @@ index 0209603..f806568 100644
  {
  {
  	tl_ap143_setup();
  	tl_ap143_setup();
 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index 392dec4..6d46c1e 100644
+index e074f8a..f99ea2b 100644
 --- a/target/linux/ar71xx/image/Makefile
 --- a/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
 @@ -595,7 +595,7 @@ endef
 @@ -595,7 +595,7 @@ endef