27 lines
934 B
Diff
27 lines
934 B
Diff
From ee69dbae3660da4b1d0649eeeed1a8321d17a685 Mon Sep 17 00:00:00 2001
|
|
From: wangqing <wangqing54@huawei.com>
|
|
Date: Wed, 12 Dec 2018 19:00:41 +0800
|
|
Subject: [PATCH 2/2] backport-bugfix-rpm-4.14.2-fix-tty-failed
|
|
|
|
---
|
|
rpmpopt.in | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/rpmpopt.in b/rpmpopt.in
|
|
index 3e44937..d9d7848 100644
|
|
--- a/rpmpopt.in
|
|
+++ b/rpmpopt.in
|
|
@@ -216,7 +216,7 @@ rpmbuild alias --buildpolicy --define '__os_install_post %{_rpmconfigdir}/brp-!#
|
|
--POPTargs=$"<policy>"
|
|
# Minimally preserve rpmbuild's --sign functionality
|
|
rpmbuild alias --sign \
|
|
- --pipe 'rpm --addsign `grep ".*: .*\.rpm$"|cut -d: -f2` < "/dev/"`ps -p $$ -o tty | tail -n 1`' \
|
|
+ --pipe "grep '.*: .*\.rpm$'|cut -d: -f2|xargs -r rpm --addsign" \
|
|
--POPTdesc=$"generate GPG signature (deprecated, use command rpmsign instead)"
|
|
# [--trace] "trace macro expansion"
|
|
rpmbuild alias --trace --eval '%trace'
|
|
--
|
|
1.8.3.1
|
|
|
|
|