Bug 1617984 - Fix mach bootstrap failure on Archlinux when PKGDEST is set; r=firefox-build-system-reviewers,rstewart
authorMohammad H Sekhavat <sekhavat17@gmail.com>
Wed, 26 Feb 2020 16:33:24 +0000
changeset 515683 a50491a731c2a18ae6728baff5543a93cf9856aa
parent 515682 1a28609bb40541a14600790c6ed0231619debb9d
child 515684 061f9854ee793e8549fa9e68a1479a30404e82e7
push id37161
push useraciure@mozilla.com
push dateThu, 27 Feb 2020 03:39:37 +0000
treeherdermozilla-central@7a5cb26a2d51 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfirefox-build-system-reviewers, rstewart
bugs1617984
milestone75.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1617984 - Fix mach bootstrap failure on Archlinux when PKGDEST is set; r=firefox-build-system-reviewers,rstewart Makepkg has a commented config in /etc/makepkg.conf to set the path for packages to be built: ``` #PKGDEST=/home/packages ``` When you uncommit this line, packages will be built in the specified path, instead of cwd. This causes the bootstrap script to fail. This commit will override the PKGDEST config so that package is built in cwd and could be located by the following lines of script. Differential Revision: https://phabricator.services.mozilla.com/D64195
python/mozboot/mozboot/archlinux.py
--- a/python/mozboot/mozboot/archlinux.py
+++ b/python/mozboot/mozboot/archlinux.py
@@ -178,16 +178,17 @@ class ArchlinuxBootstrapper(
 
         name = os.path.join(path, name) + '.tar.' + ext
         command = ['tar', '-x', compression, '-f', name, '-C', path]
         self.run(command)
 
     def makepkg(self, name):
         command = ['makepkg', '-s']
         makepkg_env = os.environ.copy()
+        makepkg_env['PKGDEST'] = '.'
         makepkg_env['PKGEXT'] = '.pkg.tar.xz'
         self.run(command, env=makepkg_env)
         pack = glob.glob(name + '*.pkg.tar.xz')[0]
         command = ['pacman', '-U']
         if self.no_interactive:
             command.append('--noconfirm')
         command.append(pack)
         self.run_as_root(command)