From patchwork Thu Nov 9 00:05:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 836085 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=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yXNjb4xthz9s03 for ; Thu, 9 Nov 2017 11:05:54 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0D24430DAE; Thu, 9 Nov 2017 00:05:49 +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 dL0xd0qtgfOD; Thu, 9 Nov 2017 00:05:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 0349430DA1; Thu, 9 Nov 2017 00:05:47 +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 2A3B01C11CB for ; Thu, 9 Nov 2017 00:05:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 22B0330DA1 for ; Thu, 9 Nov 2017 00:05:45 +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 rVFIgsGgDaHs for ; Thu, 9 Nov 2017 00:05:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.datacom.ind.br (mx.datacom.ind.br [177.66.5.10]) by silver.osuosl.org (Postfix) with ESMTPS id 880FA2F35C for ; Thu, 9 Nov 2017 00:05:43 +0000 (UTC) Received: from mail.datacom.ind.br (localhost [127.0.0.1]) by mail.datacom.ind.br (Postfix) with ESMTPS id C5B3B15AFBD1; Wed, 8 Nov 2017 22:03:19 -0200 (BRST) Received: from localhost (localhost [127.0.0.1]) by mail.datacom.ind.br (Postfix) with ESMTP id AB05215AFBE1; Wed, 8 Nov 2017 22:03:19 -0200 (BRST) Received: from mail.datacom.ind.br ([127.0.0.1]) by localhost (mail.datacom.ind.br [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id CgfhATPkKVK6; Wed, 8 Nov 2017 22:03:19 -0200 (BRST) Received: from p7-1130br.casantos.org (201.47.196.127.dynamic.adsl.gvt.net.br [201.47.196.127]) by mail.datacom.ind.br (Postfix) with ESMTPSA id 3B97215AFBD1; Wed, 8 Nov 2017 22:03:19 -0200 (BRST) From: Carlos Santos To: buildroot@buildroot.org Date: Wed, 8 Nov 2017 22:05:33 -0200 Message-Id: <20171109000533.26181-1-casantos@datacom.ind.br> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171108234258.15035-1-casantos@datacom.ind.br> References: <20171108234258.15035-1-casantos@datacom.ind.br> Subject: [Buildroot] [PATCH] util-linux: explicitly use /usr/{bin, sbin, lib}, with merged usr X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Prevent the installation from attempting to move shared libraries from ${usrlib_execdir} to ${libdir} if both paths are the same, which leads to error messages like this: mv: '$(TARGET_DIR)/usr/lib/libfoo.so.1' and '$(TARGET_DIR)/lib/libfoo.so.1' are the same file That error is not fatal but let's avoid possible future problems. Signed-off-by: Carlos Santos --- Changes v1->v2: Fix commit message to remove spurious "not". --- package/util-linux/util-linux.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 8464288600..31a3fe47ab 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -41,6 +41,13 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y) UTIL_LINUX_DEPENDENCIES += busybox endif +# Prevent the installation from attempting to move shared libraries from +# ${usrlib_execdir} (/usr/lib) to ${libdir} (/lib), since both paths are +# the same when merged usr is in use. +ifeq ($(BR2_ROOTFS_MERGED_USR),y) +UTIL_LINUX_CONF_OPTS += --bindir=/usr/bin --sbindir=/usr/sbin --libdir=/usr/lib +endif + ifeq ($(BR2_PACKAGE_NCURSES),y) UTIL_LINUX_DEPENDENCIES += ncurses ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)