From patchwork Sat Mar 5 00:27:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 592275 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (caladan.dune.hu [78.24.191.180]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3C17B1401C7 for ; Sat, 5 Mar 2016 11:28:45 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 3AD74B92030; Sat, 5 Mar 2016 01:27:43 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.1 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP; Sat, 5 Mar 2016 01:27:43 +0100 (CET) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 48FC6B92022 for ; Sat, 5 Mar 2016 01:27:40 +0100 (CET) X-policyd-weight: using cached result; rate:hard: -6.1 Received: from hauke-m.de (hauke-m.de [5.39.93.123]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Sat, 5 Mar 2016 01:27:40 +0100 (CET) Received: from hauke-desktop.fritz.box (p508B6622.dip0.t-ipconnect.de [80.139.102.34]) by hauke-m.de (Postfix) with ESMTPSA id 9F9171001AD; Sat, 5 Mar 2016 01:27:38 +0100 (CET) From: Hauke Mehrtens To: openwrt-devel@lists.openwrt.org, blogic@openwrt.org Date: Sat, 5 Mar 2016 01:27:20 +0100 Message-Id: <1457137650-23077-2-git-send-email-hauke@hauke-m.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1457137650-23077-1-git-send-email-hauke@hauke-m.de> References: <1457137650-23077-1-git-send-email-hauke@hauke-m.de> Subject: [OpenWrt-Devel] [PATCH v3 01/11] dsl-vrx200-firmware-xdsl: create Lantiq vrx200 firmware patches X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hauke Mehrtens MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Instead of having two big binaries only add one binary and then a patch to create the other one when needed at runtime. This is easier to handle in one Makeifle for both firmware files. Signed-off-by: Hauke Mehrtens --- .../lantiq/dsl-vrx200-firmware-xdsl-a/Makefile | 47 -------- .../lantiq/dsl-vrx200-firmware-xdsl-b/Makefile | 47 -------- .../lantiq/dsl-vrx200-firmware-xdsl/Makefile | 128 +++++++++++++++++++++ 3 files changed, 128 insertions(+), 94 deletions(-) delete mode 100644 package/firmware/lantiq/dsl-vrx200-firmware-xdsl-a/Makefile delete mode 100644 package/firmware/lantiq/dsl-vrx200-firmware-xdsl-b/Makefile create mode 100644 package/firmware/lantiq/dsl-vrx200-firmware-xdsl/Makefile diff --git a/package/firmware/lantiq/dsl-vrx200-firmware-xdsl-a/Makefile b/package/firmware/lantiq/dsl-vrx200-firmware-xdsl-a/Makefile deleted file mode 100644 index e8dd659..0000000 --- a/package/firmware/lantiq/dsl-vrx200-firmware-xdsl-a/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright (C) 2015 OpenWrt.org -# Copyright (C) 2015 Lantiq Beteiligungs GmbH & Co KG. -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. - -include $(TOPDIR)/rules.mk - -PKG_NAME:=dsl_vr9_firmware_xdsl -PKG_VERSION:=05.07.04.03.00.06_05.07.01.08.00.01_osc -PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources -PKG_MD5SUM:=4c8d9ca68dda88d3cfc0ca0fb946a63e - -include $(INCLUDE_DIR)/package.mk - -define Package/dsl-vrx200-firmware-xdsl-a - SECTION:=firmware - CATEGORY:=Firmware - TITLE:=VRX200 / VR9 CPE xDSL Annex A firmware - URL:=http://www.lantiq.com/ - DEPENDS:=@TARGET_lantiq_xrx200 -endef - -define Package/dsl-vrx200-firmware-xdsl-a/description - VRX200 / VR9 CPE VDSL and ADSL Annex A firmware -endef - -define Build/Prepare - rm -rf $(PKG_BUILD_DIR) - mkdir -p $(PKG_BUILD_DIR) - $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(PKG_SOURCE) -endef - -define Build/Compile -endef - -define Package/dsl-vrx200-firmware-xdsl-a/install - $(INSTALL_DIR) $(1)/lib/firmware/ - $(INSTALL_DATA) $(PKG_BUILD_DIR)/LICENSE $(1)/lib/firmware/xcpe_574306_571801.LICENSE - $(INSTALL_DATA) $(PKG_BUILD_DIR)/xcpe_574306_571801.bin $(1)/lib/firmware/ - ln -s xcpe_574306_571801.bin $(1)/lib/firmware/vdsl.bin - ln -s xcpe_574306_571801.bin $(1)/lib/firmware/adsl-a.bin -endef - -$(eval $(call BuildPackage,dsl-vrx200-firmware-xdsl-a)) diff --git a/package/firmware/lantiq/dsl-vrx200-firmware-xdsl-b/Makefile b/package/firmware/lantiq/dsl-vrx200-firmware-xdsl-b/Makefile deleted file mode 100644 index c283da2..0000000 --- a/package/firmware/lantiq/dsl-vrx200-firmware-xdsl-b/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright (C) 2015 OpenWrt.org -# Copyright (C) 2015 Lantiq Beteiligungs GmbH & Co KG. -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. - -include $(TOPDIR)/rules.mk - -PKG_NAME:=dsl_vr9_firmware_xdsl -PKG_VERSION:=05.07.03.03.00.06_05.07.01.0C.00.02_osc -PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources -PKG_MD5SUM:=af5581836cbe574574590c046fe45bab - -include $(INCLUDE_DIR)/package.mk - -define Package/dsl-vrx200-firmware-xdsl-b - SECTION:=firmware - CATEGORY:=Firmware - TITLE:=VRX200 / VR9 CPE xDSL Annex B firmware - URL:=http://www.lantiq.com/ - DEPENDS:=@TARGET_lantiq_xrx200 -endef - -define Package/dsl-vrx200-firmware-xdsl-b/description - VRX200 / VR9 CPE VDSL and ADSL Annex B firmware -endef - -define Build/Prepare - rm -rf $(PKG_BUILD_DIR) - mkdir -p $(PKG_BUILD_DIR) - $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(PKG_SOURCE) -endef - -define Build/Compile -endef - -define Package/dsl-vrx200-firmware-xdsl-b/install - $(INSTALL_DIR) $(1)/lib/firmware/ - $(INSTALL_DATA) $(PKG_BUILD_DIR)/LICENSE $(1)/lib/firmware/xcpe_573306_571C02.LICENSE - $(INSTALL_DATA) $(PKG_BUILD_DIR)/xcpe_573306_571C02.bin $(1)/lib/firmware/ - ln -s xcpe_573306_571C02.bin $(1)/lib/firmware/vdsl.bin - ln -s xcpe_573306_571C02.bin $(1)/lib/firmware/adsl-b.bin -endef - -$(eval $(call BuildPackage,dsl-vrx200-firmware-xdsl-b)) diff --git a/package/firmware/lantiq/dsl-vrx200-firmware-xdsl/Makefile b/package/firmware/lantiq/dsl-vrx200-firmware-xdsl/Makefile new file mode 100644 index 0000000..ab9a3dc --- /dev/null +++ b/package/firmware/lantiq/dsl-vrx200-firmware-xdsl/Makefile @@ -0,0 +1,128 @@ +# Copyright (C) 2015 OpenWrt.org +# Copyright (C) 2015 Lantiq Beteiligungs GmbH & Co KG. +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. + +include $(TOPDIR)/rules.mk + +PKG_NAME:=dsl_vr9_firmware_xdsl +PKG_VERSION:=05.07.04.03.00.06_05.07.01.08.00.01_osc +PKG_RELEASE:=1 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources +PKG_MD5SUM:=4c8d9ca68dda88d3cfc0ca0fb946a63e + +include $(INCLUDE_DIR)/package.mk + +PKG_B_NAME:=dsl_vr9_firmware_xdsl +PKG_B_VERSION:=05.07.03.03.00.06_05.07.01.0C.00.02_osc +PKG_B_SOURCE:=$(PKG_B_NAME)-$(PKG_B_VERSION).tar.gz + +ANNEX_A_VER:=574306_571801 +ANNEX_B_VER:=573306_571C02 + +define Download/dsl_vr9_firmware_xdsl_b + FILE:=$(PKG_B_SOURCE) + URL:=$(PKG_SOURCE_URL) + MD5SUM:=af5581836cbe574574590c046fe45bab +endef +$(eval $(call Download,dsl_vr9_firmware_xdsl_b)) + + +define Package/dsl-vrx200-firmware-xdsl-a + SECTION:=firmware + CATEGORY:=Firmware + TITLE:=VRX200 / VR9 CPE xDSL Annex A firmware + URL:=http://www.lantiq.com/ + DEPENDS:=@TARGET_lantiq_xrx200 +endef + +define Package/dsl-vrx200-firmware-xdsl-a/description + VRX200 / VR9 CPE VDSL and ADSL Annex A firmware +endef + +define Package/dsl-vrx200-firmware-xdsl-b + SECTION:=firmware + CATEGORY:=Firmware + TITLE:=VRX200 / VR9 CPE xDSL Annex B firmware + URL:=http://www.lantiq.com/ + DEPENDS:=@TARGET_lantiq_xrx200 +endef + +define Package/dsl-vrx200-firmware-xdsl-b/description + VRX200 / VR9 CPE VDSL and ADSL Annex B firmware +endef + +define Package/dsl-vrx200-firmware-xdsl-a-patch + SECTION:=firmware + CATEGORY:=Firmware + TITLE:=VRX200 / VR9 CPE xDSL Annex B to Annex A firmware patch + URL:=http://www.lantiq.com/ + DEPENDS:=@TARGET_lantiq_xrx200 +dsl-vrx200-firmware-xdsl-b +bspatch +endef + +define Package/dsl-vrx200-firmware-xdsl-a-patch/description + Patch which between the Annex A and Annex B firmware to create the Annex A firmware. +endef + +define Package/dsl-vrx200-firmware-xdsl-b-patch + SECTION:=firmware + CATEGORY:=Firmware + TITLE:=VRX200 / VR9 CPE xDSL Annex A to Annex B firmware patch + URL:=http://www.lantiq.com/ + DEPENDS:=@TARGET_lantiq_xrx200 +dsl-vrx200-firmware-xdsl-a +bspatch +endef + +define Package/dsl-vrx200-firmware-xdsl-b-patch/description + Patch which between the Annex A and Annex B firmware to create the Annex B firmware. +endef + +define Build/Prepare + rm -rf $(PKG_BUILD_DIR) + mkdir -p $(PKG_BUILD_DIR) + $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(PKG_SOURCE) + $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(PKG_B_SOURCE) +endef + +define Build/Compile + bsdiff \ + $(PKG_BUILD_DIR)/xcpe_$(ANNEX_A_VER).bin \ + $(PKG_BUILD_DIR)/xcpe_$(ANNEX_B_VER).bin \ + $(PKG_BUILD_DIR)/xcpe_$(ANNEX_A_VER)_to_$(ANNEX_B_VER).bspatch + bsdiff \ + $(PKG_BUILD_DIR)/xcpe_$(ANNEX_B_VER).bin \ + $(PKG_BUILD_DIR)/xcpe_$(ANNEX_A_VER).bin \ + $(PKG_BUILD_DIR)/xcpe_$(ANNEX_B_VER)_to_$(ANNEX_A_VER).bspatch +endef + +define Package/dsl-vrx200-firmware-xdsl-a/install + $(INSTALL_DIR) $(1)/lib/firmware/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/LICENSE $(1)/lib/firmware/xcpe_$(ANNEX_A_VER).LICENSE + $(INSTALL_DATA) $(PKG_BUILD_DIR)/xcpe_$(ANNEX_A_VER).bin $(1)/lib/firmware/ + ln -s xcpe_$(ANNEX_A_VER).bin $(1)/lib/firmware/lantiq-vrx200-a.bin +endef + +define Package/dsl-vrx200-firmware-xdsl-b/install + $(INSTALL_DIR) $(1)/lib/firmware/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/LICENSE $(1)/lib/firmware/xcpe_$(ANNEX_B_VER).LICENSE + $(INSTALL_DATA) $(PKG_BUILD_DIR)/xcpe_$(ANNEX_B_VER).bin $(1)/lib/firmware/ + ln -s xcpe_$(ANNEX_B_VER).bin $(1)/lib/firmware/lantiq-vrx200-b.bin +endef + +define Package/dsl-vrx200-firmware-xdsl-a-patch/install + $(INSTALL_DIR) $(1)/lib/firmware/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/xcpe_$(ANNEX_B_VER)_to_$(ANNEX_A_VER).bspatch $(1)/lib/firmware/ + ln -s xcpe_$(ANNEX_B_VER)_to_$(ANNEX_A_VER).bspatch $(1)/lib/firmware/lantiq-vrx200-b-to-a.bspatch +endef + +define Package/dsl-vrx200-firmware-xdsl-b-patch/install + $(INSTALL_DIR) $(1)/lib/firmware/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/xcpe_$(ANNEX_A_VER)_to_$(ANNEX_B_VER).bspatch $(1)/lib/firmware/ + ln -s xcpe_$(ANNEX_A_VER)_to_$(ANNEX_B_VER).bspatch $(1)/lib/firmware/lantiq-vrx200-a-to-b.bspatch +endef + +$(eval $(call BuildPackage,dsl-vrx200-firmware-xdsl-a)) +$(eval $(call BuildPackage,dsl-vrx200-firmware-xdsl-b)) +$(eval $(call BuildPackage,dsl-vrx200-firmware-xdsl-a-patch)) +$(eval $(call BuildPackage,dsl-vrx200-firmware-xdsl-b-patch))