From patchwork Tue Feb 5 21:15:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas De Schampheleire X-Patchwork-Id: 1037202 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; 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="bWNrTRO6"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43vHS35LFLz9s3l for ; Wed, 6 Feb 2019 08:16:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 10B76227CC; Tue, 5 Feb 2019 21:15:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wOFmhCaXHF5f; Tue, 5 Feb 2019 21:15:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id DCDB7226E5; Tue, 5 Feb 2019 21:15:56 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 2BF601BF95C for ; Tue, 5 Feb 2019 21:15:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 29A16885A3 for ; Tue, 5 Feb 2019 21:15:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qio5xCEBfsL4 for ; Tue, 5 Feb 2019 21:15:51 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by hemlock.osuosl.org (Postfix) with ESMTPS id B7C9888596 for ; Tue, 5 Feb 2019 21:15:50 +0000 (UTC) Received: by mail-ed1-f68.google.com with SMTP id a20so4136818edc.8 for ; Tue, 05 Feb 2019 13:15:50 -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=iOZVi6fZqW2ozZKo7PBwqfvtr3TpFP3BFYz7whVZihw=; b=bWNrTRO61kEI6AzEDWmFqPOdRgzht0Di/CioA92l6Aid8LNH54yDT8D4TQM5UXvLTe Sokn3Z/FI4xYrMb3KgtaGI8UTR2aG00+oJ5WrpGTvGqeOcEd5dzVeK5+qHRgpaNKhcQF ys7i622lQvSfF1bk2wDyuj1rzzUWV/bQt6H9TwNmQdGihAV7eiV8t/xFC7YeB8W5yU6F m4uISqc5EZoE5+SZ4lBPB5r4jUo7c03Uptk+86JBUUMinJ7IRmrinnM7kitP9VOoSkLo Z+f1PkNmJwSyVxmT84MFaysu02OrA+nw9BZDKUGa694PwGXPjeVzSoNfX0YGbf5GRamr lBBQ== 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=iOZVi6fZqW2ozZKo7PBwqfvtr3TpFP3BFYz7whVZihw=; b=Jtnv6elWX8ZUGbn4Idn23q3xIbHAN6g8HjE+wpBsSiYVUxLgllpjYOJfzsT1Iova80 366qX0Stnc6o3/896HXy+2sYNKoGe8UltL3JXCxAk/qBmR1U9oHpSfZjoRPqV1ktlAoy W/HbOL9hIm0WowFZJEzGPJ4pOwsgDMaRaDnuhTwb4CWtdPvSIWcICk4LOP2BKNoBLgkf HQx1AAu0r7oEeVE2ZBCkZQg/c40yv5GVIJ/enigymeAJrTGoEBJHzfAzkTqC1EB/uKiN LBya8rFLzr0Sncr/phpqESeiokrz+nwhXmjKr3A/mMisLM11QcVqFyzcSY8bAP2knsaB dtFw== X-Gm-Message-State: AHQUAuZi5LpBnwGgPWOVQythkKUdbffCZ3UliT528UcRTzqNbOED5LFZ yVcmBIvCUxQvXK9ssV9kOUGp4la26aA= X-Google-Smtp-Source: AHgI3IZufYsQLBRcxixgDDLpfGO5GKUKu6tQLN3TU3MHn8qv3QEHrIqjRVNMuqDj6k8TjFbPgtL1gg== X-Received: by 2002:a50:fe15:: with SMTP id f21mr5353927edt.116.1549401348728; Tue, 05 Feb 2019 13:15:48 -0800 (PST) Received: from localhost.localdomain (ptr-5ltycmajy3605r3p7a.18120a2.ip6.access.telenet.be. [2a02:1810:530:b600:aa50:f99f:a32c:5156]) by smtp.gmail.com with ESMTPSA id r21sm2780373ejr.49.2019.02.05.13.15.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Feb 2019 13:15:48 -0800 (PST) From: Thomas De Schampheleire To: buildroot@buildroot.org Date: Tue, 5 Feb 2019 22:15:44 +0100 Message-Id: <20190205211544.26547-1-patrickdepinguin@gmail.com> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] toolchain-external: restrict copying of dynamic loader to ld*.so.* X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Thomas De Schampheleire Commit 32bec8ee2fb00c6750fa842bbb0eb79b0c081fa2 ("toolchain-external: copy ld*.so* for all C libraries") changed (among other things) the glob pattern to catch the dynamic loader from ld*.so.* to ld*.so* thus now matching files like 'ld-2.20.so' in addition to files like 'ld.so.1'. However, there is no apparent reason why that change was made. It is not explicitly mentioned in the commit message as to why that would be needed, nor is clear based on the rest of the changes in that commit. The consequence of the change is that more files than needed end up in the target root filesystem, adding extra unnecessary size to it. Therefore, revert the glob pattern back to what it was. Signed-off-by: Thomas De Schampheleire --- toolchain/toolchain-external/pkg-toolchain-external.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Seems this patch slipped through the cracks for a while. See earlier discussion at: http://patchwork.ozlabs.org/patch/882583/ but it seems I never submitted the patch I said I was going to. The code has been running successfully for almost a year in our different defconfigs/toolchains. diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index db3570d96f..e55cca539c 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -112,7 +112,7 @@ endif # Definitions of the list of libraries that should be copied to the target. # -TOOLCHAIN_EXTERNAL_LIBS += ld*.so* libgcc_s.so.* libatomic.so.* +TOOLCHAIN_EXTERNAL_LIBS += ld*.so.* libgcc_s.so.* libatomic.so.* ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y) TOOLCHAIN_EXTERNAL_LIBS += libc.so.* libcrypt.so.* libdl.so.* libm.so.* libnsl.so.* libresolv.so.* librt.so.* libutil.so.*