diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/install-buildtools | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/scripts/install-buildtools b/scripts/install-buildtools index 10c3d043de..2218f3ffac 100755 --- a/scripts/install-buildtools +++ b/scripts/install-buildtools | |||
| @@ -57,8 +57,8 @@ logger = scriptutils.logger_create(PROGNAME, stream=sys.stdout) | |||
| 57 | 57 | ||
| 58 | DEFAULT_INSTALL_DIR = os.path.join(os.path.split(scripts_path)[0],'buildtools') | 58 | DEFAULT_INSTALL_DIR = os.path.join(os.path.split(scripts_path)[0],'buildtools') |
| 59 | DEFAULT_BASE_URL = 'http://downloads.yoctoproject.org/releases/yocto' | 59 | DEFAULT_BASE_URL = 'http://downloads.yoctoproject.org/releases/yocto' |
| 60 | DEFAULT_RELEASE = 'yocto-3.4' | 60 | DEFAULT_RELEASE = 'yocto-4.1' |
| 61 | DEFAULT_INSTALLER_VERSION = '3.4' | 61 | DEFAULT_INSTALLER_VERSION = '4.1' |
| 62 | DEFAULT_BUILDDATE = '202110XX' | 62 | DEFAULT_BUILDDATE = '202110XX' |
| 63 | 63 | ||
| 64 | # Python version sanity check | 64 | # Python version sanity check |
| @@ -154,6 +154,8 @@ def main(): | |||
| 154 | group.add_argument('--without-extended-buildtools', action='store_false', | 154 | group.add_argument('--without-extended-buildtools', action='store_false', |
| 155 | dest='with_extended_buildtools', | 155 | dest='with_extended_buildtools', |
| 156 | help='disable extended buildtools (traditional buildtools tarball)') | 156 | help='disable extended buildtools (traditional buildtools tarball)') |
| 157 | group.add_argument('--make-only', action='store_true', | ||
| 158 | help='only install make tarball') | ||
| 157 | group = parser.add_mutually_exclusive_group() | 159 | group = parser.add_mutually_exclusive_group() |
| 158 | group.add_argument('-c', '--check', help='enable checksum validation', | 160 | group.add_argument('-c', '--check', help='enable checksum validation', |
| 159 | default=True, action='store_true') | 161 | default=True, action='store_true') |
| @@ -170,6 +172,9 @@ def main(): | |||
| 170 | 172 | ||
| 171 | args = parser.parse_args() | 173 | args = parser.parse_args() |
| 172 | 174 | ||
| 175 | if args.make_only: | ||
| 176 | args.with_extended_buildtools = False | ||
| 177 | |||
| 173 | if args.debug: | 178 | if args.debug: |
| 174 | logger.setLevel(logging.DEBUG) | 179 | logger.setLevel(logging.DEBUG) |
| 175 | elif args.quiet: | 180 | elif args.quiet: |
| @@ -197,7 +202,10 @@ def main(): | |||
| 197 | if not args.build_date: | 202 | if not args.build_date: |
| 198 | logger.error("Milestone installers require --build-date") | 203 | logger.error("Milestone installers require --build-date") |
| 199 | else: | 204 | else: |
| 200 | if args.with_extended_buildtools: | 205 | if args.make_only: |
| 206 | filename = "%s-buildtools-make-nativesdk-standalone-%s-%s.sh" % ( | ||
| 207 | arch, args.installer_version, args.build_date) | ||
| 208 | elif args.with_extended_buildtools: | ||
| 201 | filename = "%s-buildtools-extended-nativesdk-standalone-%s-%s.sh" % ( | 209 | filename = "%s-buildtools-extended-nativesdk-standalone-%s-%s.sh" % ( |
| 202 | arch, args.installer_version, args.build_date) | 210 | arch, args.installer_version, args.build_date) |
| 203 | else: | 211 | else: |
| @@ -207,6 +215,8 @@ def main(): | |||
| 207 | buildtools_url = "%s/milestones/%s/buildtools/%s" % (base_url, args.release, safe_filename) | 215 | buildtools_url = "%s/milestones/%s/buildtools/%s" % (base_url, args.release, safe_filename) |
| 208 | # regular release SDK | 216 | # regular release SDK |
| 209 | else: | 217 | else: |
| 218 | if args.make_only: | ||
| 219 | filename = "%s-buildtools-make-nativesdk-standalone-%s.sh" % (arch, args.installer_version) | ||
| 210 | if args.with_extended_buildtools: | 220 | if args.with_extended_buildtools: |
| 211 | filename = "%s-buildtools-extended-nativesdk-standalone-%s.sh" % (arch, args.installer_version) | 221 | filename = "%s-buildtools-extended-nativesdk-standalone-%s.sh" % (arch, args.installer_version) |
| 212 | else: | 222 | else: |
| @@ -303,7 +313,9 @@ def main(): | |||
| 303 | if args.with_extended_buildtools and not m: | 313 | if args.with_extended_buildtools and not m: |
| 304 | logger.info("Ignoring --with-extended-buildtools as filename " | 314 | logger.info("Ignoring --with-extended-buildtools as filename " |
| 305 | "does not contain 'extended'") | 315 | "does not contain 'extended'") |
| 306 | if args.with_extended_buildtools and m: | 316 | if args.make_only: |
| 317 | tool = 'make' | ||
| 318 | elif args.with_extended_buildtools and m: | ||
| 307 | tool = 'gcc' | 319 | tool = 'gcc' |
| 308 | else: | 320 | else: |
| 309 | tool = 'tar' | 321 | tool = 'tar' |
