p11-kit: fix configuration directory (#12246)
authorThibaut Robert <redacted>
Fri, 22 May 2020 08:43:50 +0000 (10:43 +0200)
committerGitHub <redacted>
Fri, 22 May 2020 08:43:50 +0000 (01:43 -0700)
* p11-kit: fix configuration directory

p11-kit looks for its configuration files in /etc/pkcs11, not /etc/p11-kit

Signed-off-by: Thibaut Robert <redacted>
* p11-kit: bump PKG_RELEASE

Signed-off-by: Thibaut Robert <redacted>
libs/p11-kit/Makefile

index 1503d120446c1113b92870305325195462d1c0ed..960c921267b585772c2fdc232c1ab5401d0ce69c 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=p11-kit
 PKG_VERSION:=0.23.20
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/p11-glue/p11-kit/releases/download/$(PKG_VERSION)
@@ -62,9 +62,9 @@ endef
 define Package/p11-kit/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libp11-kit.so.* $(1)/usr/lib/
-       $(INSTALL_DIR) $(1)/etc/p11-kit/modules/
+       $(INSTALL_DIR) $(1)/etc/pkcs11/modules/
 ifneq ($(CONFIG_PACKAGE_libopensc),)
-       $(CP) ./files/opensc.module $(1)/etc/p11-kit/modules/
+       $(CP) ./files/opensc.module $(1)/etc/pkcs11/modules/
 endif
 endef
 
git clone https://git.99rst.org/PROJECT