packages/kmod-kvdo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: packages:64b84307996eeacb16b6b305692306ee0b4a0fa5
Branches Tags
packages:main
...
compare: packages:6d316ba3a388ecb7e1049970a74d22ef362d851e
Branches Tags
packages:main

10 Commits
64b8430799 ... 6d316ba3a3

Author SHA1 Message Date
openeuler-ci-bot
6d316ba3a3
!29 specify version for upgrading 
From: @wang--ge 
Reviewed-by: @starlet-dx 
Signed-off-by: @starlet-dx
 2023-11-14 09:57:57 +00:00
wang--ge
d598b378fe specify version for upgrading 2023-11-14 16:59:23 +08:00
openeuler-ci-bot
4b1628c28b
!28 Fix upgrade error caused by module had been installed 
From: @wang--ge 
Reviewed-by: @starlet-dx 
Signed-off-by: @starlet-dx
 2023-10-30 03:32:28 +00:00
wang--ge
06f213609e fix upgrade error 2023-10-30 10:49:54 +08:00
openeuler-ci-bot
3139ad0544
!16 [sync] PR-14: Fix post error 
From: @openeuler-sync-bot 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
 2022-03-26 07:59:05 +00:00
baizg1107
1a60be1c1a fix post error 
(cherry picked from commit 1c4517b09d9732723bad261b872b4aea451bee21)
 2022-03-26 15:07:09 +08:00
openeuler-ci-bot
029f02163d !5 Modify the install dir 
Merge pull request !5 from sigui/openEuler-20.03-LTS
 2020-08-28 12:07:12 +08:00
si-gui
0cef2f895c Modify the install dir 2020-08-28 11:41:39 +08:00
openeuler-ci-bot
6934330b2f !3 fix install error by frame_larger_than 
Merge pull request !3 from sigui/openEuler-20.03-LTS
 2020-05-15 16:24:14 +08:00
si-gui
2280fdaed4 fix install error by frame_larger_than 2020-05-15 16:02:21 +08:00
2 changed files with 89 additions and 23 deletions
Show Stats Expand all files Collapse all files

25
0001-fix-install-error-by-frame_larger_than.patch Normal file
View File

@ -0,0 +1,25 @@
From 26cce05e8712a5f8c1834f21c525255d41a20781 Mon Sep 17 00:00:00 2001
From: sugarfillet <18705174754@163.com>
Date: Thu, 7 May 2020 21:16:50 +0800
Subject: [PATCH] fix install error by frame_larger_than
---
vdo/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vdo/Makefile b/vdo/Makefile
index efb22fc..50a833c 100644
--- a/vdo/Makefile
+++ b/vdo/Makefile
@@ -12,7 +12,7 @@ INCLUDES = -I$(src)/base -I$(src)/kernel -I$(src)/../uds
EXTRA_CFLAGS = -std=gnu99 \
-fno-builtin-memset \
-Werror \
- -Wframe-larger-than=400 \
+ -Wframe-larger-than=500 \
-Wno-declaration-after-statement \
-DVDO_VERSION_MAJOR=$(VDO_VERSION_MAJOR) \
-DVDO_VERSION_MINOR=$(VDO_VERSION_MINOR) \
--
1.8.3.1

87
kvdo.spec
View File

