From b9a5a1ac0e09595803b3f207a3d09fb9f7aa04f5 Mon Sep 17 00:00:00 2001 From: jeff200902 Date: Mon, 27 Jul 2020 19:13:39 +0800 Subject: [PATCH 1/2] Modify for obs build --- 0001-modify-for-obs-build.patch | 29 +++++++++++++++++++++++++++++ build.spec | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 0001-modify-for-obs-build.patch diff --git a/0001-modify-for-obs-build.patch b/0001-modify-for-obs-build.patch new file mode 100644 index 0000000..b84e8fb --- /dev/null +++ b/0001-modify-for-obs-build.patch @@ -0,0 +1,29 @@ +From 2372a1ac834d17d99899275685606f5ebb15f265 Mon Sep 17 00:00:00 2001 +From: jeff200902 +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 + diff --git a/build.spec b/build.spec index 2e3bbf9..29b1971 100644 --- a/build.spec +++ b/build.spec @@ -5,7 +5,7 @@ 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 -- Gitee From 35a8c030ad7dfb75b5f913ed60ad21f89805b1e6 Mon Sep 17 00:00:00 2001 From: jeff200902 Date: Mon, 27 Jul 2020 19:25:27 +0800 Subject: [PATCH 2/2] Modify for obs build --- build.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.spec b/build.spec index 29b1971..a7d7a52 100644 --- a/build.spec +++ b/build.spec @@ -1,6 +1,6 @@ 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 @@ -99,6 +99,9 @@ sed -i 's,build-mkbaselibs,,' configs/*.conf %{_mandir}/man1/buildvc.1* %changelog +* Mon Jul 27 2020 openEuler Jeffery.Gao - 20191114-324.4 +- Modify for obs-build access URL + * Fri Mar 06 2020 openEuler Buildteam - 20191114-324.3 - Rectify the spec file -- Gitee