[PATCH] 4.12: Do not use a global hash file

Gedare Bloom gedare at rtems.org
Fri Mar 3 12:47:09 UTC 2017


On Fri, Mar 3, 2017 at 6:23 AM, Sebastian Huber
<sebastian.huber at embedded-brains.de> wrote:
> ---
>  rtems/config/hash.cfg                              | 41 ----------------------
>  rtems/config/rtems-base.bset                       |  2 --
>  .../config/tools/rtems-gcc-4.8-newlib-2.2.0-2.cfg  | 36 -------------------
>  .../rtems-gcc-4.8.3-newlib-2.5.0.20170228-1.cfg    |  7 ++--
>  .../config/tools/rtems-gcc-4.9-newlib-2.2.0-2.cfg  | 36 -------------------
>  .../rtems-gcc-4.9.2-newlib-2.5.0.20170228-1.cfg    |  5 ++-
>  .../rtems-gcc-4.9.3-newlib-2.5.0.20170228-1.cfg    |  5 ++-
>  .../rtems-gcc-6.3.0-newlib-2.5.0.20170228-1.cfg    |  6 ++++
>  8 files changed, 19 insertions(+), 119 deletions(-)
>  delete mode 100644 rtems/config/hash.cfg
>  delete mode 100644 rtems/config/tools/rtems-gcc-4.8-newlib-2.2.0-2.cfg
>  delete mode 100644 rtems/config/tools/rtems-gcc-4.9-newlib-2.2.0-2.cfg
>
> diff --git a/rtems/config/hash.cfg b/rtems/config/hash.cfg
> deleted file mode 100644
> index 63f5d8b..0000000
> --- a/rtems/config/hash.cfg
> +++ /dev/null
> @@ -1,41 +0,0 @@
> -%hash sha512 b6c483b4a98424731e6e44558cb4b9863751fb1b.zip 80fe9603851b5dcad048b488d049341af3abdcb564481efac4a85d6d3aeb6be9c0967e26a62752ab38df7ce9838e91c25c4808459587e9c5472cda07f27c9341
> -%hash sha512 binutils-2.20.1-rtems4.10-20151123.diff ce24ba3e56e7552739c167950a488d80557fdf562dcb527b2e5972c2d18da42a8fd1a47197e54aff0df630d105eb40702f09cad330c193cb8f9309b43b1fb1bc
> -%hash sha512 binutils-2.26-rtems-aarch64-x86_64.patch 2236cc22dda60d5c18a2ab5abc0f44bf487794f7c0899382bf49233e789e1fb34ce28b0f7a85069642f7cc06bd34d7634a441a8d92bf890de57bb89cc398349f
> -%hash sha512 f05996c7c42e6b2781946acbab153a481ce3fd0b.zip eeb44951ff9e23ecaad15607a1cc40699464b1707302cd4105363b862aab19382929917deb4abebedb4637e5a1c30b7c941b1d7d372824452203bda1ed8e5c7d
> -%hash sha512 f7051762470c42ce7f01baa7edeb113d51c7dd72.zip 260d1678007f9a33e438c0fe7c0400750c1524ab5c118689059480e79d3e1ad62f72d9db273dc188f5113d0cadfb81cb75b1b1edc689dd7391fd008430ac797d
> -%hash sha512 gcc-4.8.3-or1k-rtems-29072014.diff 89d622f93e3759d2bec062a7a2c83c29fd3630539db18680f1307ea84d3f64a79f83c30e45ccfc2e7637589ad2a679d61a06c9be041388e910fc05421fc749cc
> -%hash sha512 gcc-4.9.3-or1k.patch d63122c3ab71e867aba323e88e1ec2e937b0fca0e26db6ac2a56550c29a90933506735553079f986d5dd54c1acff5533ac087da8f69acad4f3c1e4d5be73d041
> -%hash sha512 gcc-6.0.1-RC-20160415.tar.bz2 5c03c1a74cc762c2421cd9b5818deca6e6191a19ebe07eaa407e152cd1d4341eed5e15ed9a35d8e372891574d492fb67d0885ce302dcf5d71c89021b0f420c40
> -%hash sha512 gcc-6-20160117.tar.bz2 61d05ad097c640004fad4805b6c407282825d5fcdad11413c47de7178d8f7f2488e2b5f3e354620bca5506b7b7abd464d65db0aea78f89cd63a253e88dd217eb
> -%hash sha512 gcc-6-20160124.tar.bz2 ab90e21b13ead10c58bd2ce17abf4ccffc81355f366c99e6bfce883d288198704d3510d447d48217d4a3e233120da20fc6335dce102ba2dc4785b28a745881da
> -%hash sha512 gcc-6-20160228.tar.bz2 cc768440bf6b89ad58fb64cf2fd93898929f63cd212cdb54443543135be9e713c409f9e2740531376510cad59172b197cad769df14345834bc1cd17b33976a57
> -%hash sha512 gcc-6-20160327.tar.bz2 0213c44e457585d15ad13fc3a7c665ba78faba0d1685e71cbf0cf32e44523394589ac60c7aea567e29c6f5e18159b446b1b0a7d39e330021c40efd8077aa5ad7
> -%hash sha512 gcc-6-20160526.tar.bz2 8ad457b463432b2cc7fc4c1b7967c2a01909f5fd40d2e7a1f38f8b197859ab2c823b96dfaf36add4177f6f932c7e702cc4ac9201b88375404235fc1a03ef778d
> -%hash sha512 gcc-6-20160609.tar.bz2 f9ea9034c0456d350e418a7263cdd02596fdd553f40e9741907436f0df7dbbc5b025ea421c2aece2769ade8e356985c104a37fe6c1bdc51eb61d52257206e0f1
> -%hash sha512 gcc-6-20161110.tar.bz2 b75f73950a409658b45a6dc2fcbfe18b38aba53fdd55f509e17637fb0d50464b6636394297fd33a0843684f7ef3eefefd1dcf8f257694ab4f15339ae37c8437e
> -%hash sha512 gcc-6.3.0.tar.bz2 234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78
> -%hash sha512 gcc-core-4.3.2-rtems4.9-20090825.diff d326372a756a7289404031eb16dcc51c15259342ea3f8697f23cfa754ee38305d5e6aaeef56c83f11cdd28c85711c430d894a87303ad932b024a17fa4aaa4f63
> -%hash sha512 gcc-core-4.3.2.tar.bz2 7fa7cfd57b3cb37990f41132037666d511a480df28d6d5a0620520501488abad89c7843067188bbe23f0c4d3eb5d113537a6a9375135596b58b3d7a848dc8a39
> -%hash sha512 gcc-core-4.4.7-rtems4.10-20151123.diff 70e5868157fd02f011e66f8fa9dcdc3341deee47ff105d9102a501b6e346c0e635c70600ff0646ea5f28faf8152e806367cf8acb60ff35ac61348af20796c4e4
> -%hash sha512 gdb-6.8a.tar.bz2 5114fe14ab25dc085590acff3a6feb75eb93347e501c634548308c4f51b31416ea23b8e612dfc54da466d3e7471e210d8f7a12ff6c050e9e89920884e5a64008
> -%hash sha512 gdb-6.8-rtems4.9-20091111.diff 2e6eb2bdeac4bba7c2fcaf701399148fc5de82dfa81e021111f5a20654afe5aad77d6fd0edbc31965107f2fe9a43738938d79a313836267ad69dc8509fcbf691
> -%hash sha512 gdb-7.11-or1k.patch e0c0171b62650e1dcc58a846322d3f2899c0b2196eec7ba1b600a012931e125a5dbb21e19bde79b0786781feca6b19054b307ffd57010c4d5c63c408d2f3144a
> -%hash sha512 gdb-7.3.1-rtems4.10-20151123.diff 2e03f9b01626a1f18c025eecb70350bdd7a29574970fb80edc985d0c5731325a68e42d55fb5d3e23440ea6e384e093269cca79a95d5a4e44a678439977da313f
> -%hash sha512 gdb-7.7-or1k-rtems.diff a334503fa1159fe4e1eb61c87501a0543da11f202e2b989b105ba8383c45294bad68bd726b810304bc0baad718b9785eeb3054c5d75de6301b942b0a7a31b95a
> -%hash sha512 gmp-4.3.2.tar.bz2 2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf
> -%hash sha512 gmp-5.0.5.tar.bz2 64ba88a4a64fefb16eae9c644ea81194011ea0b42664a5af6b014e7da3d0f09605dee518b9a361b06510311cdfd496ab68d09da3d85d6680bdac3f765eb67f61
> -%hash sha512 mpc-0.8.1.tar.gz 14cb9ae3d33caed24d5ae648eed28b2e00ad047a8baeff25981129af88245b4def2948573d7a00d65c5bd34e53524aa6a7351b76703c9f888b41830c1a1daae2
> -%hash sha512 mpc-0.8.2.tar.gz dcaac3897adf1411e1199e295e88d7438afc600f412565c3b450b0102b83751eb160f85b7522891195ff0a0a29fccedd07dc011a950969a0979c4e3d4efc1e10
> -%hash sha512 mpfr-2.4.2.tar.bz2 c004b3dbf86c04960e4a1f8db37a409a7cc4cb76135e76e98dcc5ad93aaa8deb62334ee13ff84447a7c12a5e8cb57f25c62ac908c24920f1fb1a38d79d4a4c5e
> -%hash sha512 newlib-1.16.0-rtems4.9-20090324.diff 6222e85dc8a5f49089742b09348b4f9663861d8c41dba79227d0ff343d4a9f71a5a1d7aacd61567401b924c6453f0e44bc8045226f25ded2bd3fa8ede4c9742f
> -%hash sha512 newlib-1.16.0.tar.gz 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3
> -%hash sha512 newlib-2.3.0.20160104.tar.gz d83ce298b1b72eabf92e4ec14af3afdf3122e34aff5e320295a398df077235a78aa87148895b441a4f7de3047815e7ce13ea06a06135dd86b69a200236514293
> -%hash sha512 newlib-2.3.0.20160226.tar.gz f3862b9e8622997cb47688115fa919a0ce933211b590e72f6ab8f7de2d6d1cfa30de405f6a02cf227e81dace94abee8018b80861b291361d1b95062ba67a5175
> -%hash sha512 newlib-2.4.0.20160527.tar.gz 09d0c8ac2a657e910eebfeeb7e5fcc6956591223fe499ed4717b5e719287148fc35e80835821fb5b6b586e371100737a7765a03c43f0c194cf67892484132d3f
> -%hash sha512 newlib-2.4.0.20161025.tar.gz bad47dc4062e0e9a0660a95cdd7a8b180d4257f68352a4a1fb66cd936aa38fbf44ccbe51f8281f89667e96a8296a02f1dbfc6ee5daba6951db375bbca74898eb
> -%hash sha512 newlib-2.4.0.tar.gz c60665e793dce2368a5baf23560beb50f641e1831854d702d1d7629fb6e9200cf814527f29796792a3d2dff81afee4255723df99ceb0732f99dd9580a17d2ac0
> -%hash sha512 newlib-2.5.0.20170228.tar.gz d3d5b902bd2e30d24c51867c493c4672c83d2be1e574bea65b453e91641afe558bd305e8e6118b9926f21d86cd4656220bb37ea598d19da7df34b77506637b09
> -%hash sha512 newlib-2.5.0.tar.gz 4c99e8dfcb4a7ad0769b9e173ff06628d82e4993ef87d3adf9d6b5578626b14de81b4b3c5f0673ddbb49dc9f3d3628f9f8d4432dcded91f5cd3d27b7d44343cd
> -%hash sha512 PATCH_libc_sys_rtems_crt0.c_Add_sys_lock.h_symbols_required_to_link_autoconf_probes 7cce6236f1a126c37c800783268f7a8816fd06f67fa742a60f4a05cd91af12f74293942c687bf58a1b22f7a17545e9b3c46f04c875c3b6d50d93fd59d96e9201
> -%hash sha512 rtems-4.9.6.tar.bz2 16ab7b2f9119208a24dc0bd21361a5fd910e73044c42d7b68174490ca9cc5c226543664831f9a036f28d1cf8b61d19a15404516d7a87d424e0bc2c09e60767e3
> -%hash sha512 RTEMS-Add-user-defined-name-to-thread-queues.patch d7ab6c0a9d7688af1d4af0696365f4da5cf90a4e4edbd4b858ad266a98e7e35fa40713b6a86a07dd97895558afd9bc641bedf8d5aa907ef570f805fe8b802b15
> diff --git a/rtems/config/rtems-base.bset b/rtems/config/rtems-base.bset
> index 8f7205f..04c9679 100644
> --- a/rtems/config/rtems-base.bset
> +++ b/rtems/config/rtems-base.bset
> @@ -26,5 +26,3 @@ package: rtems-%{rtems_version}-%{_target}-%{_host}-%{release}
>  # Pick up the RTEMS URLs.
>  #
>  %include rtems-urls.bset
> -
> -%include hash.cfg
> diff --git a/rtems/config/tools/rtems-gcc-4.8-newlib-2.2.0-2.cfg b/rtems/config/tools/rtems-gcc-4.8-newlib-2.2.0-2.cfg
> deleted file mode 100644
> index c70d64b..0000000
> --- a/rtems/config/tools/rtems-gcc-4.8-newlib-2.2.0-2.cfg
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -#
> -# GCC 4.8.x., Newlib GIT.
> -#
> -
> -%ifn %{defined gcc_version}
> - %error No GCC version defined.
> -%endif
> -
> -%ifn %{defined newlib_version}
> - %error No Newlib version defined.
> -%endif
> -
> -%include %{_configdir}/checks.cfg
> -%include %{_configdir}/base.cfg
> -%include %{_configdir}/versions.cfg
> -
> -%define mpfr_version   3.0.1
> -%define mpc_version    0.8.2
> -%define gmp_version    5.0.5
> -
> -%define with_threads 1
> -%define with_plugin  0
> -
> -%ifn %{defined with_iconv}
> - %define with_iconv 1
> -%endif
> -
> -#
> -# Newlib is a snapshot
> -#
> -%source set newlib ftp://sourceware.org/pub/newlib/newlib-%{newlib_version}.tar.gz
> -
> -#
> -# The gcc/newlib build instructions. We use 4.8 Release 1.
> -#
> -%include %{_configdir}/gcc-4.8-1.cfg
> diff --git a/rtems/config/tools/rtems-gcc-4.8.3-newlib-2.5.0.20170228-1.cfg b/rtems/config/tools/rtems-gcc-4.8.3-newlib-2.5.0.20170228-1.cfg
> index 0635207..ce05262 100644
> --- a/rtems/config/tools/rtems-gcc-4.8.3-newlib-2.5.0.20170228-1.cfg
> +++ b/rtems/config/tools/rtems-gcc-4.8.3-newlib-2.5.0.20170228-1.cfg
> @@ -1,4 +1,7 @@
> -%define gcc_version 4.8.3
> +%define gcc_version    4.8.3
>  %define newlib_version 2.5.0.20170228
>
> -%include tools/rtems-gcc-4.8-newlib-2.2.0-2.cfg
> +%hash sha512 gcc-4.8.3.tar.bz2 2b40d231e8445f9c1654137df509f09ce1187b475138ca7f648f710d922a1718f740b2d8a37c26e16b5e27900c60358be98229ae884a6f1f70e9df44ad24d02b
> +%hash sha512 newlib-2.5.0.20170228.tar.gz d3d5b902bd2e30d24c51867c493c4672c83d2be1e574bea65b453e91641afe558bd305e8e6118b9926f21d86cd4656220bb37ea598d19da7df34b77506637b09
> +
> +%include tools/rtems-gcc-4.8-newlib-2.2.0-1.cfg
> diff --git a/rtems/config/tools/rtems-gcc-4.9-newlib-2.2.0-2.cfg b/rtems/config/tools/rtems-gcc-4.9-newlib-2.2.0-2.cfg
> deleted file mode 100644
> index c04bff4..0000000
> --- a/rtems/config/tools/rtems-gcc-4.9-newlib-2.2.0-2.cfg
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -#
> -# GCC 4.9.x., Newlib GIT.
> -#
> -
> -%ifn %{defined gcc_version}
> - %error No GCC version defined.
> -%endif
> -
> -%ifn %{defined newlib_version}
> - %error No Newlib version defined.
> -%endif
> -
> -%include %{_configdir}/checks.cfg
> -%include %{_configdir}/base.cfg
> -%include %{_configdir}/versions.cfg
> -
> -%define mpfr_version   3.0.1
> -%define mpc_version    0.8.2
> -%define gmp_version    5.0.5
> -
> -%define with_threads 1
> -%define with_plugin  0
> -
> -%ifn %{defined with_iconv}
> - %define with_iconv 1
> -%endif
> -
> -#
> -# Newlib is a snapshot
> -#
> -%source set newlib ftp://sourceware.org/pub/newlib/newlib-%{newlib_version}.tar.gz
> -
> -#
> -# The gcc/newlib build instructions. We use 4.9 Release 1.
> -#
> -%include %{_configdir}/gcc-4.9-1.cfg
> diff --git a/rtems/config/tools/rtems-gcc-4.9.2-newlib-2.5.0.20170228-1.cfg b/rtems/config/tools/rtems-gcc-4.9.2-newlib-2.5.0.20170228-1.cfg
> index c932d01..76eff7f 100644
> --- a/rtems/config/tools/rtems-gcc-4.9.2-newlib-2.5.0.20170228-1.cfg
> +++ b/rtems/config/tools/rtems-gcc-4.9.2-newlib-2.5.0.20170228-1.cfg
> @@ -1,4 +1,7 @@
>  %define gcc_version    4.9.2
>  %define newlib_version 2.5.0.20170228
>
> -%include tools/rtems-gcc-4.9-newlib-2.2.0-2.cfg
> +%hash sha512 gcc-4.9.2.tar.bz2 e96cba06d572dbe7f382a2b00fd9297dcf9f9219d46a9ad0bd904dc36d5e7db3335e422640b79a27fed6fde91b0731732b94a0e2fbcd47344d6779f8ba1f4f9c
> +%hash sha512 newlib-2.5.0.20170228.tar.gz d3d5b902bd2e30d24c51867c493c4672c83d2be1e574bea65b453e91641afe558bd305e8e6118b9926f21d86cd4656220bb37ea598d19da7df34b77506637b09
> +
> +%include tools/rtems-gcc-4.9-newlib-2.2.0-1.cfg
This looks wrong should it be newlib-2.5.0.20170228-1.

