From 3e0466eaff95d6ac4eca4ee90fd7c9afc51a6de9 Mon Sep 17 00:00:00 2001 From: Gergely Kiss Date: Sat, 20 Dec 2014 23:01:56 +0100 Subject: [PATCH 1/2] shadow: fix libintl/libiconv dependencies Include nls.mk rather than explicitly using the stub versions. This allows to make the packages depend on the full versions of libiconv & libintl and thus to have full language support. Signed-off-by: Gergely Kiss --- utils/shadow/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/shadow/Makefile b/utils/shadow/Makefile index 2bab53615..0899248a2 100644 --- a/utils/shadow/Makefile +++ b/utils/shadow/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shadow PKG_VERSION:=4.2.1 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://pkg-shadow.alioth.debian.org/releases @@ -21,9 +21,8 @@ PKG_FIXUP:=autoreconf PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=libintl libiconv - include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk SHADOW_APPLETS := \ chage groupadd groupdel groupmod groups passwd su \ @@ -93,6 +92,7 @@ Package/shadow-utils/description = $(Package/shadow/description) define Package/shadow-common $(call Package/shadow/Default) TITLE:=Shared definitions for the PLD Linux shadow utilities + DEPENDS:=$(ICONV_DEPENDS) $(INTL_DEPENDS) HIDDEN:=1 endef From 7cdff9ec14382c5a8023ea682f5e18e57aa8fcaf Mon Sep 17 00:00:00 2001 From: Gergely Kiss Date: Sat, 20 Dec 2014 23:12:22 +0100 Subject: [PATCH 2/2] shadow-utils: remove dependency causing conflict The "+ALL:shadow" dependency causes conflict with passwd utility as it is provided by busybox in the default configuration. Signed-off-by: Gergely Kiss --- utils/shadow/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/utils/shadow/Makefile b/utils/shadow/Makefile index 0899248a2..8896f71ad 100644 --- a/utils/shadow/Makefile +++ b/utils/shadow/Makefile @@ -64,7 +64,6 @@ endef define Package/shadow-utils $(call Package/shadow/Default) - DEPENDS:=+ALL:shadow endef define Package/shadow-utils/config