From patchwork Thu Mar 15 20:51:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 886457 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (helo) smtp.helo=arrakis.dune.hu (client-ip=78.24.191.176; helo=arrakis.dune.hu; envelope-from=openwrt-devel-bounces@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mtH9dS5u"; dkim-atps=neutral Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 402LNn4nk4z9sTS for ; Fri, 16 Mar 2018 07:51:35 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 27E9BB90FEB; Thu, 15 Mar 2018 21:51:25 +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=-1.5 required=5.0 tests=BAYES_00,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; Thu, 15 Mar 2018 21:51:25 +0100 (CET) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id CC5D1B90C31 for ; Thu, 15 Mar 2018 21:51:23 +0100 (CET) X-policyd-weight: using cached result; rate: -7 Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Thu, 15 Mar 2018 21:51:23 +0100 (CET) Received: by mail-wr0-f195.google.com with SMTP id f14so9630415wre.8 for ; Thu, 15 Mar 2018 13:51:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=IwQTgScQgnK4chEChqMyCyjGuf76zUm5zXnHPwg4DUQ=; b=mtH9dS5ucrhlKcTyP/MvuoMwLo6F3xTtqzEnyHbwSinitm4shgsoIdgmajX4wgG37h T0QBwaMcJYl8NgpF3FMZrccHR72XAjhl4GyJ1ZUpV84mjDDRSwu7x8awhmuJMfGBhe/+ zLYWVcLgoYQ2mIzbQiGSmoGVH+09IQAUMgq6cBYd/iE/NwlsSduoZ0/wbXSrlRA0OWFi 4ZFG/edHU5/4omczMUwgiM/ABpvdxSTMZQ4t0rKsVl6Ovw9ZBpTRuyyxy3KZY3Q+w+0G bt8yYDMDwkown4GNDvGNMC4T5vFY5VOnECmhL7QAhfGynDhfj2WAC689tSqogiKGGIf/ E4rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=IwQTgScQgnK4chEChqMyCyjGuf76zUm5zXnHPwg4DUQ=; b=P+psS+o2Kq8znqkyo87vHVLWOp4nSgxQgjQIKn0/OMlZbvHtcvp7LFsVsyglCcy1q1 OJ5UNbqK6eXEEk9Cppo+udKBz5kChowRZUI3kgqBDdk1mAGwT/Haux6Q2KC4ZNUxjy06 PVZ6WRxU3xXnmQwvaXkq5JAS3Q4/CSE1eTqLvBhh/V63Jc0ZpjI4Y3LDfZlNFq/K750c EKysUkJJbC3cihEodvgtCBW2zgajxx5PUKgmhQfZjBJvQmJUg8usrzuat9eb2yPyXddi B2szc0VSeYI6leBr1PXVpFuB4MSuRe96Ozuf+kCLKDryAhbGGiDI2ennTdYqASHu9m7f 441g== X-Gm-Message-State: AElRT7HqzjNPcE11xwfYnWL99BhWNVIR7YMqXmV56BTOF4e31qV3BmLi cFSLrI1C0WdTV0i6cMaLssoKnryZ X-Google-Smtp-Source: AG47ELuTgKlABsHzOkM4/NsgAferXRcL2PMIX/r161OPlzZvAekzKWJAcu0mOa5X50q2g3WOOCiFjA== X-Received: by 10.223.208.132 with SMTP id y4mr96900wrh.238.1521147081283; Thu, 15 Mar 2018 13:51:21 -0700 (PDT) Received: from debian64.daheim (p200300D5FBC643FC0000000000000830.dip0.t-ipconnect.de. [2003:d5:fbc6:43fc::830]) by smtp.gmail.com with ESMTPSA id k18sm5942222wmd.4.2018.03.15.13.51.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Mar 2018 13:51:20 -0700 (PDT) Received: from chuck by debian64.daheim with local (Exim 4.90_1) (envelope-from ) id 1ewZqJ-0002fd-Qn; Thu, 15 Mar 2018 21:51:19 +0100 From: Christian Lamparter To: openwrt-devel@lists.openwrt.org Date: Thu, 15 Mar 2018 21:51:19 +0100 Message-Id: <20180315205119.10223-1-chunkeey@gmail.com> X-Mailer: git-send-email 2.16.2 Subject: [OpenWrt-Devel] [PATCH] build: revert "make image target wait for initramfs" 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: Venitex Aveon MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" This reverts commit 43be5087a915727e7dcb3459e2221f094c70811b. The change is incompatible with the image builder code. Luckily the RT-AC58U is no longer depending on the initramfs being available for the target's image generation rules. Reported-by: Venitex Aveon Signed-off-by: Christian Lamparter --- include/image.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/image.mk b/include/image.mk index 64c224e55f..771f5b2c76 100644 --- a/include/image.mk +++ b/include/image.mk @@ -480,7 +480,7 @@ define Device/Build/image ifndef IB $$(ROOTFS/$(1)/$(3)): $(if $(TARGET_PER_DEVICE_ROOTFS),target-dir-$$(ROOTFS_ID/$(3))) endif - $(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)): $$(KDIR_KERNEL_IMAGE) $$(ROOTFS/$(1)/$(3)) $$(if $$(CONFIG_TARGET_ROOTFS_INITRAMFS),$(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE)) + $(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)): $$(KDIR_KERNEL_IMAGE) $$(ROOTFS/$(1)/$(3)) @rm -f $$@ [ -f $$(word 1,$$^) -a -f $$(word 2,$$^) ] $$(call concat_cmd,$(if $(IMAGE/$(2)/$(1)),$(IMAGE/$(2)/$(1)),$(IMAGE/$(2))))