From patchwork Thu Feb 25 14:56:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Hunleth X-Patchwork-Id: 588128 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id DB2A6140322 for ; Fri, 26 Feb 2016 01:57:08 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=troodon-software-com.20150623.gappssmtp.com header.i=@troodon-software-com.20150623.gappssmtp.com header.b=yGByGBDd; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0F8FD95709; Thu, 25 Feb 2016 14:57:08 +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 TtqSb733H+JZ; Thu, 25 Feb 2016 14:57:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 68D09956B1; Thu, 25 Feb 2016 14:57:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 40CE61C1F3A for ; Thu, 25 Feb 2016 14:57:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 37D2733C4D for ; Thu, 25 Feb 2016 14:57:06 +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 AncmI5RoWMoe for ; Thu, 25 Feb 2016 14:57:05 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qg0-f66.google.com (mail-qg0-f66.google.com [209.85.192.66]) by silver.osuosl.org (Postfix) with ESMTPS id 5788833C3E for ; Thu, 25 Feb 2016 14:57:05 +0000 (UTC) Received: by mail-qg0-f66.google.com with SMTP id y89so3537467qge.0 for ; Thu, 25 Feb 2016 06:57:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=troodon-software-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=OzvsZ1rAIvCPblrOMbuti8ro8lNfd7Y29v3GYeKJKtQ=; b=yGByGBDdmj5NMEE/4C5o27UKw+/uzNCUSG4GmVlHC0KSlPkgMrJqTGndDocg7Djazs JU3O70xIwVwEy82bz47T9Buq9s2xOQ1Jh6o6KeNsYYzpW828satw2zlzM3oSHAxiW2AN 73G2fk3NN8V71/n+JI541AP9k6kDBXcd4EcvH3X3lMYKCJDYvCRq961xy9LMFWCoGnWT 86MCZkxf7dT9oXSm0fE6XithqJ41izyiYNOqrpfm/zWl8kiB1skCN7Z1f6BKPLqcaOnp lQUHZMA4Ma9AnOWLukBBURBxj7QOV71tZH3C6gDuGCdvCqvpMVF/hGeHYzitD2xDPDEl KRqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=OzvsZ1rAIvCPblrOMbuti8ro8lNfd7Y29v3GYeKJKtQ=; b=EyT83H/NySZvC3tyCFl6WY/C3kndWRBKeyuCeuj4cJgiJiZ6C2SicnvbvIEsOORdFD wdcU53Eb/IMkoT64VO4rc55NOovGsb/UgwTsYfaRo9A5T5H8b7pOUcBBKoWb+Fgb13d/ lrN2/30zgSAjd4SpyTwpwnWljKrzmWEjYgjJ0tZLZ+Ot7HvjOyHNptZylLLzdRJUPB1N Zi0Koe9s3/NrGHJYiPgEeKXMvd9a8nIe9o4mLgwLLVSJfnYlmxbYHCMSy3KXE37HmFIB KOGrZ7susN0r+7lPAszfdSPY++oFukog+8yyfnP0AzyG8Mq+13E+J/zLh1xPwv768m0F nEkw== X-Gm-Message-State: AG10YOSE59OtYksWTTtOr883fgjcfDmzsrvqERPrHif7HyF7wkc28wDdSKyKqraTy4PHZQ== X-Received: by 10.140.104.242 with SMTP id a105mr56942728qgf.1.1456412224323; Thu, 25 Feb 2016 06:57:04 -0800 (PST) Received: from halfmarathon.home.hunleth.com (pool-100-36-100-112.washdc.fios.verizon.net. [100.36.100.112]) by smtp.gmail.com with ESMTPSA id q69sm2818267qki.11.2016.02.25.06.57.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Feb 2016 06:57:03 -0800 (PST) From: Frank Hunleth To: buildroot@buildroot.org Date: Thu, 25 Feb 2016 09:56:35 -0500 Message-Id: <1456412195-8283-1-git-send-email-fhunleth@troodon-software.com> X-Mailer: git-send-email 2.5.0 Subject: [Buildroot] [PATCH 1/1] erlang: remove unwanted packages from staging too X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This fixes an issue where an Erlang program compiles fine against files in staging, but fails to run on the target due to the unwanted packages being removed. Signed-off-by: Frank Hunleth --- package/erlang/erlang.mk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk index 638d2c2..88b0d42 100644 --- a/package/erlang/erlang.mk +++ b/package/erlang/erlang.mk @@ -74,7 +74,13 @@ ifneq ($(BR2_PACKAGE_ERLANG_MEGACO),y) ERLANG_REMOVE_PACKAGES += megaco endif -define ERLANG_REMOVE_UNUSED +define ERLANG_REMOVE_STAGING_UNUSED + for package in $(ERLANG_REMOVE_PACKAGES); do \ + rm -rf $(STAGING_DIR)/usr/lib/erlang/lib/$${package}-*; \ + done +endef + +define ERLANG_REMOVE_TARGET_UNUSED find $(TARGET_DIR)/usr/lib/erlang -type d -name src -prune -exec rm -rf {} \; find $(TARGET_DIR)/usr/lib/erlang -type d -name examples -prune -exec rm -rf {} \; for package in $(ERLANG_REMOVE_PACKAGES); do \ @@ -82,7 +88,8 @@ define ERLANG_REMOVE_UNUSED done endef -ERLANG_POST_INSTALL_TARGET_HOOKS += ERLANG_REMOVE_UNUSED +ERLANG_POST_INSTALL_STAGING_HOOKS += ERLANG_REMOVE_STAGING_UNUSED +ERLANG_POST_INSTALL_TARGET_HOOKS += ERLANG_REMOVE_TARGET_UNUSED $(eval $(autotools-package)) $(eval $(host-autotools-package))