From patchwork Thu Jul 18 13:31:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Maciej Nowak X-Patchwork-Id: 1133734 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=o2.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="m4EGN+zw"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=o2.pl header.i=@o2.pl header.b="UwGNQUyr"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45qFRl3Zw7z9s3l for ; Thu, 18 Jul 2019 23:32:19 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=6P4/8gVRCJ761jQZ/UCXoDrGAfnDLz0pG8EG6gMOFyc=; b=m4EGN+zwItAnntgqSvgd3E/Yih knp8tn4P7zsHVwmXAy5IlqpJybImushK5IbELSFfbvTtwawiQtYoHXHs886qXeOKmS6xpKlBT6XuB EmlcdJG10Do6LoUU5884FrUreVTetUYb0/U0+N35u0JfqeRk3rKYGaMHiKJKKKd7NvL+tn4KjSsl+ 4hUXUozCeAdJCrMHGMyrA2bWEblBM2/Ufp1rx+3ne1Tr6WzSX7P/wJ9pIC6+GaaJRuxh+czf/sLgG UCS80S6SX6i12gLoK+fCV+2M+FTNMsL/STOitBmOF1rKzRDMF0Iir4OqTa6ULl83wLuyxuDJSDpcE HU2eutCw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1ho6Vm-0005X2-TN; Thu, 18 Jul 2019 13:31:54 +0000 Received: from mx-out.tlen.pl ([193.222.135.142]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1ho6Vi-0005VS-8o for openwrt-devel@lists.openwrt.org; Thu, 18 Jul 2019 13:31:52 +0000 Received: (wp-smtpd smtp.tlen.pl 7980 invoked from network); 18 Jul 2019 15:31:45 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=o2.pl; s=1024a; t=1563456705; bh=tcQsZEe6REqYmkL7FgBqYacOapnx2G5a4P7gSmwDHX4=; h=From:To:Subject; b=UwGNQUyrLoR5iRXDYsnxTavsAU31q4zKmq2xlifITIHN4pwmYa3afQJs5GmGeQt73 5rsF0y64JWoYqCLukZhmj6XPgxkOzBjcHdtIgmLl/rObyMNI7bEiEegUwylHPN7d3E dvgu/IWFO5MNmbXpZYYjjK+ih7jdrgLhGLOn0zxs= Received: from 131.ip-164-132-48.eu (HELO localhost.localdomain) (tomek_n@o2.pl@[164.132.48.131]) (envelope-sender ) by smtp.tlen.pl (WP-SMTPD) with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP for ; 18 Jul 2019 15:31:45 +0200 From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Date: Thu, 18 Jul 2019 15:31:33 +0200 Message-Id: <20190718133135.6474-2-tomek_n@o2.pl> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190718133135.6474-1-tomek_n@o2.pl> References: <20190718133135.6474-1-tomek_n@o2.pl> MIME-Version: 1.0 X-WP-MailID: 7417b85bf33587bfbbac1fac0d646bb8 X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 0000000 [0UP0] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190718_063150_626230_DF9DC776 X-CRM114-Status: UNSURE ( 5.19 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tomek_n[at]o2.pl) -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain Subject: [OpenWrt-Devel] [PATCH v2 1/3] x86: image: cleanup before creating image X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org There can be some leftovers from other image recipes, if the same directory names are used and multiply image types are selected. Therefore remove directories used in the recipe, before contents for the image are prepared. Signed-off-by: Tomasz Maciej Nowak --- target/linux/x86/image/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index 24825f2ba2..9648f8c61e 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -61,6 +61,7 @@ ifneq ($(CONFIG_GRUB_IMAGES),) define Image/Build/grub2 # left here because the image builder doesnt need these + rm -fR $(KDIR)/root.grub $(KDIR)/grub2 $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2 $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz grub-mkimage \ @@ -94,6 +95,7 @@ ifneq ($(CONFIG_GRUB_IMAGES),) endif define Image/Build/iso + rm -fR $(KDIR)/root.grub $(KDIR)/grub2 $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2 $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz grub-mkimage \