From patchwork Wed Mar 9 10:07:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 594929 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 1A7D71402A8 for ; Wed, 9 Mar 2016 21:07:33 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=AVc+tBYI; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 79D54B92AC9; Wed, 9 Mar 2016 11:07:22 +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=FREEMAIL_FROM, T_DKIM_INVALID 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; Wed, 9 Mar 2016 11:07:22 +0100 (CET) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id A3EA3B92AC1 for ; Wed, 9 Mar 2016 11:07:20 +0100 (CET) X-policyd-weight: using cached result; rate: -7 Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com [209.85.217.182]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Wed, 9 Mar 2016 11:07:20 +0100 (CET) Received: by mail-lb0-f182.google.com with SMTP id xr8so56285329lbb.1 for ; Wed, 09 Mar 2016 02:07:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=DckBW4RRN5+RytDkrvTscV+Xsq+JOa1h/rD1tOpNt9A=; b=AVc+tBYI7odLwNx/KbTXL2U56pkwnJm+Dgqda5sxROs9YEGqQE3Omx3inLsmNVGIWg 1Oo5kAVTyH715nRuP6kK46Bq4vKWWIdYMFTDovfFz+3A72seeFxnEuhg1Jg3gwsxGpxM wRc+gv7EIalMe8VusCIgDnkCNXBgM9Adv3jWx1I11O1t9CusL6qhLEBOCH+fB+YsIlvJ Hzh0b7pU6nGeH9K0yq7pnXdPb+g7H8ysMEwVINKvB6WC7ZuzfZL7TCrQ0AFdyotAKpEq KpXElc9Akw9V7rLH3UzN256lFdmVI3HOecAM1xpPebtlOyUDYe6Iro+gIl+qSf31DhaD LbGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=DckBW4RRN5+RytDkrvTscV+Xsq+JOa1h/rD1tOpNt9A=; b=bkbXRYZufQjQmdQd/gShNuP2UxclzCYU9bJzM0YMkbHtbPsCnHVDw7lDT1tEnHvp87 pUqnDXWB1xpnpjrGw8CbqDKJdUn1fje6KvQ9KkTpbcclciCqNnxc/IZbX3Z0/yargYfw bkbL5EzrC09KkdfCAUtWk/gyuqqGczLZLrbH8KbefxtPRYlD9oLeJ38Z2i/NmpFh1p69 HWLMNAZ7YJQHa+IFUZUMtxG/n9aAuhpBsivTk+Elzf1wR4tUTDaWVLBDoOYn7LVVBZB4 zDXtw0PesYk7IwV9C2j6ojbGxhlMI5l3YoHL+gUW7tBPVlghzQCBZsj30erfDxk8Ulb6 gniA== X-Gm-Message-State: AD7BkJK2ld74+rDSw+QJkbTzrbAa15RLEZy+JkGsA6GtsbT0yK1YSCAU6CN1nGmG+RLzNw== X-Received: by 10.25.158.136 with SMTP id h130mr11291031lfe.108.1457518039694; Wed, 09 Mar 2016 02:07:19 -0800 (PST) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id s75sm1208978lfs.21.2016.03.09.02.07.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Mar 2016 02:07:18 -0800 (PST) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: openwrt-devel@lists.openwrt.org Date: Wed, 9 Mar 2016 11:07:12 +0100 Message-Id: <1457518032-26994-1-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.8.4.5 Subject: [OpenWrt-Devel] [PATCH RFC] brcm47xx: image: create common TRX images using new building system 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: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Apart from using our new building system there are 2 more changes: 1) Limit amount of images So far we were generating all common images (standard one and two with no loader) for every SUBTARGET. This is not needed, as e.g. the only device requiring gzipped kernel is legacy Huawei E970. 2) Change output names The new image building system requires specifying device name. This forced picking some and resulted in: openwrt-brcm47xx-$(SUBTARGET)-squashfs.trx openwrt-brcm47xx-$(SUBTARGET)-squashfs-gz.trx openwrt-brcm47xx-$(SUBTARGET)-squashfs-noloader-nodictionary.trx becoming: openwrt-brcm47xx-$(SUBTARGET)-common-squashfs.trx openwrt-brcm47xx-$(SUBTARGET)-common-noloader-gz-squashfs.trx openwrt-brcm47xx-$(SUBTARGET)-common-noloader-nodictionarylzma-squashfs.trx --- I hope this change will make creating releases much easier. So far we got some problems to get final TRX images matching device images. I'm a bit unsure about adding this extra "-common" to output names. I'm afraid ppl may got used to the old simple names. On the other handle our new images building system doesn't allow keeping old names. Maybe we could add support for some extra callback like Image/Finish and rename them there? --- target/linux/brcm47xx/image/Makefile | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/target/linux/brcm47xx/image/Makefile b/target/linux/brcm47xx/image/Makefile index bbdb36b..e452136 100644 --- a/target/linux/brcm47xx/image/Makefile +++ b/target/linux/brcm47xx/image/Makefile @@ -141,6 +141,19 @@ define Device/Default IMAGE/trx := trx-with-loader endef +define Device/common +endef + +define Device/common-noloader-gz + KERNEL_NAME = vmlinux.gz + IMAGE/trx := trx-without-loader +endef + +define Device/common-noloader-nodictionarylzma + KERNEL_NAME = vmlinux-nodictionary.lzma + IMAGE/trx := trx-without-loader +endef + define Device/asus IMAGES := trx IMAGE/trx := trx-with-loader | asus-trx @@ -209,6 +222,8 @@ ifeq ($(SUBTARGET),generic) # BCMA SoC with SSB WiFi $(eval $(call LinksysDevice,wrt610n-v2,610N,2.0.0)) $(eval $(call LinksysDevice,e3000-v1,61XN,1.0.3)) + + TARGET_DEVICES += common endif ################################################# @@ -300,6 +315,8 @@ ifeq ($(SUBTARGET),legacy) $(eval $(call NetgearDevice,wgr614-v8,U12H072T00_NETGEAR,2)) $(eval $(call NetgearDevice,wndr3300-v1,U12H093T00_NETGEAR,2)) $(eval $(call NetgearDevice,wnr834b-v2,U12H081T00_NETGEAR,2)) + + TARGET_DEVICES += common common-noloader-gz endif ################################################# @@ -359,6 +376,8 @@ ifeq ($(SUBTARGET),mips74k) # $(eval $(call NetgearDevice,wnr3500u,U12H136T00_NETGEAR,2)) $(eval $(call NetgearDevice,wnr3500-v2,U12H127T00_NETGEAR,2)) # $(eval $(call NetgearDevice,wnr3500-v2-vc,U12H127T70_NETGEAR,2)) + + TARGET_DEVICES += common common-noloader-nodictionarylzma endif ################################################# @@ -379,21 +398,6 @@ endef # $(1): filesystem type. define Image/Build - $(STAGING_DIR_HOST)/bin/trx \ - -m 33554432 \ - -o $(BIN_DIR)/$(IMG_PREFIX)-$(1).trx \ - -f $(KDIR)/loader.gz -f $(KDIR)/vmlinux.lzma \ - $(call trxalign/$(1),$(1)) - $(STAGING_DIR_HOST)/bin/trx \ - -m 33554432 \ - -o $(BIN_DIR)/$(IMG_PREFIX)-$(1)-noloader-nodictionary.trx \ - -f $(KDIR)/vmlinux-nodictionary.lzma \ - $(call trxalign/$(1),$(1)) - $(STAGING_DIR_HOST)/bin/trx \ - -m 33554432 \ - -o $(BIN_DIR)/$(IMG_PREFIX)-$(1)-gz.trx \ - -f $(KDIR)/vmlinux.gz \ - $(call trxalign/$(1),$(1)) ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) $(call Image/Build/Initramfs) endif