From 269615e822fc22dd4217a3592daad3bd3b6c7a12 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Thu, 7 Dec 2017 10:39:20 +0100 Subject: [PATCH 1/7] ap51-flash: Remove uIP workarounds ap51-flash is no longer using uIP and thus these workarounds should no longer be used. Signed-off-by: Sven Eckelmann --- utils/ap51-flash/Makefile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/utils/ap51-flash/Makefile b/utils/ap51-flash/Makefile index c48396620..483d32641 100644 --- a/utils/ap51-flash/Makefile +++ b/utils/ap51-flash/Makefile @@ -20,10 +20,6 @@ PKG_MAINTAINER:=Russell Senior include $(INCLUDE_DIR)/package.mk -ifeq ($(CONFIG_BIG_ENDIAN),y) - STAMP_BUILT:=$(STAMP_BUILT)_big -endif - define Package/ap51-flash SECTION:=utils CATEGORY:=Utilities @@ -32,9 +28,6 @@ define Package/ap51-flash endef TARGET_EXTRA_CFLAGS:=-DFLASH_FROM_FILE -DNO_LIBPCAP -D_GNU_SOURCE -ifeq ($(CONFIG_BIG_ENDIAN),y) - TARGET_EXTRA_CFLAGS:=$(TARGET_EXTRA_CFLAGS) -DUIP_CONF_BYTE_ORDER=1234 -endif # pass optimization flags MAKE_FLAGS += \ From e68554f8792b7221ea9d1dcf5d00766ac0cc5bd6 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Thu, 7 Dec 2017 10:40:30 +0100 Subject: [PATCH 2/7] ap51-flash: Remove OFLAGS from MAKE_FLAGS Nothing in ap51-flash is using the variable OFLAGS. It should therefore not be set. Signed-off-by: Sven Eckelmann --- utils/ap51-flash/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/utils/ap51-flash/Makefile b/utils/ap51-flash/Makefile index 483d32641..c64ad7e8a 100644 --- a/utils/ap51-flash/Makefile +++ b/utils/ap51-flash/Makefile @@ -31,7 +31,6 @@ TARGET_EXTRA_CFLAGS:=-DFLASH_FROM_FILE -DNO_LIBPCAP -D_GNU_SOURCE # pass optimization flags MAKE_FLAGS += \ - OFLAGS="$(TARGET_CFLAGS)" \ EXTRA_CFLAGS="$(TARGET_EXTRA_CFLAGS)" \ REVISION="$(PKG_VERSION)" \ ap51-flash From 6b11d0537efa90604b99acb15b7b6dc5e815a57f Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Thu, 7 Dec 2017 10:41:23 +0100 Subject: [PATCH 3/7] ap51-flash: Remove NO_LIBPCAP preprocessor variable ap51-flash doesn't know the NO_LIBPCAP preprocessor variable and thus OpenWrt should not set it in its package Makefile. Signed-off-by: Sven Eckelmann --- utils/ap51-flash/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/ap51-flash/Makefile b/utils/ap51-flash/Makefile index c64ad7e8a..ad52f74ae 100644 --- a/utils/ap51-flash/Makefile +++ b/utils/ap51-flash/Makefile @@ -27,7 +27,7 @@ define Package/ap51-flash URL:=http://dev.cloudtrax.com/wiki/ap51-flash-station endef -TARGET_EXTRA_CFLAGS:=-DFLASH_FROM_FILE -DNO_LIBPCAP -D_GNU_SOURCE +TARGET_EXTRA_CFLAGS:=-DFLASH_FROM_FILE -D_GNU_SOURCE # pass optimization flags MAKE_FLAGS += \ From 8492fe21e701a025085ac569d6531d1dc5ca8a12 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Thu, 7 Dec 2017 10:41:23 +0100 Subject: [PATCH 4/7] ap51-flash: Remove FLASH_FROM_FILE preprocessor variable ap51-flash doesn't know the FLASH_FROM_FILE preprocessor variable and thus OpenWrt should not set it in its package Makefile. Signed-off-by: Sven Eckelmann --- utils/ap51-flash/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/ap51-flash/Makefile b/utils/ap51-flash/Makefile index ad52f74ae..57d681477 100644 --- a/utils/ap51-flash/Makefile +++ b/utils/ap51-flash/Makefile @@ -27,7 +27,7 @@ define Package/ap51-flash URL:=http://dev.cloudtrax.com/wiki/ap51-flash-station endef -TARGET_EXTRA_CFLAGS:=-DFLASH_FROM_FILE -D_GNU_SOURCE +TARGET_EXTRA_CFLAGS:=-D_GNU_SOURCE # pass optimization flags MAKE_FLAGS += \ From fbd6b2ac3e3657ab5edd7781dc88c9421849bbbd Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Thu, 7 Dec 2017 11:15:02 +0100 Subject: [PATCH 5/7] ap51-flash: Update to version 2017-12-07 * Added support for new OpenMesh devices: - A42 - A62 - G200 - D200 - P60 * Fix size calculation for combined ext images * Fixed build with musl Signed-off-by: Sven Eckelmann --- utils/ap51-flash/Makefile | 9 +++------ .../ap51-flash/patches/100-ipport_tftp_def.patch | 15 --------------- 2 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 utils/ap51-flash/patches/100-ipport_tftp_def.patch diff --git a/utils/ap51-flash/Makefile b/utils/ap51-flash/Makefile index 57d681477..c9827cf22 100644 --- a/utils/ap51-flash/Makefile +++ b/utils/ap51-flash/Makefile @@ -7,15 +7,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ap51-flash -PKG_VERSION:=2016-10-16 +PKG_VERSION:=2017-12-07 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=git://dev.cloudtrax.com/ap51-flash.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=48b3fbac1c30c5968b2608eb09b53ea37c310a24 +PKG_SOURCE_VERSION:=f94f9c99711d14a3c0186318d822d67d9d0ce391 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz -PKG_MIRROR_HASH:=4d00a1ceb480793db95e359cb95d63630920335415c7ffdcd05f2616cf1bc034 +PKG_MIRROR_HASH:=15786a0ecae9be5ed4e8f32940624d1a1c83da924294df08003616a863947074 PKG_MAINTAINER:=Russell Senior include $(INCLUDE_DIR)/package.mk @@ -27,11 +27,8 @@ define Package/ap51-flash URL:=http://dev.cloudtrax.com/wiki/ap51-flash-station endef -TARGET_EXTRA_CFLAGS:=-D_GNU_SOURCE - # pass optimization flags MAKE_FLAGS += \ - EXTRA_CFLAGS="$(TARGET_EXTRA_CFLAGS)" \ REVISION="$(PKG_VERSION)" \ ap51-flash diff --git a/utils/ap51-flash/patches/100-ipport_tftp_def.patch b/utils/ap51-flash/patches/100-ipport_tftp_def.patch deleted file mode 100644 index ec728c84f..000000000 --- a/utils/ap51-flash/patches/100-ipport_tftp_def.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: ap51-flash-2016-10-16/proto.c -=================================================================== ---- ap51-flash-2016-10-16.orig/proto.c -+++ ap51-flash-2016-10-16/proto.c -@@ -29,6 +29,10 @@ - #include "router_redboot.h" - #include "router_tftp_client.h" - -+#ifndef IPPORT_TFTP -+#define IPPORT_TFTP 69 -+#endif -+ - #define TFTP_SRC_PORT 13337 - #define REDBOOT_TELNET_SPORT 13337 - #define REDBOOT_TELNET_DPORT 9000 From bbf9b7f1f152aec34ec012c3dd31e0abc332d97a Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Thu, 7 Dec 2017 12:08:16 +0100 Subject: [PATCH 6/7] ap51-flash: Provide PKG_LICENSE* information Signed-off-by: Sven Eckelmann --- utils/ap51-flash/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/ap51-flash/Makefile b/utils/ap51-flash/Makefile index c9827cf22..f0ac74b2f 100644 --- a/utils/ap51-flash/Makefile +++ b/utils/ap51-flash/Makefile @@ -17,6 +17,8 @@ PKG_SOURCE_VERSION:=f94f9c99711d14a3c0186318d822d67d9d0ce391 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_MIRROR_HASH:=15786a0ecae9be5ed4e8f32940624d1a1c83da924294df08003616a863947074 PKG_MAINTAINER:=Russell Senior +PKG_LICENSE:=GPL-3.0+ +PKG_LICENSE_FILES:=LICENSES/preferred/GPL-3.0 include $(INCLUDE_DIR)/package.mk From 1c00bb9329129715d45d31f273490cfd4d10403d Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Thu, 7 Dec 2017 10:36:25 +0100 Subject: [PATCH 7/7] ap51-flash: Fix source repository URL The URL git://dev.cloudtrax.com/ap51-flash.git is not the actual public source repository URL for ap51-flash. It is not even accessible in the moment. The official repository can now be found at github. Signed-off-by: Sven Eckelmann --- utils/ap51-flash/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/ap51-flash/Makefile b/utils/ap51-flash/Makefile index f0ac74b2f..ea2eb2f80 100644 --- a/utils/ap51-flash/Makefile +++ b/utils/ap51-flash/Makefile @@ -11,7 +11,7 @@ PKG_VERSION:=2017-12-07 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=git://dev.cloudtrax.com/ap51-flash.git +PKG_SOURCE_URL:=https://github.com/ap51-flash/ap51-flash.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=f94f9c99711d14a3c0186318d822d67d9d0ce391 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz