From patchwork Sun Dec 14 15:28:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Beno=C3=AEt_Th=C3=A9baudeau?= X-Patchwork-Id: 420871 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 92AD31400D5 for ; Mon, 15 Dec 2014 02:29:01 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D1BCCA16E6; Sun, 14 Dec 2014 15:29:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7tGbIPHdQOzJ; Sun, 14 Dec 2014 15:28:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id D62B1A16CF; Sun, 14 Dec 2014 15:28:57 +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 5A16E1C1EA4 for ; Sun, 14 Dec 2014 15:28:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 54B3090F37 for ; Sun, 14 Dec 2014 15:28:56 +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 1890iy5u1oeB for ; Sun, 14 Dec 2014 15:28:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2BD1890F35 for ; Sun, 14 Dec 2014 15:28:55 +0000 (UTC) Received: by mail-wi0-f169.google.com with SMTP id r20so8396414wiv.0 for ; Sun, 14 Dec 2014 07:28:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=MWvlJA/xhQFLmJyATnEcwjpuBg/9paJKHDbUE3kJemw=; b=OuCwQ8fDwHcaDvjXjDkv75eAAaxVmNbjD6Ex4XRUspbmu06dbJdIJV5byetifb3Pof 4uN/UOaMF1d6e4jpEgLBAZpWbKbaWjyJ+0j/AAvkRPHuBeQ0PBg2F0ZjmS9CzotMdpTh +j6pLNvyWVueZEz2Np5I4MzCgN7rntdiS1fC57DT7xbADjEOCVquBfPJj9dD+kBxLlAd 4W7jYmveaVEy/TMElTbLGFSQZYdKnP7ftSexj2r4Om9nSy6E/Dh1vLEWHO4tV2HrhUAv 1wt+ANUctbmrIxgsoET5oUhgG/ll5hGMgc0gc/ifwzG2Bp69m5G58y3ijRHnupV3GDbn 3h+w== X-Received: by 10.180.84.134 with SMTP id z6mr2874118wiy.50.1418570933524; Sun, 14 Dec 2014 07:28:53 -0800 (PST) Received: from localhost.localdomain (vno44-1-88-172-188-148.fbx.proxad.net. [88.172.188.148]) by mx.google.com with ESMTPSA id et4sm9527701wjd.15.2014.12.14.07.28.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 14 Dec 2014 07:28:52 -0800 (PST) From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= To: buildroot@buildroot.org Date: Sun, 14 Dec 2014 16:28:16 +0100 Message-Id: <1418570896-3302-1-git-send-email-benoit.thebaudeau.dev@gmail.com> X-Mailer: git-send-email 2.1.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] samba: Swap libnss_win*.so* files and symlinks 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" The libnss_wins and libnss_winbind libraries were installed in this way: /lib/libnss_.so /lib/libnss_.so. -> /lib/libnss_.so This had been done like this in order to get something similar to the other NSS libraries, which are usually installed in this way: /lib/libnss_-.so /lib/libnss_.so. -> /lib/libnss_-.so However, besides these files, these other NSS libraries usually come installed with: /usr/lib/libnss_.so -> /lib/libnss_.so. This means that the NSS libraries follow the usual library installation practice, i.e. that the non-versioned .so is a symlink to the versioned .so, so that switching versions is easy. In the case of the NSS libraries, the versioned .so is just also a symlink to a .so with a more accurate version. Hence, follow the same rules for libnss_win*.so*, and install these libraries the other way around: /lib/libnss_.so -> /lib/libnss_.so. /lib/libnss_.so. This is also how these libraries are installed by a major OS like Ubuntu 14.10: /lib/x86_64-linux-gnu/libnss_winbind.so -> libnss_winbind.so.2 /lib/x86_64-linux-gnu/libnss_winbind.so.2 /lib/x86_64-linux-gnu/libnss_wins.so -> libnss_wins.so.2 /lib/x86_64-linux-gnu/libnss_wins.so.2 Signed-off-by: Benoît Thébaudeau --- package/samba/samba.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/samba/samba.mk b/package/samba/samba.mk index 0e4db95..d25e94e 100644 --- a/package/samba/samba.mk +++ b/package/samba/samba.mk @@ -137,16 +137,16 @@ SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_REMOVE_UNNEEDED_BINARIES ifeq ($(BR2_PACKAGE_SAMBA_LIBNSS_WINS),y) define SAMBA_INSTALL_LIBNSS_WINS - $(INSTALL) -m 0755 -D $(@D)/nsswitch/libnss_wins.so $(TARGET_DIR)/lib/libnss_wins.so - ln -snf libnss_wins.so $(TARGET_DIR)/lib/libnss_wins.so.2 + $(INSTALL) -m 0755 -D $(@D)/nsswitch/libnss_wins.so $(TARGET_DIR)/lib/libnss_wins.so.2 + ln -snf libnss_wins.so.2 $(TARGET_DIR)/lib/libnss_wins.so endef SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_INSTALL_LIBNSS_WINS endif ifeq ($(BR2_PACKAGE_SAMBA_LIBNSS_WINBIND),y) define SAMBA_INSTALL_LIBNSS_WINBIND - $(INSTALL) -m 0755 -D $(@D)/nsswitch/libnss_winbind.so $(TARGET_DIR)/lib/libnss_winbind.so - ln -snf libnss_winbind.so $(TARGET_DIR)/lib/libnss_winbind.so.2 + $(INSTALL) -m 0755 -D $(@D)/nsswitch/libnss_winbind.so $(TARGET_DIR)/lib/libnss_winbind.so.2 + ln -snf libnss_winbind.so.2 $(TARGET_DIR)/lib/libnss_winbind.so endef SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_INSTALL_LIBNSS_WINBIND endif