> diff --git a/rtems/config/tools/rtems-gcc-4.9.3-newlib-2.5.0.20170228-1.cfg b/rtems/config/tools/rtems-gcc-4.9.3-newlib-2.5.0.20170228-1.cfg
> index 8f5b51e..1d1aec6 100644
> --- a/rtems/config/tools/rtems-gcc-4.9.3-newlib-2.5.0.20170228-1.cfg
> +++ b/rtems/config/tools/rtems-gcc-4.9.3-newlib-2.5.0.20170228-1.cfg
> @@ -1,4 +1,7 @@
>  %define gcc_version    4.9.3
>  %define newlib_version 2.5.0.20170228
>
> -%include tools/rtems-gcc-4.9-newlib-2.2.0-2.cfg
> +%hash sha512 gcc-4.9.3.tar.bz2 9ac57377a6975fc7adac704ec81355262b9f537def6955576753b87715470a20ee6a2a3144a79cc8fcba3443f7b44c7337d79d704b522d053f54f79aa6b442df
> +%hash sha512 newlib-2.5.0.20170228.tar.gz d3d5b902bd2e30d24c51867c493c4672c83d2be1e574bea65b453e91641afe558bd305e8e6118b9926f21d86cd4656220bb37ea598d19da7df34b77506637b09
> +
> +%include tools/rtems-gcc-4.9-newlib-2.2.0-1.cfg
ditto

