!3 fix install error by frame_larger_than
Merge pull request !3 from sigui/openEuler-20.03-LTS
This commit is contained in:
commit
6934330b2f
25
0001-fix-install-error-by-frame_larger_than.patch
Normal file
25
0001-fix-install-error-by-frame_larger_than.patch
Normal 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
|
||||||
|
|
||||||
10
kvdo.spec
10
kvdo.spec
@ -1,5 +1,5 @@
|
|||||||
#This spec is obtained from source code(kvdo-6.2.2.24.tar.gz)
|
#This spec is obtained from source code(kvdo-6.2.2.24.tar.gz)
|
||||||
%define spec_release 5
|
%define spec_release 6
|
||||||
%define kmod_name kvdo
|
%define kmod_name kvdo
|
||||||
%define kmod_driver_version 6.2.2.24
|
%define kmod_driver_version 6.2.2.24
|
||||||
%define kmod_rpm_release %{spec_release}
|
%define kmod_rpm_release %{spec_release}
|
||||||
@ -15,6 +15,7 @@ Summary: Kernel Modules for Virtual Data Optimizer
|
|||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://github.com/dm-vdo/kvdo
|
URL: http://github.com/dm-vdo/kvdo
|
||||||
Source0: https://github.com/dm-vdo/kvdo/archive/6.2.2.24.tar.gz
|
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)
|
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||||
Requires: dkms
|
Requires: dkms
|
||||||
Requires: kernel-devel >= %{kmod_kernel_version}
|
Requires: kernel-devel >= %{kmod_kernel_version}
|
||||||
@ -52,7 +53,7 @@ done
|
|||||||
/usr/sbin/dkms --rpm_safe_upgrade remove -m %{kmod_name} -v %{version}-%{kmod_driver_version} --all || :
|
/usr/sbin/dkms --rpm_safe_upgrade remove -m %{kmod_name} -v %{version}-%{kmod_driver_version} --all || :
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -n %{kmod_name}-%{kmod_driver_version}
|
%autosetup -n %{kmod_name}-%{kmod_driver_version} -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# Nothing doing here, as we're going to build on whatever kernel we end up
|
# Nothing doing here, as we're going to build on whatever kernel we end up
|
||||||
@ -85,7 +86,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_usr}/src/%{kmod_name}-%{version}-%{kmod_driver_version}/*
|
%{_usr}/src/%{kmod_name}-%{version}-%{kmod_driver_version}/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Sun Jan 19 16:46:40 CST 2020 sunguoshuai <sunguoshuai@huawei.com> - 6.2.2.24-5
|
* 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.
|
- Modify source0 from github.
|
||||||
|
|
||||||
* Thu Dec 12 2019 openEuler Buildteam <buildteam@openeuler.org> -6.2.2.24-4
|
* Thu Dec 12 2019 openEuler Buildteam <buildteam@openeuler.org> -6.2.2.24-4
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user