From e8d96eac7a602a3c925a71855cdbe5dc81ec5f87 Mon Sep 17 00:00:00 2001 From: Andres Rodriguez Date: Wed, 13 Apr 2016 17:41:25 -0400 Subject: [PATCH] package: rename to hsathk-rocm-dev Since we include headers and not just a library anymore, we should be considered a -dev package and not a lib package. Change-Id: I220465ea4ffc8d66d8d76e6716e6c6c50cdacea1 [ROCm/ROCR-Runtime commit: 44572965f683368f290814e47f1b57d3ece18f19] --- projects/rocr-runtime/DEBIAN/control | 4 ++-- projects/rocr-runtime/RPM/libhsakmt.spec | 4 ++-- projects/rocr-runtime/src/Makefile | 12 ++++++++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/projects/rocr-runtime/DEBIAN/control b/projects/rocr-runtime/DEBIAN/control index 37474f0f19..750ebb4ba1 100644 --- a/projects/rocr-runtime/DEBIAN/control +++ b/projects/rocr-runtime/DEBIAN/control @@ -1,8 +1,8 @@ -Package: libhsakmt +Package: hsakmt-rocm-dev Architecture: amd64 Maintainer: Advanced Micro Devices Inc. Depends: Priority: optional -Version: 2.0.0 +Version: $version Description: Thunk library for AMD KFD diff --git a/projects/rocr-runtime/RPM/libhsakmt.spec b/projects/rocr-runtime/RPM/libhsakmt.spec index 77d7ed1be1..9e32e53426 100644 --- a/projects/rocr-runtime/RPM/libhsakmt.spec +++ b/projects/rocr-runtime/RPM/libhsakmt.spec @@ -1,5 +1,5 @@ -%define name libhsakmt -%define version 2.0.0 +%define name hsakmt-rocm-dev +%define version %{getenv:PACKAGE_VER} %define packageroot %{getenv:PACKAGE_DIR} Name: %{name} diff --git a/projects/rocr-runtime/src/Makefile b/projects/rocr-runtime/src/Makefile index 6d4c89cbe1..84a5dcea15 100644 --- a/projects/rocr-runtime/src/Makefile +++ b/projects/rocr-runtime/src/Makefile @@ -9,6 +9,12 @@ CFLAGS += $(foreach DIR,$(INCLUDES),-I$(DIR)) LIB_NAME = libhsakmt.so LIB_MAJOR_VER = 1 +PACKAGE_MAJOR_VER = 2 +PACKAGE_MINOR_VER = 0 +PACKAGE_PATCH_VER ?= 0 +PACKAGE_VER = $(PACKAGE_MAJOR_VER).$(PACKAGE_MINOR_VER).$(PACKAGE_PATCH_VER) +export PACKAGE_VER + # Compiler options CFLAGS += -fPIC # Position-independent code required to build shared library CFLAGS += -W -Wall -Wextra -Werror -Wno-unused-parameter @@ -71,7 +77,6 @@ export PACKAGE_DIR package-common: lnx64a @mkdir -p $(PACKAGE_DIR) - @cp -r $(DEBIAN_DIR) $(PACKAGE_DIR) @mkdir -p $(LDCONF_INSTALL_DIR) @cp -r $(LDCONF_FILE) $(LDCONF_INSTALL_DIR) @@ -89,7 +94,10 @@ package-common: lnx64a ln -fs ../$(INSTALL_INCLUDE_DIR) $(ROCM_INCLUDE)/ deb: package-common - @fakeroot dpkg-deb --build $(PACKAGE_DIR) $(BUILDDIR)/libhsakmt.deb + @mkdir -p $(PACKAGE_DIR)/DEBIAN + @sed 's/\$$version/$(PACKAGE_VER)/g' $(DEBIAN_DIR)/control > $(PACKAGE_DIR)/DEBIAN/control + @fakeroot dpkg-deb --build $(PACKAGE_DIR) \ + $(BUILDDIR)/hsakmt-dev-$(PACKAGE_VER)-amd64.deb rpm: package-common @rpmbuild --define '_topdir $(BUILD_ROOT)/rpm' -ba $(THUNK_ROOT)/RPM/libhsakmt.spec