From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6541B1391ED for ; Sat, 8 Mar 2014 05:51:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 343F9E0B15; Sat, 8 Mar 2014 05:51:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2DF98E0B0D for ; Sat, 8 Mar 2014 05:51:20 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8025E33FB8C for ; Sat, 8 Mar 2014 05:51:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 7F52C188F4 for ; Sat, 8 Mar 2014 05:51:16 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1392697924.d4721df8434a3c56cf8a246dd634bc7af7eee019.vapier@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: main.h X-VCS-Directories: / X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: d4721df8434a3c56cf8a246dd634bc7af7eee019 X-VCS-Branch: master Date: Sat, 8 Mar 2014 05:51:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c55d2bc1-a737-46c8-a2cd-b21e1fdc7331 X-Archives-Hash: fc5707dda57818c166c14f7955bfbb5c commit: d4721df8434a3c56cf8a246dd634bc7af7eee019 Author: Mike Frysinger gentoo org> AuthorDate: Tue Feb 18 04:32:04 2014 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Tue Feb 18 04:32:04 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage-utils.git;a=commit;h=d4721df8 update default URL list to match current tinderbox server --- main.h | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 56 insertions(+), 17 deletions(-) diff --git a/main.h b/main.h index e2e82d1..43f219c 100644 --- a/main.h +++ b/main.h @@ -1,7 +1,7 @@ /* * Copyright 2005-2010 Gentoo Foundation * Distributed under the terms of the GNU General Public License v2 - * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.h,v 1.16 2013/09/29 22:42:36 vapier Exp $ + * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.h,v 1.17 2014/02/18 04:32:04 vapier Exp $ * * Copyright 2005-2010 Ned Ludd - * Copyright 2005-2010 Mike Frysinger - @@ -22,25 +22,64 @@ /* http://tinderbox.dev.gentoo.org/default-linux/hppa */ #ifdef __linux__ -#undef URL -#define URL "http://tinderbox.dev.gentoo.org" -# ifdef __i386__ -# ifdef __UCLIBC__ -# define DEFAULT_PORTAGE_BINHOST URL "/uclibc/i386" +# undef URL_BASE +# define URL_BASE "http://tinderbox.dev.gentoo.org" + +# undef URL_PROFILE +# ifdef __UCLIBC__ +# define URL_PROFILE "uclibc" +# else +# ifdef __SSP__ +# define URL_PROFILE "hardened" +# else +# define URL_PROFILE "default/linux" +# endif +# endif + +# undef URL_ARCH +# if 0 +# elif defined(__alpha__) +# define URL_ARCH "alpha" +# elif defined(__x86_64__) +# define URL_ARCH "amd64" +# elif defined(__arm__) +# define URL_ARCH "arm" +# elif defined(__aarch64__) +# define URL_ARCH "arm64" +# elif defined(__bfin__) +# define URL_ARCH "bfin" +# elif defined(__cris__) +# define URL_ARCH "cris" +# elif defined(__hppa__) +# define URL_ARCH "hppa" +# elif defined(__ia64__) +# define URL_ARCH "ia64" +# elif defined(__m68k__) +# define URL_ARCH "m68k" +# elif defined(__mips__) +# define URL_ARCH "mips" +# elif defined(__powerpc__) +# if defined(__powerpc64__) +# define URL_ARCH "ppc64" # else -# ifdef __SSP__ -# define DEFAULT_PORTAGE_BINHOST URL "/hardened/x86" -# else -# define DEFAULT_PORTAGE_BINHOST URL "/default-linux/x86/All" -# endif +# define URL_ARCH "ppc" # endif -# if defined(__powerpc__) && defined(__SSP__) -# if !defined(__UCLIBC__) -# define DEFAULT_PORTAGE_BINHOST URL "/hardened/ppc" -# else -# define DEFAULT_PORTAGE_BINHOST URL "/uclibc/ppc" -# endif +# elif defined(__s390__) +# if defined(__s390x__) +# define URL_ARCH "s390x" +# else +# define URL_ARCH "s390" # endif +# elif defined(__sh4__) +# define URL_ARCH "sh" +# elif defined(__sparc__) +# define URL_ARCH "sparc" +# elif defined(__i386__) +# define URL_ARCH "x86" +# endif + +# if defined(URL_PROFILE) && defined(URL_ARCH) +# define DEFAULT_PORTAGE_BINHOST URL_BASE "/" URL_PROFILE "/" URL_ARCH # endif #endif