config: Various updates to fix downloading of sources

6 files changed, 12 insertions, 31 deletions

diff --git a/bare/config/devel/gcc-4.6-newlib-1.20-1.cfg b/bare/config/devel/gcc-4.6-newlib-1.20-1.cfg
index 0a7cc63..659752f 100644
--- a/bare/config/devel/gcc-4.6-newlib-1.20-1.cfg
+++ b/bare/config/devel/gcc-4.6-newlib-1.20-1.cfg
@@ -15,6 +15,10 @@
 %define mpc_version    0.8.2
 %define gmp_version    5.0.5
 
+%define mpc_url  https://www.multiprecision.org/downloads
+%define gmp_url  https://ftp.gnu.org/gnu/gmp
+%define mpfr_url https://ftp.gnu.org/gnu/mpfr
+
 #
 # Project custom message
 #
diff --git a/bare/config/devel/or1ksim-1.1.0.cfg b/bare/config/devel/or1ksim-1.1.0.cfg
index 5e6b592..d4ccc88 100644
--- a/bare/config/devel/or1ksim-1.1.0.cfg
+++ b/bare/config/devel/or1ksim-1.1.0.cfg
@@ -9,7 +9,8 @@
 %include %{_configdir}/base.cfg
 
 %define or1ksim_version 1.1.0
-%hash md5 or1k-master.zip 7c9aec3fef6648a380ca5e91b2e3e87f
+%hash sha512 or1k-master.zip \
+        qi2pPthxvefp9OpwsAz3ul9lakJHkpwIgGlj4fcDa+Lshjsush2ekYm1SKsPJ38YaldSuJdH2buhCmPkXTeWHQ==
 
 #
 # The or1ksim build instructions. We use 1.x.x Release 1.
diff --git a/bare/config/devel/pcre-8.40-1.cfg b/bare/config/devel/pcre-8.40-1.cfg
index f6031fd..85ec7a1 100644
--- a/bare/config/devel/pcre-8.40-1.cfg
+++ b/bare/config/devel/pcre-8.40-1.cfg
@@ -9,7 +9,8 @@
 %include %{_configdir}/base.cfg
 
 %define pcre_version 8.40
-%hash sha512 pcre-%{pcre_version}.tar.bz2 tMJ+r73zO9ehOEZVsZNvS+O8Z0XAcjR+sm6YiJbFJmS9haxCRE2hvni24g9Ftsflkh9fIPWwdBtb09mETlvU4g==
+%hash sha512 pcre-%{pcre_version}.tar.bz2 \
+        tMJ+r73zO9ehOEZVsZNvS+O8Z0XAcjR+sm6YiJbFJmS9haxCRE2hvni24g9Ftsflkh9fIPWwdBtb09mETlvU4g==
 
 #
 # The PCRE build instructions. We use 8.x Release 1.
diff --git a/bare/config/devel/qemu-xilinx-v2020.2-1.cfg b/bare/config/devel/qemu-xilinx-v2020.2-1.cfg
index 94b14ef..180b621 100644
--- a/bare/config/devel/qemu-xilinx-v2020.2-1.cfg
+++ b/bare/config/devel/qemu-xilinx-v2020.2-1.cfg
@@ -15,7 +15,7 @@
 #
 # Checkout the version tag and initialize all submodules.
 #
-%source set qemu git://github.com/Xilinx/qemu.git?checkout=%{qemu_version}?submodule=dtc?submodule=slirp?submodule=ui/keycodemapdb?submodule=tests/fp/berkeley-softfloat-3?submodule=tests/fp/berkeley-testfloat-3
+%source set qemu https://github.com/Xilinx/qemu.git?checkout=%{qemu_version}?submodule=dtc?submodule=slirp?submodule=ui/keycodemapdb?submodule=tests/fp/berkeley-softfloat-3?submodule=tests/fp/berkeley-testfloat-3
 
 #
 # The Qemu build instructions. We use 5.x.x Release 1.
diff --git a/bare/config/gnu-tools-4.6.bset b/bare/config/gnu-tools-4.6.bset
index fa3ced8..baccd84 100644
--- a/bare/config/gnu-tools-4.6.bset
+++ b/bare/config/gnu-tools-4.6.bset
@@ -19,7 +19,7 @@ package: gnu-tool-%{_target}-%{_host}-%{release}
 #
 # Tool configuration.
 #
-binutils-2.22-1
-gcc-4.6-newlib-1.20-1
-expat-2.1.0-1
+devel/binutils-2.22-1
+devel/gcc-4.6-newlib-1.20-1
+devel/expat-2.1.0-1
 gdb-7.5-1
diff --git a/bare/config/gnu-tools-4.8.2.bset b/bare/config/gnu-tools-4.8.2.bset
deleted file mode 100644
index 9dd4b8a..0000000
--- a/bare/config/gnu-tools-4.8.2.bset
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# GNU Tools Set
-#
-
-%define release 1
-
-package: gnu-tools-%{_target}-%{_host}-%{release}
-
-#
-# Project custom message
-#
-%define gcc_version_message SB-%{release},gcc-%{gcc_version}/newlib-%{newlib_version}
-
-#
-# Enable G++
-#
-%define enable_cxx 1
-
-#
-# Tool configuration.
-#
-devel/expat-2.1.0-1
-devel/binutils-2.23.2-1
-devel/gcc-4.8.2-newlib-cvs-1
-devel/gdb-7.6.1-1