From patchwork Sun Mar 12 17:46:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 737852 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vh7kY1cv4z9s76 for ; Mon, 13 Mar 2017 04:47:48 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="cV84PYBf"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HDrdADRn"; dkim-atps=neutral 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=xqmJXAJ4r0F6PIR/i65bU4Ou0I6pmgR9htY1exIbyDM=; b=cV84PYBf+mNBKl URYai1PY/yOdi4RT1O7tVRQgK2FreUY4+NPtKE2cSAPOCxeDGR4Am+gADP7OqM6Upm9VS9VmBNY0N 9K0ytgg680QQeSxaEVir+5L9gAGRG7QU+TsxPNiheSULcojRByhqFE+VT3PXR+Th5i49dm6/B4s2y 55+oSoJ+zs6FLF3zrR2zfYxjF+EvoovHDnDXzXzcP5GruNyvtBlBDl9709DkkeK23fYkX9KP4727p r0c9JSTcqN9pkJdFZmCDZiFzhAMw0qy6UfrgNp7CCCtAZddxkwksZUseFC8ubv7/KYGK+ho0fmdlq QNVTSH2RR2t7pdgfU4Mg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cn7ao-0005Oy-Iw; Sun, 12 Mar 2017 17:47:42 +0000 Received: from mail-lf0-x244.google.com ([2a00:1450:4010:c07::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cn7ak-0005LG-0o for lede-dev@lists.infradead.org; Sun, 12 Mar 2017 17:47:41 +0000 Received: by mail-lf0-x244.google.com with SMTP id y193so10304025lfd.1 for ; Sun, 12 Mar 2017 10:47:14 -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:mime-version :content-transfer-encoding; bh=HoE+e0Op3e0g4xZ369lynfXTn8qMmhKG3KRrYHz6Xak=; b=HDrdADRnPz7hC2nDhQ+FoeOSbSFqzBwjNnA0m2viDp+LiUkHaeFRQMBAx79q2Nmfc7 sh37GD1wa12kUBSRSn48nIFL/GZ/w6T3NvJ46/PKypzORWejDmDK4maI7D77jGE4A4SI uLX0PevpvMWbrGW12Wtm4ikVgmNwQIMCisCKhTcRxpD1qMqz3z2qO1/nKdHmQItghsbg 6+LOSpLWwzZRcH82rsj9bL9bZ+eBqgES7nsS+fv5ameHrUh1ujZJtGjyV289YWRweJjG tKgadwk9xbBdPvgCLDOq/gk8cz4ohG3Izszt8g9RNAXsSOAC7yyYyue+EXtC1P+uF1Fh 3xXQ== 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:mime-version :content-transfer-encoding; bh=HoE+e0Op3e0g4xZ369lynfXTn8qMmhKG3KRrYHz6Xak=; b=KE1ZunROlHeumZs+sjTk0IGH89u5yOuL5T8ql9m9x+uyziaaRu9kAfR0Cr+Ok+3m4Y l1M4bRFZcy9XE5nZjW7qWzJmBUHUVw2cXRRUcOQLc7Ojr8aWdULLIQy+J4M9ZW2WXl3F v0+cZOjo2bfJksuq7ILNh9XR2YPk2j82vyg5fQkw+ikWm7Ad/WiATm//of8/xhElFHfI YvO3IAlIHiHwmmANY+d0R3OjqLYeAeQJgCWTXGGr3R019INJwkQXTQk2VXdSMNcS9unu kIRMLpjUHCcyc9K23Cio7aqqzkIeprcMJVK2clPIJsve2cM+aTzmjjbzwLf4ZLGK84ck S9zw== X-Gm-Message-State: AMke39mJlKcRi49SCE+o6Is0qd6vmh8ZDpy1oKosb4Wm4e5uSKakBk4MdF6Kz/eBOcXKMg== X-Received: by 10.46.9.136 with SMTP id 130mr9033759ljj.87.1489340833065; Sun, 12 Mar 2017 10:47:13 -0700 (PDT) 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 u128sm3071083lff.4.2017.03.12.10.47.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Mar 2017 10:47:12 -0700 (PDT) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Felix Fietkau , lede-dev@lists.infradead.org Date: Sun, 12 Mar 2017 18:46:59 +0100 Message-Id: <20170312174659.22628-1-zajec5@gmail.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170312_104738_281691_82E0B839 X-CRM114-Status: UNSURE ( 8.59 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:4010:c07:0:0:0:244 listed in] [list.dnswl.org] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (zajec5[at]gmail.com) 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zajec5[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [LEDE-DEV] [PATCH] x86: image: drop duplicated copy of bzImage into vmlinuz X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Rafał Miłecki It's already done once few lines earlier in the Image/Build/iso. Signed-off-by: Rafał Miłecki --- I used following change to make sure this is not needed: @@ -103,6 +103,7 @@ endef define Image/Build/iso $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2 $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz + md5sum $(KDIR)/root.grub/boot/vmlinuz grub-mkimage \ -p /boot/grub \ -d $(STAGING_DIR_HOST)/lib/grub/i386-pc \ @@ -121,6 +122,7 @@ define Image/Build/iso -e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \ ./grub-iso.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz + md5sum $(KDIR)/root.grub/boot/vmlinuz mkisofs -R -b boot/grub/eltorito.img -no-emul-boot -boot-info-table \ -o $(KDIR)/root.iso $(KDIR)/root.grub $(TARGET_DIR) endef I got following output: md5sum /lede/x86/build_dir/target-i386_pentium4_musl/linux-x86_generic/root.grub/boot/vmlinuz 1ecb33e1df18a322e975fe531fe27b6a /lede/x86/build_dir/target-i386_pentium4_musl/linux-x86_generic/root.grub/boot/vmlinuz grub-mkimage -p /boot/grub -d /lede/x86/staging_dir/host/lib/grub/i386-pc -o /lede/x86/build_dir/target-i386_pentium4_musl/linux-x86_generic/grub2/eltorito.img -O i386-pc -c ./grub-early.cfg biosdisk boot chain configfile iso9660 linux ls part_msdos reboot serial vga at_keyboard cat /lede/x86/staging_dir/host/lib/grub/i386-pc/cdboot.img /lede/x86/build_dir/target-i386_pentium4_musl/linux-x86_generic/grub2/eltorito.img > /lede/x86/build_dir/target-i386_pentium4_musl/linux-x86_generic/root.grub/boot/grub/eltorito.img sed -e 's#@SERIAL_CONFIG@#serial --unit=0 --speed=38400 --word=8 --parity=no --stop=1 --rtscts=off#g' -e 's#@TERMINAL_CONFIG@#terminal_input console serial; terminal_output console serial#g' -e 's#@CMDLINE@#root=/dev/sr0 rootfstype=iso9660 rootwait console=tty0 console=ttyS0,38400n8#g' -e 's#@TIMEOUT@#5#g' ./grub-iso.cfg > /lede/x86/build_dir/target-i386_pentium4_musl/linux-x86_generic/root.grub/boot/grub/grub.cfg cp -fpR /lede/x86/build_dir/target-i386_pentium4_musl/linux-x86_generic/bzImage /lede/x86/build_dir/target-i386_pentium4_musl/linux-x86_generic/root.grub/boot/vmlinuz md5sum /lede/x86/build_dir/target-i386_pentium4_musl/linux-x86_generic/root.grub/boot/vmlinuz 1ecb33e1df18a322e975fe531fe27b6a /lede/x86/build_dir/target-i386_pentium4_musl/linux-x86_generic/root.grub/boot/vmlinuz --- target/linux/x86/image/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index ef5b3c03c8..f34788d67b 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -120,7 +120,6 @@ define Image/Build/iso -e 's#@CMDLINE@#root=/dev/sr0 rootfstype=iso9660 rootwait $(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \ -e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \ ./grub-iso.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg - $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz mkisofs -R -b boot/grub/eltorito.img -no-emul-boot -boot-info-table \ -o $(KDIR)/root.iso $(KDIR)/root.grub $(TARGET_DIR) endef