> diff --git a/rtems/config/tools/rtems-gcc-6.3.0-newlib-2.5.0.20170228-1.cfg b/rtems/config/tools/rtems-gcc-6.3.0-newlib-2.5.0.20170228-1.cfg
> index ff9a44d..c25c2c1 100644
> --- a/rtems/config/tools/rtems-gcc-6.3.0-newlib-2.5.0.20170228-1.cfg
> +++ b/rtems/config/tools/rtems-gcc-6.3.0-newlib-2.5.0.20170228-1.cfg
> @@ -7,6 +7,12 @@
>  %define mpc_version    0.8.1
>  %define gmp_version    4.3.2
>
> +%hash sha512 gcc-6.3.0.tar.bz2 234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78
> +%hash sha512 newlib-2.5.0.20170228.tar.gz d3d5b902bd2e30d24c51867c493c4672c83d2be1e574bea65b453e91641afe558bd305e8e6118b9926f21d86cd4656220bb37ea598d19da7df34b77506637b09
> +%hash sha512 mpfr-2.4.2.tar.bz2 c004b3dbf86c04960e4a1f8db37a409a7cc4cb76135e76e98dcc5ad93aaa8deb62334ee13ff84447a7c12a5e8cb57f25c62ac908c24920f1fb1a38d79d4a4c5e
> +%hash sha512 mpc-0.8.1.tar.gz 14cb9ae3d33caed24d5ae648eed28b2e00ad047a8baeff25981129af88245b4def2948573d7a00d65c5bd34e53524aa6a7351b76703c9f888b41830c1a1daae2
> +%hash sha512 gmp-4.3.2.tar.bz2 2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf
> +
>  %define with_threads 1
>  %define with_plugin  0
>  %define with_iconv   1
> --
> 1.8.4.5
>
> _______________________________________________
> devel mailing list
> devel at rtems.org
> http://lists.rtems.org/mailman/listinfo/devel


More information about the devel mailing list