diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-11-29 16:48:36 -0800 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2020-11-29 17:00:05 -0800 |
| commit | b75f250f3bf378bcaa0784d44f64ff2bb4e7af9a (patch) | |
| tree | 53c59effaa081ec9a7e6d7bc2a550be83617652a /libs/libpam/Makefile | |
| parent | e728d3d73508ba849ea14729c00cd0975d1ea961 (diff) | |
libpam: update to 1.5.1
Fix installed paths. After e52d0487e88c3c8c57e1310d1a02b18eae0d142e
upstream, this bug was exposed.
Instead of working around it, fix the patch.
After this, everything consistently gets installed to ipkg-install/usr.
Minor Makefile reorganization.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'libs/libpam/Makefile')
| -rw-r--r-- | libs/libpam/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libs/libpam/Makefile b/libs/libpam/Makefile index 719ab826c..7bc16dfca 100644 --- a/libs/libpam/Makefile +++ b/libs/libpam/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libpam -PKG_VERSION:=1.5.0 +PKG_VERSION:=1.5.1 PKG_RELEASE:=1 PKG_SOURCE:=Linux-PAM-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/linux-pam/linux-pam/releases/download/v$(PKG_VERSION) -PKG_HASH:=02d39854b508fae9dc713f7733bbcdadbe17b50de965aedddd65bcb6cc7852c8 +PKG_HASH:=201d40730b1135b1b3cdea09f2c28ac634d73181ccd0172ceddee3649c5792fc PKG_BUILD_DIR:=$(BUILD_DIR)/Linux-PAM-$(PKG_VERSION) PKG_MAINTAINER:=Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com> @@ -22,8 +22,8 @@ PKG_LICENSE_FILES:=COPYING Copyright PKG_CPE_ID:=cpe:/a:kernel:linux-pam PKG_FIXUP:=autoreconf -PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk @@ -60,21 +60,21 @@ CONFIGURE_ARGS += \ --without-xauth define Build/InstallDev - $(INSTALL_DIR) $(1)/lib $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/lib/* $(1)/lib/ + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ endef define Package/libpam/install - $(INSTALL_DIR) $(1)/lib $(1)/lib/security $(1)/lib/security/pam_filter $(INSTALL_DIR) $(1)/etc $(1)/etc/pam.d + $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/lib/security $(1)/usr/lib/security/pam_filter $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/lib/*.so* $(1)/lib/ - $(CP) $(PKG_INSTALL_DIR)/lib/security/*.so* $(1)/lib/security/ - $(CP) $(PKG_INSTALL_DIR)/lib/security/pam_filter/* $(1)/lib/security/pam_filter/ $(CP) $(PKG_INSTALL_DIR)/etc/* $(1)/etc/ $(CP) ./files/* $(1)/etc/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/security/*.so* $(1)/usr/lib/security/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/security/pam_filter/* $(1)/usr/lib/security/pam_filter/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ endef |