Skip to content

Commit

Permalink
linux/ena: Update driver version to 2.12.1
Browse files Browse the repository at this point in the history
Also updated release notes and RPM files.

Signed-off-by: David Arinzon <darinzon@amazon.com>
  • Loading branch information
davidarinzon committed May 23, 2024
1 parent a9a137e commit 20ebf84
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 10 deletions.
4 changes: 4 additions & 0 deletions kernel/linux/ena/RELEASENOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ The driver was verified on the following distributions:
* SUSE Linux Enterprise Server 12 SP2 or newer
* SUSE Linux Enterprise Server 15 or newer

## r2.12.1 release notes
**Bug fixes**
* Resolve a `-Wmissing-prototypes` compilation warning

## r2.12.0 release notes
**New Features**
* Add support for device reset request over AENQ
Expand Down
2 changes: 1 addition & 1 deletion kernel/linux/ena/ena_netdev.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#define DRV_MODULE_GEN_MAJOR 2
#define DRV_MODULE_GEN_MINOR 12
#define DRV_MODULE_GEN_SUBMINOR 0
#define DRV_MODULE_GEN_SUBMINOR 1

#define DRV_MODULE_NAME "ena"
#ifndef DRV_MODULE_GENERATION
Expand Down
2 changes: 1 addition & 1 deletion kernel/linux/rpm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Author: Cristian Gafton <gafton@amazon.com>

NAME = ena
VERSION = 2.12.0
VERSION = 2.12.1

TOPDIR := $(shell git rev-parse --show-toplevel)

Expand Down
12 changes: 6 additions & 6 deletions kernel/linux/rpm/README-rpm.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Once the pre-requisites have been installed, you can simply issue a
"make" in this directory to build the kmod src.rpm package:

bash$ make
cd .. && git archive --format=tar --prefix=ena-2.12.0/ -o rpm/ena-2.12.0.tar ena_linux_2.12.0
cd .. && git archive --format=tar --prefix=ena-2.12.1/ -o rpm/ena-2.12.1.tar ena_linux_2.12.1
rpmbuild -bs \
--define '_topdir %(pwd)' --define '_ntopdir %(pwd)' \
--define '_builddir %{_ntopdir}' \
Expand All @@ -46,7 +46,7 @@ rpmbuild -bs \
--define '_rpmdir %{_ntopdir}' \
--define '_srcrpmdir %{_ntopdir}' \
ena.spec
Wrote: /home/ec2-user/amzn-drivers/rpm/ena-2.12.0-1.el7.3.src.rpm
Wrote: /home/ec2-user/amzn-drivers/rpm/ena-2.12.1-1.el7.3.src.rpm
bash$ _


Expand All @@ -55,16 +55,16 @@ COMPILING AND INSTALLING
Once the src.rpm has been created, you can build binary packages for
the installed kernel-devel and kernel-headers environments:

bash$ rpmbuild --rebuild ena-2.12.0-1.el7.3.src.rpm
bash$ rpmbuild --rebuild ena-2.12.1-1.el7.3.src.rpm
[....]
Wrote: /home/ec2-user/rpmbuild/RPMS/x86_64/kmod-ena-2.12.0-1.el7.3.x86_64.rpm
Wrote: /home/ec2-user/rpmbuild/RPMS/x86_64/ena-debuginfo-2.12.0-1.el7.3.x86_64.rpm
Wrote: /home/ec2-user/rpmbuild/RPMS/x86_64/kmod-ena-2.12.1-1.el7.3.x86_64.rpm
Wrote: /home/ec2-user/rpmbuild/RPMS/x86_64/ena-debuginfo-2.12.1-1.el7.3.x86_64.rpm
[...]
bash$ _

Now you should be able to install/deploy the resulting binary rpm
packages using your preferred rpm install too. For example, using yum:

bash$ sudo yum -y localinstall
/home/ec2-user/rpmbuild/RPMS/x86_64/kmod-ena-2.12.0-1.el7.3.x86_64.rpm
/home/ec2-user/rpmbuild/RPMS/x86_64/kmod-ena-2.12.1-1.el7.3.x86_64.rpm

7 changes: 5 additions & 2 deletions kernel/linux/rpm/ena.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%define kmod_name ena
%define kmod_driver_version 2.12.0
%define kmod_driver_version 2.12.1
%define kmod_rpm_release 1
%define kmod_git_hash 3ac3e0bf079b2c0468f759f2213541e214a6dd77
%define kmod_kbuild_dir kernel/linux/ena
Expand All @@ -22,7 +22,7 @@ Source7: preamble

Name: %{kmod_name}
Version: %{kmod_driver_version}
Release: %{kmod_rpm_release}%{?dist}.54
Release: %{kmod_rpm_release}%{?dist}.55
Summary: %{kmod_name} kernel module

Group: System/Kernel
Expand Down Expand Up @@ -103,6 +103,9 @@ install -m 644 -D source/%{kmod_kbuild_dir}/RELEASENOTES.md $RPM_BUILD_ROOT/usr/
rm -rf $RPM_BUILD_ROOT

%changelog
* Wed May 22 2024 David Arinzon darinzon@amazon.com - 2.12.1-1.55
- Update ENA driver to version 2.12.1

* Thu Feb 08 2024 Evgeny Ostrovsky evostrov@amazon.com - 2.12.0-1.54
- Update ENA driver to version 2.12.0

Expand Down

0 comments on commit 20ebf84

Please sign in to comment.