diff options
| author | Rosen Penev <rosenp@gmail.com> | 2019-08-27 15:21:19 -0700 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2019-08-28 14:29:44 -0700 |
| commit | ccc3b6d44a3e8c21dae3e011fa18195625ac27b3 (patch) | |
| tree | 3edfb8815c5da64a5261473cc5411a444b0959a3 | |
| parent | 122426c6514d3f5f34bc8b7e7c4b52b0bc50b8f5 (diff) | |
keyutils: Pass OpenWrt CFLAGS directly.
Needed for compilation with PKG_ASLR_PIE.
Replaced Build/Compile with PKG_INSTALL.
Adjusted install paths for consistency.
Added license information.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
| -rw-r--r-- | libs/keyutils/Makefile | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/libs/keyutils/Makefile b/libs/keyutils/Makefile index 430473cd4..f88e4f484 100644 --- a/libs/keyutils/Makefile +++ b/libs/keyutils/Makefile @@ -7,12 +7,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=keyutils PKG_VERSION:=1.6 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://people.redhat.com/dhowells/keyutils/ PKG_HASH:=d3aef20cec0005c0fa6b4be40079885567473185b1a57b629b030e67942c7115 +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 + include $(INCLUDE_DIR)/package.mk define Package/libkeyutils @@ -20,6 +23,9 @@ define Package/libkeyutils CATEGORY:=Libraries TITLE:=Key utilities library URL:=https://people.redhat.com/dhowells/keyutils/ + LICENSE:=LGPL-2.1-or-later + LICENSE_FILES:=LICENSE.LGPL + ABI_VERSION:=1 endef define Package/keyctl @@ -28,31 +34,36 @@ define Package/keyctl SUBMENU:=Encryption TITLE:=keyctl DEPENDS:=+libkeyutils + LICENSE:=GPL-2.0-or-later + LICENSE_FILES:=LICENSE.GPL endef define Package/keyutils/description Key utilities endef -define Build/Install - make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) LIBDIR=/usr/lib install -endef +MAKE_FLAGS += \ + BINDIR=/usr/bin \ + LIBDIR=/usr/lib \ + SBINDIR=/usr/sbin \ + CFLAGS="$(TARGET_CFLAGS) $(FPIC)" define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libkeyutils.{a,so*} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libkeyutils.a $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libkeyutils.so.$(ABI_VERSION)* $(1)/usr/lib/ endef define Package/libkeyutils/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libkeyutils.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libkeyutils.so.$(ABI_VERSION)* $(1)/usr/lib/ endef define Package/keyctl/install - $(INSTALL_DIR) $(1)/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/keyctl $(1)/bin + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/keyctl $(1)/usr/bin endef $(eval $(call BuildPackage,libkeyutils)) |