@ -1,9 +1,9 @@
#This spec is obtained from source code(kvdo-6.2.2.24.tar.gz)
%define spec_release 5
%define kmod_name kvdo
%define spec_release 10
%define kmod_name kmod-kvdo
%define kmod_driver_version 6.2.2.24
%define kmod_rpm_release %{spec_release}
%define kmod_kernel_version 3.10.0-693.el7
%define kmod_kernel_version 4.19.90-2203.4.0.0141.oe1
# Disable the scanning for a debug package
%global debug_package %{nil}
@ -15,6 +15,7 @@ Summary: Kernel Modules for Virtual Data Optimizer
License: GPLv2+
URL: http://github.com/dm-vdo/kvdo
Source0: https://github.com/dm-vdo/kvdo/archive/6.2.2.24.tar.gz
Patch9001: 0001-fix-install-error-by-frame_larger_than.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires: dkms
Requires: kernel-devel >= %{kmod_kernel_version}
@ -35,35 +36,60 @@ block-level deduplication, compression, and thin provisioning.
This package provides the kernel modules for VDO.
%post
set -x
/usr/sbin/dkms --rpm_safe_upgrade add -m %{kmod_name} -v %{version}-%{kmod_driver_version}
/usr/sbin/dkms --rpm_safe_upgrade build -m %{kmod_name} -v %{version}-%{kmod_driver_version}
/usr/sbin/dkms --rpm_safe_upgrade install -m %{kmod_name} -v %{version}-%{kmod_driver_version}
case "$1" in
1)
set -x
/usr/sbin/dkms --rpm_safe_upgrade add -m %{kmod_name} -v %{version}-%{kmod_rpm_release}
/usr/sbin/dkms --rpm_safe_upgrade build -m %{kmod_name} -v %{version}-%{kmod_rpm_release}
/usr/sbin/dkms --rpm_safe_upgrade install -m %{kmod_name} -v %{version}-%{kmod_rpm_release}
;;
2)
set -x
former_info=`dnf list installed | grep kmod-kvdo | head -1 | awk '{print $2}'`
former_version=${former_info%.*}
/usr/sbin/dkms --rpm_safe_upgrade uninstall -m %{kmod_name} -v ${former_version}
/usr/sbin/dkms --rpm_safe_upgrade remove -m %{kmod_name} -v ${former_version} --all
/usr/sbin/dkms --rpm_safe_upgrade add -m %{kmod_name} -v %{version}-%{kmod_rpm_release}
/usr/sbin/dkms --rpm_safe_upgrade build -m %{kmod_name} -v %{version}-%{kmod_rpm_release}
/usr/sbin/dkms --rpm_safe_upgrade install -m %{kmod_name} -v %{version}-%{kmod_rpm_release}
;;
esac
%preun
# Check whether kvdo or uds is loaded, and if so attempt to remove it. A
# failure here means there is still something using the module, which should be
# cleared up before attempting to remove again.
for module in kvdo uds; do
if grep -q "^${module}" /proc/modules; then
modprobe -r ${module}
fi
done
/usr/sbin/dkms --rpm_safe_upgrade remove -m %{kmod_name} -v %{version}-%{kmod_driver_version} --all || :
case "$1" in
0)
# Check whether kvdo or uds is loaded, and if so attempt to remove it. A
# failure here means there is still something using the module, which should be
# cleared up before attempting to remove again.
for module in kvdo uds; do
if grep -q "^${module}" /proc/modules; then
modprobe -r ${module}
fi
done
/usr/sbin/dkms --rpm_safe_upgrade remove -m %{kmod_name} -v %{version}-%{kmod_rpm_release} --all || :
;;
1)
for module in kvdo uds; do
if grep -q "^${module}" /proc/modules; then
modprobe -r ${module}
fi
done
;;
esac
%prep
%setup -n %{kmod_name}-%{kmod_driver_version}
%autosetup -n kvdo-%{kmod_driver_version} -p1
%build
# Nothing doing here, as we're going to build on whatever kernel we end up
# running inside.
%install
mkdir -p $RPM_BUILD_ROOT/%{_usr}/src/%{kmod_name}-%{version}-%{kmod_driver_version}
cp -r * $RPM_BUILD_ROOT/%{_usr}/src/%{kmod_name}-%{version}-%{kmod_driver_version}/
cat > $RPM_BUILD_ROOT/%{_usr}/src/%{kmod_name}-%{version}-%{kmod_driver_version}/dkms.conf <<EOF
mkdir -p $RPM_BUILD_ROOT/%{_usr}/src/%{kmod_name}-%{version}-%{kmod_rpm_release}
cp -r * $RPM_BUILD_ROOT/%{_usr}/src/%{kmod_name}-%{version}-%{kmod_rpm_release}/
cat > $RPM_BUILD_ROOT/%{_usr}/src/%{kmod_name}-%{version}-%{kmod_rpm_release}/dkms.conf <<EOF
PACKAGE_NAME="kvdo"
PACKAGE_VERSION="%{version}-%{kmod_driver_version}"
PACKAGE_VERSION="%{version}-%{kmod_rpm_release}"
AUTOINSTALL="yes"
BUILT_MODULE_NAME[0]="uds"
@ -82,10 +108,25 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%{_usr}/src/%{kmod_name}-%{version}-%{kmod_driver_version}/*
%{_usr}/src/%{kmod_name}-%{version}-%{kmod_rpm_release}/*
%changelog
* Sun Jan 19 16:46:40 CST 2020 sunguoshuai <sunguoshuai@huawei.com> - 6.2.2.24-5
* Tue Nov 14 2023 Ge Wang <wang__ge@126.com> - 6.2.2.24-10
- Specify version for upgrading
* Fri Oct 27 2023 Ge Wang <wang__ge@126.com> - 6.2.2.24-9
- Fix upgrade error due to previous version has already installed modules
* Sat Mar 26 2022 baizhonggui <baizhonggui@huawei.com> - 6.2.2.24-8
- To fix post error, update kmod_kernel_version to latest version: 4.19.90-2203.4.0.0141.oe1
* Fri Aug 28 2020 sunguoshuai <sunguoshuai@huawei.com> - 6.2.2.24-7
- Modify the install dir
* Thu May 7 2020 sunguoshuai <sunguoshuai@huawei.com> - 6.2.2.24-6
- fix install error by frame_larger_than
* Sun Jan 19 2020 sunguoshuai <sunguoshuai@huawei.com> - 6.2.2.24-5
- Modify source0 from github.
* Thu Dec 12 2019 openEuler Buildteam <buildteam@openeuler.org> -6.2.2.24-4