diff options
| author | Michael E Brown <mebrown@michaels-house.net> | 2007-11-17 12:30:02 -0600 |
|---|---|---|
| committer | Michael E Brown <mebrown@michaels-house.net> | 2007-11-17 12:30:02 -0600 |
| commit | 33f50beba74e682ee1637aeb75f4d5cc0acbdde3 (patch) | |
| tree | ada202f2b0280395492379aa54393904a28554fc /src | |
| parent | a03f0c2ca8ba97a67ebc18aa448583b1a599500d (diff) | |
| download | mock-33f50beba74e682ee1637aeb75f4d5cc0acbdde3.tar.gz mock-33f50beba74e682ee1637aeb75f4d5cc0acbdde3.tar.xz mock-33f50beba74e682ee1637aeb75f4d5cc0acbdde3.zip | |
run setarch internally based on target_arch
Diffstat (limited to 'src')
| -rwxr-xr-x | src/mock.py | 2 | ||||
| -rw-r--r-- | src/py-libs/backend.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mock.py b/src/mock.py index dfc485d..2668bf3 100755 --- a/src/mock.py +++ b/src/mock.py @@ -308,7 +308,7 @@ def main(retParams): chroot._mountall() try: cmd = ' '.join(args[1:]) - os.system("PS1='mock-chroot> ' /usr/sbin/chroot %s %s" % (chroot.rootdir, cmd)) + os.system("PS1='mock-chroot> ' setarch %s /usr/sbin/chroot %s %s" % (config_opts['target_arch'], chroot.rootdir, cmd)) finally: chroot._umountall() diff --git a/src/py-libs/backend.py b/src/py-libs/backend.py index bf7df5d..a5d69ec 100644 --- a/src/py-libs/backend.py +++ b/src/py-libs/backend.py @@ -333,7 +333,7 @@ class Root(object): os.environ["HOME"] = self.homedir # Completely/Permanently drop privs while running the following: mock.util.do( - "rpm -Uvh --nodeps %s" % srpmChrootFilename, + "setarch %s rpm -Uvh --nodeps %s" % (self.target_arch, srpmChrootFilename), chrootPath=self.rootdir, uidManager=self.uidManager, uid=self.chrootuid, @@ -350,7 +350,7 @@ class Root(object): self.root_log.info("about to drop to unpriv mode.") # Completely/Permanently drop privs while running the following: mock.util.do( - "rpmbuild -bs --target %s --nodeps %s" % (self.target_arch, chrootspec), + "setarch %s rpmbuild -bs --target %s --nodeps %s" % (self.target_arch, self.target_arch, chrootspec), chrootPath=self.rootdir, logger=self.build_log, timeout=timeout, uidManager=self.uidManager, @@ -372,7 +372,7 @@ class Root(object): self._callHooks('prebuild') mock.util.do( - "rpmbuild -bb --target %s --nodeps %s" % (self.target_arch, chrootspec), + "setarch %s rpmbuild -bb --target %s --nodeps %s" % (self.target_arch, self.target_arch, chrootspec), chrootPath=self.rootdir, uidManager=self.uidManager, uid=self.chrootuid, @@ -440,7 +440,7 @@ class Root(object): def _yum(self, cmd, returnOutput=0): """use yum to install packages/package groups into the chroot""" # mock-helper yum --installroot=rootdir cmd - cmd = '%s --installroot %s %s' % (self.yum_path, self.rootdir, cmd) + cmd = 'setarch %s %s --installroot %s %s' % (self.target_arch, self.yum_path, self.rootdir, cmd) self.root_log.info(cmd) try: self._callHooks("preyum") |