From d3e292145829b9fb9050fde866093b29adc7db47 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Wed, 21 Apr 2021 05:17:45 +0500 Subject: [PATCH] Properly setup apt --- scale_build/bootstrap/configure.py | 6 ------ scale_build/packages/build.py | 7 ------- 2 files changed, 13 deletions(-) diff --git a/scale_build/bootstrap/configure.py b/scale_build/bootstrap/configure.py index 212ed1d..a09da9b 100644 --- a/scale_build/bootstrap/configure.py +++ b/scale_build/bootstrap/configure.py @@ -54,12 +54,6 @@ def _make_bootstrapdir_impl(bootstrapdir_type, logger_file=None): ], exception=CallError, exception_msg='Failed mount --bind /var/cache/apt', **run_args ) - # TODO: Remove me please - logger.debug('Setting up apt-cacher') - os.makedirs(os.path.join(CHROOT_BASEDIR, 'etc/apt/apt.conf.d'), exist_ok=True) - with open(os.path.join(CHROOT_BASEDIR, 'etc/apt/apt.conf.d/02proxy'), 'w') as f: - f.write('Acquire::http::Proxy "http://192.168.0.3:3142";\n') - if bootstrapdir_type == 'package': # Add extra packages for builds run([ diff --git a/scale_build/packages/build.py b/scale_build/packages/build.py index 26b52c1..92a50d0 100644 --- a/scale_build/packages/build.py +++ b/scale_build/packages/build.py @@ -59,13 +59,6 @@ class BuildPackageMixin: def _build_impl(self): shutil.copytree(self.source_path, self.source_in_chroot, dirs_exist_ok=True, symlinks=True) - - # TODO: Remove me please - self.logger.debug('Setting up apt-cacher') - os.makedirs(os.path.join(self.dpkg_overlay, 'etc/apt/apt.conf.d'), exist_ok=True) - with open(os.path.join(self.dpkg_overlay, 'etc/apt/apt.conf.d/02proxy'), 'w') as f: - f.write('Acquire::http::Proxy "http://192.168.0.3:3142";\n') - if os.path.exists(os.path.join(self.dpkg_overlay_packages_path, 'Packages.gz')): self.run_in_chroot('apt update')