Revert "PR#3568: kiwi: don't bind builders's /dev"

This reverts commit 56cea9adc2, reversing
changes made to e9b5ec215d.

mock was changed meanwhile to automatically bind device mapper into the
buildroot.

Related: https://pagure.io/koji/issue/3567
https://pagure.io/koji/pull-request/3585
https://github.com/rpm-software-management/mock/pull/1005
This commit is contained in:
Tomas Kopecek 2022-11-15 14:20:22 +01:00
parent 1ece0d459e
commit 05851ac0c9
3 changed files with 2 additions and 12 deletions

View file

@ -304,10 +304,6 @@ class KiwiCreateImageTask(BaseBuildTask):
desc_url, desc_path, opts=None):
self.opts = opts
build_tag = target_info['build_tag']
if opts.get('bind_dev'):
bind_opts = {'dirs': {'/dev': '/dev'}}
else:
bind_opts = None
broot = BuildRoot(self.session, self.options,
tag=build_tag,
arch=arch,
@ -315,7 +311,7 @@ class KiwiCreateImageTask(BaseBuildTask):
repo_id=repo_info['id'],
install_group='kiwi-build',
setup_dns=True,
bind_opts=bind_opts)
bind_opts={'dirs': {'/dev': '/dev', }})
broot.workdir = self.workdir
# create the mock chroot

View file

@ -30,9 +30,6 @@ def handle_kiwi_build(goptions, session, args):
parser.add_option("--type", help="Override default build type from description")
parser.add_option("--make-prep", action="store_true", default=False,
help="Run 'make prep' in checkout before starting the build")
parser.add_option("--bind-dev", action="store_true", default=False,
help="e.g. images using device-mapper needs /dev mounted in kiwi env, "
"while others can fail in such env.")
parser.add_option("--can-fail", action="store", dest="optional_arches",
metavar="ARCH1,ARCH2,...", default="",
help="List of archs which are not blocking for build "
@ -55,7 +52,6 @@ def handle_kiwi_build(goptions, session, args):
'target': target,
'desc_url': scm,
'desc_path': path,
'bind_dev': options.bind_dev,
}
if options.scratch:
kwargs['scratch'] = True

View file

@ -17,7 +17,7 @@ koji.tasks.LEGACY_SIGNATURES['createKiwiImage'] = [
@export
def kiwiBuild(target, arches, desc_url, desc_path, optional_arches=None, profile=None,
scratch=False, priority=None, make_prep=False, repos=None, release=None,
type=None, bind_dev=False):
type=None):
context.session.assertPerm('image')
for i in [desc_url, desc_path, profile, release]:
if i is not None:
@ -52,8 +52,6 @@ def kiwiBuild(target, arches, desc_url, desc_path, optional_arches=None, profile
opts['release'] = release
if optional_arches:
opts['optional_arches'] = optional_arches
if bind_dev:
opts['bind_dev'] = bind_dev
if repos:
opts['repos'] = repos
if make_prep: