diff --git a/0001-enable-dns-to-work-in-runroot-buildroots.patch b/0001-enable-dns-to-work-in-runroot-buildroots.patch new file mode 100644 index 0000000..e2152c7 --- /dev/null +++ b/0001-enable-dns-to-work-in-runroot-buildroots.patch @@ -0,0 +1,29 @@ +From 6e224af9a8610f37898859d25efa7188e9f008e0 Mon Sep 17 00:00:00 2001 +From: Dennis Gilmore +Date: Wed, 6 Apr 2016 15:00:13 -0500 +Subject: [PATCH] enable dns to work in runroot buildroots + +Signed-off-by: Dennis Gilmore +--- + plugins/builder/runroot.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/plugins/builder/runroot.py b/plugins/builder/runroot.py +index b303890..7bf40e4 100644 +--- a/plugins/builder/runroot.py ++++ b/plugins/builder/runroot.py +@@ -152,9 +152,9 @@ class RunRootTask(tasks.BaseTaskHandler): + parent=self.id) + repo_info = self.wait(task_id)[task_id] + if compat_mode: +- broot = BuildRoot(root, br_arch, self.id, repo_id=repo_info['id']) ++ broot = BuildRoot(root, br_arch, self.id, repo_id=repo_info['id'], setup_dns=True) + else: +- broot = BuildRoot(self.session, self.options, root, br_arch, self.id, repo_id=repo_info['id']) ++ broot = BuildRoot(self.session, self.options, root, br_arch, self.id, repo_id=repo_info['id'], setup_dns=True) + broot.workdir = self.workdir + broot.init() + rootdir = broot.rootdir() +-- +2.7.4 + diff --git a/koji.spec b/koji.spec index 6041a0b..de3ef89 100644 --- a/koji.spec +++ b/koji.spec @@ -9,13 +9,14 @@ Name: koji Version: 1.10.1 -Release: 9%{?dist} +Release: 10%{?dist} License: LGPLv2 and GPLv2+ # koji.ssl libs (from plague) are GPLv2+ Summary: Build system tools Group: Applications/System URL: https://pagure.io/fork/ausil/koji/branch/fedora-infra Patch0: fedora-config.patch +Patch1: 0001-enable-dns-to-work-in-runroot-buildroots.patch Source: koji-%{version}.tar.bz2 BuildArch: noarch @@ -157,6 +158,7 @@ koji-web is a web UI to the Koji system. %prep %setup -q %patch0 -p1 -b orig +%patch1 -p1 %build @@ -324,6 +326,9 @@ fi %endif %changelog +* Thu May 26 2016 Dennis Gilmore - 1.10.1-10 +- add patch to enable dns in runroot chroots + * Tue May 24 2016 Dennis Gilmore - 1.10.1-9 - update to git master upstream, add lmc cosmetic fixes - add patch to disable login in koji-web