!10 修复nfs4-acl-tools包在bep消除场景下构建死循环问题
From: @volcanodragon Reviewed-by: @liuzhiqiang26 Signed-off-by: @liuzhiqiang26
This commit is contained in:
commit
85d997b0c9
@ -0,0 +1,53 @@
|
|||||||
|
From bee9daf0008cb7b7b7516090e60a8f52b7d214d7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Wenchao Hao <haowenchao@huawei.com>
|
||||||
|
Date: Wed, 1 Dec 2021 11:10:06 +0800
|
||||||
|
Subject: [PATCH] Fix infinite loop when perl is added in BEP_FILE_TIME_LIST
|
||||||
|
|
||||||
|
Makefile specify a rules like following:
|
||||||
|
|
||||||
|
configure include/builddefs include/config.h: aclocal.m4
|
||||||
|
autoconf
|
||||||
|
./configure \
|
||||||
|
...
|
||||||
|
Normally, this rule would run recipe for target configure first, and the
|
||||||
|
include/builddefs and include/config.h would be generated in this target.
|
||||||
|
|
||||||
|
While once perl is added in BEP_FILE_TIME_LIST, this rule run recipe for target
|
||||||
|
include/builddefs first and cause a infinite loop.
|
||||||
|
|
||||||
|
To fix this issue, splict previous recipe as following to explictly tell make
|
||||||
|
run configure first
|
||||||
|
|
||||||
|
include/builddefs: configure
|
||||||
|
include/config.h: configure
|
||||||
|
|
||||||
|
configure: aclocal.m4
|
||||||
|
autoconf \
|
||||||
|
./configure \
|
||||||
|
...
|
||||||
|
|
||||||
|
Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
|
||||||
|
Signed-off-by: volcanodragon <linfeilong@huawei.com>
|
||||||
|
---
|
||||||
|
Makefile | 5 ++++-
|
||||||
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index 5302e11..fa3d93b 100644
|
||||||
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
|
@@ -59,7 +59,10 @@ else
|
||||||
|
clean: # if configure hasn't run, nothing to clean
|
||||||
|
endif
|
||||||
|
|
||||||
|
-$(CONFIGURE): aclocal.m4
|
||||||
|
+include/builddefs: configure
|
||||||
|
+include/config.h: configure
|
||||||
|
+
|
||||||
|
+configure: aclocal.m4
|
||||||
|
autoconf
|
||||||
|
./configure \
|
||||||
|
--prefix=/ \
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
Name: nfs4-acl-tools
|
Name: nfs4-acl-tools
|
||||||
Version: 0.3.7
|
Version: 0.3.7
|
||||||
Release: 2
|
Release: 3
|
||||||
Summary: The nfs4 ACL tools
|
Summary: The nfs4 ACL tools
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://www.citi.umich.edu/projects/nfsv4/linux/
|
URL: http://www.citi.umich.edu/projects/nfsv4/linux/
|
||||||
@ -8,6 +8,8 @@ Source0: http://linux-nfs.org/~bfields/nfs4-acl-tools/%{name}-%{version}.
|
|||||||
|
|
||||||
BuildRequires: libtool libattr-devel
|
BuildRequires: libtool libattr-devel
|
||||||
|
|
||||||
|
Patch1: 0001-Fix-infinite-loop-when-perl-is-added-in-BEP_FILE_TIM.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
It contains commandline NFSv4 ACL tools, which deal directly with NFSv4 ACLs.
|
It contains commandline NFSv4 ACL tools, which deal directly with NFSv4 ACLs.
|
||||||
|
|
||||||
@ -42,6 +44,9 @@ make DESTDIR=%{buildroot} install
|
|||||||
%{_mandir}/man*/*
|
%{_mandir}/man*/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Dec 1 2021 volcanodragon <linfeilong@huawei.com> - 0.3.7-3
|
||||||
|
- DESC: Fix infinite loop when perl is added in BEP_FILE_TIME_LIST
|
||||||
|
|
||||||
* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 0.3.7-2
|
* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 0.3.7-2
|
||||||
- DESC: delete -S git from %autosetup, and delete BuildRequires git
|
- DESC: delete -S git from %autosetup, and delete BuildRequires git
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user