From 12626b71b5ea14c3d1182c082439721adc1fd640 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Tue, 20 Oct 2020 07:20:35 -0700 Subject: [PATCH] RHEL 9.0.0 Alpha bootstrap The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/libocxl#e47180686fdc88d3c8b71e933b47c0ed8994f09b --- .gitignore | 3 + README.md | 5 ++ libocxl.spec | 98 ++++++++++++++++++++++++ remove_2_backslashes_in_shell_call.patch | 28 +++++++ remove_eng_inc_in_version_pl.patch | 38 +++++++++ sources | 1 + 6 files changed, 173 insertions(+) create mode 100644 README.md create mode 100644 libocxl.spec create mode 100644 remove_2_backslashes_in_shell_call.patch create mode 100644 remove_eng_inc_in_version_pl.patch create mode 100644 sources diff --git a/.gitignore b/.gitignore index e69de29..44330c9 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,3 @@ +/1.0.0-beta2.tar.gz +/libocxl-1.0.0.tar.gz +/1.1.0.tar.gz diff --git a/README.md b/README.md new file mode 100644 index 0000000..f7466c6 --- /dev/null +++ b/README.md @@ -0,0 +1,5 @@ +# libocxl + +The libocxl package; +access library which allows to implement a user-space +driver for an OpenCAPI accelerator. diff --git a/libocxl.spec b/libocxl.spec new file mode 100644 index 0000000..dd30a37 --- /dev/null +++ b/libocxl.spec @@ -0,0 +1,98 @@ +Name: libocxl +Version: 1.1.0 +Release: 6%{?dist} +Summary: Allows to implement a user-space driver for an OpenCAPI accelerator + +License: ASL 2.0 +URL: https://github.com/OpenCAPI/libocxl +Source0: https://github.com/OpenCAPI/libocxl/archive/%{version}.tar.gz +Patch1: remove_2_backslashes_in_shell_call.patch +Patch2: remove_eng_inc_in_version_pl.patch + +ExclusiveArch: ppc64le + +BuildRequires: gcc +BuildRequires: doxygen + +%description +Access library which allows to implement a user-space +driver for an OpenCAPI accelerator. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Recommends: %{name}-docs + +%package docs +Summary: Documentation files for %{name} +BuildArch: noarch + +%description devel +The *-devel package contains header file and man pages for +developing applications that use %{name}. + +%description docs +The *-docs package contains doxygen pages for +developing applications that use %{name}. + +%prep +%autosetup -p1 + +%build +LDFLAGS="%{build_ldflags}" CFLAGS="%{build_cflags}" make %{?_smp_mflags} V=1 + +%install +%make_install PREFIX=%{_prefix} + +%files +%license COPYING +%doc README.md +%{_libdir}/libocxl.so.* + +%files devel +%{_includedir}/* +%{_libdir}/libocxl.so +%{_mandir}/man3/* + +%files docs +%{_pkgdocdir} + +%changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jun 25 2020 Michel Normand 1.1.0-5 +- Add remove_2_backslashes_in_shell_call.patch + Add remove_eng_inc_in_version_pl.patch + to avoid f33 build failure + +* Wed Jan 29 2020 Fedora Release Engineering - 1.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 1.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 1.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Aug 31 2018 michel normand 1.1.0-1 +- updated to 1.1.0 + Requires Linux headers >= 4.18 to compile + Add support for POWER9 wake_host_thread/wait + (requires a compiler with GNU extensions for inline assembler) + Generate warnings on ignored return values + Use opaque structs rather than void pointers for ocxl handles + (this should be transparent to callers) + Verified GCC 4-8 & Clang 3.6.2-6.0.1 produce correct machine code + for OpenCAPI, and whitelisted them + Verify & enforce that we compile with strict ANSI C (2011) + +* Fri Jul 13 2018 Fedora Release Engineering - 1.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Jun 07 2018 Dan Horák - 1.0.0-1 +- updated to 1.0.0 final + +* Tue Apr 10 2018 michel normand 1.0.0-0.1 +- new package and spec file of libocxl from upstream + url: https://github.com/OpenCAPI/libocxl diff --git a/remove_2_backslashes_in_shell_call.patch b/remove_2_backslashes_in_shell_call.patch new file mode 100644 index 0000000..f77bc1b --- /dev/null +++ b/remove_2_backslashes_in_shell_call.patch @@ -0,0 +1,28 @@ +From: Michel Normand +Subject: remove 2 backslashes in shell call +Date: Fri, 12 Jun 2020 17:26:40 +0200 + +Remove 2 backslashes in shell call + +To avoid make failure. +Seems to start failing in OBS hardware project +between 2020-04-05 and 2020-04-08 + +Signed-off-by: Michel Normand +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: libocxl-1.1.0/Makefile +=================================================================== +--- libocxl-1.1.0.orig/Makefile ++++ libocxl-1.1.0/Makefile +@@ -18,7 +18,7 @@ HAS_WGET = $(shell /bin/which wget > /de + HAS_CURL = $(shell /bin/which curl > /dev/null 2>&1 && echo y || echo n) + + # Update this to test a single feature from the most recent header we require: +-CHECK_OCXL_HEADER_IS_UP_TO_DATE = $(shell /bin/echo -e \\\#include $(1)\\\nvoid test\(struct ocxl_ioctl_features test\)\; | \ ++CHECK_OCXL_HEADER_IS_UP_TO_DATE = $(shell /bin/echo -e \#include $(1)\\\nvoid test\(struct ocxl_ioctl_features test\)\; | \ + $(CC) $(CFLAGS) -Werror -x c -S -o /dev/null - > /dev/null 2>&1 && echo y || echo n) + + check_ocxl_header: diff --git a/remove_eng_inc_in_version_pl.patch b/remove_eng_inc_in_version_pl.patch new file mode 100644 index 0000000..26ca1cc --- /dev/null +++ b/remove_eng_inc_in_version_pl.patch @@ -0,0 +1,38 @@ +From: Michel Normand +Subject: remove perl english include in version.pl +Date: Thu, 25 Jun 2020 04:04:19 -0400 + +Remove perl english include in version.pl + +because not present anymore by default for Rawhide (f33) build env +and not mandatory to create the libocxl_info.h + +Signed-off-by: Michel Normand +--- + Makefile | 1 + + version.pl | 1 - + 2 files changed, 1 insertion(+), 1 deletion(-) + +Index: libocxl-1.1.0/version.pl +=================================================================== +--- libocxl-1.1.0.orig/version.pl ++++ libocxl-1.1.0/version.pl +@@ -1,6 +1,5 @@ + #!/usr/bin/env perl + +-use English; + use strict; + use warnings; + +Index: libocxl-1.1.0/Makefile +=================================================================== +--- libocxl-1.1.0.orig/Makefile ++++ libocxl-1.1.0/Makefile +@@ -37,6 +37,7 @@ src/libocxl_info.h: version.pl + VERSION_MAJOR=${VERSION_MAJOR} VERSION_MINOR=${VERSION_MINOR} \ + VERSION_PATCH=${VERSION_PATCH} CC="${CC}" CFLAGS="${CFLAGS}" \ + ./version.pl > src/libocxl_info.h ++ cat src/libocxl_info.h + + obj: + mkdir obj diff --git a/sources b/sources new file mode 100644 index 0000000..590872f --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (1.1.0.tar.gz) = 0306403290819f909f844a367873eeb5fc7e2996815bddb2eaf1b727b0d9ab801b6716c70d3229bb7dbf62f5df24d09b7451bdf1d831e6a5bfbc1cc1de834d9e