From patchwork Wed Dec 30 20:04:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Salvaterra X-Patchwork-Id: 1421438 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.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=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=v9pkzqL/; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=QewijV+w; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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 4D5j5Z6g2Yz9sT5 for ; Thu, 31 Dec 2020 07:08:12 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject: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=8YUwtCVPvkumxf3TCMNOtYDtIoghp3UjESF+UVO7Sjc=; b=v9pkzqL/0LUeR0ki8cjvOI/aTb TCZjsIqdfrw0f6T6jMqr6RnMseUc/29sPDmEPcwoJ1dp3YBdIsTGuaiPnuYVk1n5pM+pInqu2kBVW 2ukem1rwZKq7vOMrvu/AZ8PbPx4SRsLq9aEUh2nkNB4HDA0Qhvgs7gFM0/c1R2MIL9H+a6oB9iHxF m7e1EbqvnKW3acSz2McNLnklEpiZ5JrB50lfRFBdGD5OmuzL/A2RaOBI46r6Cw+qYJwykeRXIwUJa SSewL8Ckac166sEy15b0yLrEL23p6Sq5D74bNEFm3W4DYJ+fHpdcvNe5wpjkwgBaai0i6c4N0SdeR QIxXLjSQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kuhii-0004Lo-TZ; Wed, 30 Dec 2020 20:05:20 +0000 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kuhiY-0004LE-QI for openwrt-devel@lists.openwrt.org; Wed, 30 Dec 2020 20:05:15 +0000 Received: by mail-ed1-x530.google.com with SMTP id b2so16450618edm.3 for ; Wed, 30 Dec 2020 12:05:07 -0800 (PST) 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=ax1oEN2JoeFXkh3ANbSGC8TaScormy+Dd3dpHoKm8JM=; b=QewijV+wfCXKrs5wXeNLY86hU5onRZa3Ytzd+fzkH3QfRXnIBpLd7QR0mi/Fc/WpVb D4vZj0E+VOEmQ/OP5XdTqAvLifqmri3K5/NKfSwfT8qqC06rIL3iM+OjyPAaqSAPA8yy ioG4X5JWhA06jbWhMqbOuLCYx5sqirBbiRvubEe+j0/PJdOJ+tfK5FLYKtoWjWOwv1on PK9gHHc00Got2DyPaY9mkrdAa12y3C15EJNv/qTZ6+N+MVyAuAjREC+MZgwVl7RJWzGe +eteD9jD4dZ6rnDWgsWN4EppIBdsjp2pkHqn9NPeeLhCzyMSHD7j9PA+8G3rwVMAju0N bT1Q== 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=ax1oEN2JoeFXkh3ANbSGC8TaScormy+Dd3dpHoKm8JM=; b=R1B/de/t7C4j7XNOxXBmh2ZZ0cDTn3evQyWz4qhRetnyZitFf/oN8xrOTR+LuWfoyR eoytVppqoeaTH1sLlDC0HRPBAUHpBVQebbmWKv4SIbqA8Wr7LUeVoEyP/MttYfbZB8vN FZ7jcZ+23LwOOW0eKTeFN/skAF463zCsb2Rmlo5c/plUlaQ6MsTKIOc1h15ARS0TN+sA sO5vKpvKy33gjW7kI2q7RCoVZ95HE32Li7joPtWA7XtyvRskRGabhBM0mNHvyDPt09kp mTD57WxJglLitzf38mNYPapBq2BIjt9XW87zo+DU000kGp/wZ1oxjol+QJWKGlZv6R9o qZNA== X-Gm-Message-State: AOAM530LwElTmZ6iDREphkCDFPFYVEfMJhukMVEzfD8x5+4PN95T2Olr 0mB4vDDdusTcE5LS/l4GrRTtpEINGg== X-Google-Smtp-Source: ABdhPJzzBvXXBTQlGKY/f628PN+t9sQ7KzRI3YT8Xme4m8BbWn6J+MjMk3mWIKmZBlPGex0LW7xE1w== X-Received: by 2002:a05:6402:1646:: with SMTP id s6mr51694311edx.319.1609358706054; Wed, 30 Dec 2020 12:05:06 -0800 (PST) Received: from presler.lan (a95-94-74-213.cpe.netcabo.pt. [95.94.74.213]) by smtp.gmail.com with ESMTPSA id t26sm19510009eji.22.2020.12.30.12.05.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Dec 2020 12:05:05 -0800 (PST) From: Rui Salvaterra To: openwrt-devel@lists.openwrt.org Subject: [PATCH] kernel-build: fix STRIP_KERNEL_EXPORTS for 64-bit kernels Date: Wed, 30 Dec 2020 20:04:42 +0000 Message-Id: <20201230200441.611456-1-rsalvaterra@gmail.com> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201230_150510_982324_E85E0CA2 X-CRM114-Status: GOOD ( 11.80 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.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 [rsalvaterra[at]gmail.com] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:530 listed in] [list.dnswl.org] -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 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_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rui Salvaterra , jo@mein.io, daniel@makrotopia.org, john@phrozen.org Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org While parsing the nm output, we need to account for the fact that 64-bit kernels have 64-bit wide addresses. While at it, replace the grep | sed combo with a single awk invocation and a stronger regex. Fixes: 2ef0acc5fcda557fa5aaad35d27cb8cf75be96d2 "kernel-build: fix STRIP_KERNEL_EXPORTS for recent kernels" Signed-off-by: Rui Salvaterra --- include/kernel-build.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 22f7c4c7c7..6123c9d456 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -105,7 +105,7 @@ define BuildKernel xargs $(TARGET_CROSS)nm | \ awk '$$$$1 == "U" { print $$$$2 } ' | \ sort -u > $(KERNEL_BUILD_DIR)/mod_symtab.txt - $(TARGET_CROSS)nm -n $(LINUX_DIR)/vmlinux.o | grep ' [rR] __ksymtab' | sed -e 's,........ [rR] __ksymtab_,,' > $(KERNEL_BUILD_DIR)/kernel_symtab.txt + $(TARGET_CROSS)nm -n $(LINUX_DIR)/vmlinux.o | awk '/^[0-9a-f]+ [rR] __ksymtab_/ {print substr($$$$3,11)}' > $(KERNEL_BUILD_DIR)/kernel_symtab.txt grep -Ff $(KERNEL_BUILD_DIR)/mod_symtab.txt $(KERNEL_BUILD_DIR)/kernel_symtab.txt > $(KERNEL_BUILD_DIR)/sym_include.txt grep -Fvf $(KERNEL_BUILD_DIR)/mod_symtab.txt $(KERNEL_BUILD_DIR)/kernel_symtab.txt > $(KERNEL_BUILD_DIR)/sym_exclude.txt ( \