From patchwork Fri Feb 6 14:01:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 437312 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 34044140271 for ; Sat, 7 Feb 2015 01:00:32 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 1E97128BF27; Fri, 6 Feb 2015 14:57:51 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id E092E28BF27 for ; Fri, 6 Feb 2015 14:57:43 +0100 (CET) X-policyd-weight: using cached result; rate:hard: -7.6 Received: from fudo.makrotopia.org (fudo.makrotopia.org [5.135.190.93]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Fri, 6 Feb 2015 14:57:43 +0100 (CET) Received: from local by fudo.makrotopia.org with esmtpsa (TLSv1.2:AES128-GCM-SHA256:128) (Exim 4.84) (envelope-from ) id 1YJjSC-0005n4-Jl; Fri, 06 Feb 2015 15:00:16 +0100 Date: Fri, 6 Feb 2015 15:01:24 +0100 From: Daniel Golle To: openwrt-devel@lists.openwrt.org Message-ID: <20150206140118.GA25634@makrotopia.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Subject: [OpenWrt-Devel] [PATCH] oxnas: copy ubinized images to binary folder X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Since r43778 ubinized images are stored inside KDIR. This makes sense when using an uninized image to generate a factory image. On oxnas ubinized images were used for sysupgrade before proper NAND support was implemented in OpenWrt. For users still on old builds before sysupgrade.tar was introduced, ubinized image is thus the only option to conveniantly upgrade to a more recent build. Copy ubinized image also to BIN_DIR, so it will be easier for users to find them. Signed-off-by: Daniel Golle --- target/linux/oxnas/image/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/linux/oxnas/image/Makefile b/target/linux/oxnas/image/Makefile index a3dae16..b09c67e 100644 --- a/target/linux/oxnas/image/Makefile +++ b/target/linux/oxnas/image/Makefile @@ -89,6 +89,7 @@ endef define Image/Build/squashfs $(call Image/Build/SysupgradeNAND,$(call sanitize_profile_name),$(1),$(KDIR)/fit-$(call sanitize_profile_name).itb) $(call Image/Build/UbinizeImage,$(call sanitize_profile_name),--uboot-env --kernel $(KDIR)/fit-$(call sanitize_profile_name).itb,$(1),$($(PROFILE)_UBI_OPTS)) + cp $(KDIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-squashfs-ubinized.bin $(BIN_DIR) endef define Image/mkfs/targz @@ -101,6 +102,7 @@ define Image/Build/ubifs ifneq ($($(PROFILE)_UBIFS_OPTS),) $(call Image/Build/SysupgradeNAND,$(call sanitize_profile_name),ubifs,$(KDIR)/fit-$(call sanitize_profile_name).itb) $(call Image/Build/UbinizeImage,$(call sanitize_profile_name),--uboot-env --kernel $(KDIR)/fit-$(call sanitize_profile_name).itb,ubifs,$($(PROFILE)_UBI_OPTS)) + cp $(KDIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-ubifs-ubinized.bin $(BIN_DIR) endif endef