!6 modify for obs build access URL
Merge pull request !6 from jeff200902/master
This commit is contained in:
commit
3d0030c15d
29
0001-modify-for-obs-build.patch
Normal file
29
0001-modify-for-obs-build.patch
Normal file
@ -0,0 +1,29 @@
|
||||
From 2372a1ac834d17d99899275685606f5ebb15f265 Mon Sep 17 00:00:00 2001
|
||||
From: jeff200902 <jeff200902@163.com>
|
||||
Date: Mon, 27 Jul 2020 18:59:20 +0800
|
||||
Subject: [PATCH] modify for osb build
|
||||
|
||||
---
|
||||
build | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/build b/build
|
||||
index 9b2d0f2..df9ce59 100755
|
||||
--- a/build
|
||||
+++ b/build
|
||||
@@ -1549,6 +1549,12 @@ if test \( -n "$RPMS" -o -n "$DEBS" \) -a -n "$CREATE_BASELIBS"; then
|
||||
create_baselibs
|
||||
fi
|
||||
|
||||
+if test -f "$BUILD_ROOT/etc/resolv.conf"; then
|
||||
+ cat $BUILD_ROOT/etc/resolv.conf
|
||||
+else
|
||||
+ cp /etc/resolv.conf $BUILD_ROOT/etc/
|
||||
+fi
|
||||
+
|
||||
exitcode=0
|
||||
|
||||
# post build work
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
Name: build
|
||||
Version: 20191114
|
||||
Release: 324.3
|
||||
Release: 324.4
|
||||
Summary: A tool to build binary packages
|
||||
License: GPL-2.0-only OR GPL-3.0-only
|
||||
Url: https://github.com/openSUSE/obs-build
|
||||
Source: obs-build-%{version}.tar.gz
|
||||
|
||||
Patch0000: 0001-modify-for-obs-build.patch
|
||||
BuildArch: noarch
|
||||
Requires: bash binutils perl tar psmisc build-mkbaselibs
|
||||
BuildRequires: bash binutils perl psmisc tar
|
||||
@ -99,6 +99,9 @@ sed -i 's,build-mkbaselibs,,' configs/*.conf
|
||||
%{_mandir}/man1/buildvc.1*
|
||||
|
||||
%changelog
|
||||
* Mon Jul 27 2020 openEuler Jeffery.Gao <gaojianxing@huawei.com> - 20191114-324.4
|
||||
- Modify for obs-build access URL
|
||||
|
||||
* Fri Mar 06 2020 openEuler Buildteam <buildteam@openeuler.com> - 20191114-324.3
|
||||
- Rectify the spec file
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user