From patchwork Fri Oct 31 15:19:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 405349 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 4C14E14007D for ; Sat, 1 Nov 2014 02:19:22 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3B9E691D7D; Fri, 31 Oct 2014 15:19:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SrsYDEKP-Qkj; Fri, 31 Oct 2014 15:19:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 833A9916A8; Fri, 31 Oct 2014 15:19:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id DD4041CE7F8 for ; Fri, 31 Oct 2014 15:19:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CE4579185C for ; Fri, 31 Oct 2014 15:19:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zOsKrR6TMEod for ; Fri, 31 Oct 2014 15:19:15 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from lupi.sysmic.org (sysmic.org [62.210.89.17]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5445C916A8 for ; Fri, 31 Oct 2014 15:19:15 +0000 (UTC) Received: from lupi.online.net (sysmic.org [62.210.89.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: jezz) by lupi.sysmic.org (Postfix) with ESMTPSA id 633934168D; Fri, 31 Oct 2014 16:19:13 +0100 (CET) From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= To: buildroot@busybox.net Date: Fri, 31 Oct 2014 16:19:09 +0100 Message-Id: <1414768749-15134-3-git-send-email-jezz@sysmic.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1414768749-15134-1-git-send-email-jezz@sysmic.org> References: <1414768749-15134-1-git-send-email-jezz@sysmic.org> MIME-Version: 1.0 Cc: "Yann E. MORIN" , =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Subject: [Buildroot] [PATCH v2 3/3] mysql: use /etc/ld.so.conf.d instead of /etc/ld.so.conf 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Jérôme Pouiller --- package/mysql/ld.so.conf.d-mysql.conf | 1 + package/mysql/mysql.mk | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 package/mysql/ld.so.conf.d-mysql.conf diff --git a/package/mysql/ld.so.conf.d-mysql.conf b/package/mysql/ld.so.conf.d-mysql.conf new file mode 100644 index 0000000..33d9ace --- /dev/null +++ b/package/mysql/ld.so.conf.d-mysql.conf @@ -0,0 +1 @@ +/usr/lib/mysql diff --git a/package/mysql/mysql.mk b/package/mysql/mysql.mk index 945ca18..1a35378 100644 --- a/package/mysql/mysql.mk +++ b/package/mysql/mysql.mk @@ -114,7 +114,10 @@ define MYSQL_REMOVE_TEST_PROGS endef define MYSQL_ADD_MYSQL_LIB_PATH - echo "/usr/lib/mysql" >> $(TARGET_DIR)/etc/ld.so.conf + $(INSTALL) -d $(TARGET_DIR)/etc/ld.so.conf.d + $(INSTALL) -m 644 \ + package/mysql g/ld.so.conf.d-mysql.conf \ + $(TARGET_DIR)/etc/ld.so.conf.d endef MYSQL_POST_INSTALL_TARGET_HOOKS += MYSQL_REMOVE_TEST_PROGS