Skip to content

fix source URLs in xorg-macros easyconfigs #9477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pescobar merged 11 commits into from
Dec 24, 2019
Merged

fix source URLs in xorg-macros easyconfigs #9477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7d19821
Merge pull request #2 from easybuilders/develop
Dec 11, 2019
9ffbe79
xorg-macros-1.19.2 url update
manifestoso Dec 11, 2019
024ab7b
xorg-macros-1.19.2 url update
manifestoso Dec 11, 2019
960cef8
xorg-macros-1.19.2 syntax fix
manifestoso Dec 11, 2019
e0aa72d
xorg-macros-1.19.2 https fix
manifestoso Dec 11, 2019
7e3b4a5
xorg-macros-1.19.2 URL fix
manifestoso Dec 18, 2019
7e22937
xorg-macros-1.19.1 URL fix
manifestoso Dec 18, 2019
d59406c
xorg-macros-1.19.1 https fix
manifestoso Dec 18, 2019
179c42b
xorg-macros-1.19.0 https fix
manifestoso Dec 18, 2019
970b907
xorg-macros-1.19.1 https fix
manifestoso Dec 18, 2019
c8e744b
xorg-macros-1.19.0 URL fix
manifestoso Dec 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.19.0-foss-2016a.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
##
# This is a contribution from DeepThought HPC Service, Flinders University, Adelaide, Australia
# Homepage: https://staff.flinders.edu.au/research/deep-thought
#
# Authors:: Robert Qiao <[email protected]>
# License:: Custom
#
# Notes::
##

easyblock = 'ConfigureMake'

name = 'xorg-macros'
version = '1.19.0'

homepage = 'http://cgit.freedesktop.org/xorg/util/macros'
homepage = 'https://cgit.freedesktop.org/xorg/util/macros'
description = """X.org macros utilities."""
toolchain = {'name': 'foss', 'version': '2016a'}

source_urls = ['http://cgit.freedesktop.org/xorg/util/macros/snapshot'] # no slash ('/') at the end!
source_urls = ['https://gitlab.freedesktop.org/xorg/util/macros/-/archive/util-macros-%(version)s']
sources = ['util-macros-%(version)s.tar.gz']
checksums = ['f017f21b94141eaabc16f779aab79dccb403c66154ae67ef15bdc0b0d73e51a4']

builddependencies = [('Autotools', '20150215')]

Expand Down
15 changes: 13 additions & 2 deletions easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.19.0-foss-2016b.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
##
# This is a contribution from DeepThought HPC Service, Flinders University, Adelaide, Australia
# Homepage: https://staff.flinders.edu.au/research/deep-thought
#
# Authors:: Robert Qiao <[email protected]>
# License:: Custom
#
# Notes::
##

easyblock = 'ConfigureMake'

name = 'xorg-macros'
version = '1.19.0'

homepage = 'http://cgit.freedesktop.org/xorg/util/macros'
homepage = 'https://cgit.freedesktop.org/xorg/util/macros'
description = """X.org macros utilities."""
toolchain = {'name': 'foss', 'version': '2016b'}

source_urls = ['http://cgit.freedesktop.org/xorg/util/macros/snapshot'] # no slash ('/') at the end!
source_urls = ['https://gitlab.freedesktop.org/xorg/util/macros/-/archive/util-macros-%(version)s']
sources = ['util-macros-%(version)s.tar.gz']
checksums = ['f017f21b94141eaabc16f779aab79dccb403c66154ae67ef15bdc0b0d73e51a4']

builddependencies = [('Autotools', '20150215')]

Expand Down
14 changes: 12 additions & 2 deletions easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.19.0-gimkl-2.11.5.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,24 @@
##
# This is a contribution from DeepThought HPC Service, Flinders University, Adelaide, Australia
# Homepage: https://staff.flinders.edu.au/research/deep-thought
#
# Authors:: Robert Qiao <[email protected]>
# License:: Custom
#
# Notes::
##

easyblock = 'ConfigureMake'

name = 'xorg-macros'
version = '1.19.0'

homepage = 'http://cgit.freedesktop.org/xorg/util/macros'
homepage = 'https://cgit.freedesktop.org/xorg/util/macros'
description = """X.org macros utilities."""
toolchain = {'name': 'gimkl', 'version': '2.11.5'}

source_urls = ['http://cgit.freedesktop.org/xorg/util/macros/snapshot'] # no slash ('/') at the end!
sources = ['util-macros-%(version)s.tar.gz']
checksums = ['f017f21b94141eaabc16f779aab79dccb403c66154ae67ef15bdc0b0d73e51a4']

builddependencies = [('Autotools', '20150215')]

Expand Down
15 changes: 13 additions & 2 deletions easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.19.0-intel-2016a.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
##
# This is a contribution from DeepThought HPC Service, Flinders University, Adelaide, Australia
# Homepage: https://staff.flinders.edu.au/research/deep-thought
#
# Authors:: Robert Qiao <[email protected]>
# License:: Custom
#
# Notes::
##

easyblock = 'ConfigureMake'

name = 'xorg-macros'
version = '1.19.0'

homepage = 'http://cgit.freedesktop.org/xorg/util/macros'
homepage = 'https://cgit.freedesktop.org/xorg/util/macros'
description = """X.org macros utilities."""
toolchain = {'name': 'intel', 'version': '2016a'}

source_urls = ['http://cgit.freedesktop.org/xorg/util/macros/snapshot'] # no slash ('/') at the end!
source_urls = ['https://gitlab.freedesktop.org/xorg/util/macros/-/archive/util-macros-%(version)s']
sources = ['util-macros-%(version)s.tar.gz']
checksums = ['f017f21b94141eaabc16f779aab79dccb403c66154ae67ef15bdc0b0d73e51a4']

builddependencies = [('Autotools', '20150215')]

Expand Down
15 changes: 13 additions & 2 deletions easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.19.0-intel-2016b.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
##
# This is a contribution from DeepThought HPC Service, Flinders University, Adelaide, Australia
# Homepage: https://staff.flinders.edu.au/research/deep-thought
#
# Authors:: Robert Qiao <[email protected]>
# License:: Custom
#
# Notes::
##

easyblock = 'ConfigureMake'

name = 'xorg-macros'
version = '1.19.0'

homepage = 'http://cgit.freedesktop.org/xorg/util/macros'
homepage = 'https://cgit.freedesktop.org/xorg/util/macros'
description = """X.org macros utilities."""
toolchain = {'name': 'intel', 'version': '2016b'}

source_urls = ['http://cgit.freedesktop.org/xorg/util/macros/snapshot'] # no slash ('/') at the end!
source_urls = ['https://gitlab.freedesktop.org/xorg/util/macros/-/archive/util-macros-%(version)s']
sources = ['util-macros-%(version)s.tar.gz']
checksums = ['f017f21b94141eaabc16f779aab79dccb403c66154ae67ef15bdc0b0d73e51a4']

builddependencies = [('Autotools', '20150215')]

Expand Down
15 changes: 13 additions & 2 deletions easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.19.1-GCCcore-6.3.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,26 @@
##
# This is a contribution from DeepThought HPC Service, Flinders University, Adelaide, Australia
# Homepage: https://staff.flinders.edu.au/research/deep-thought
#
# Authors:: Robert Qiao <[email protected]>
# License:: Custom
#
# Notes::
##

easyblock = 'ConfigureMake'

name = 'xorg-macros'
version = '1.19.1'

homepage = 'http://cgit.freedesktop.org/xorg/util/macros'
homepage = 'https://cgit.freedesktop.org/xorg/util/macros'
description = """X.org macros utilities."""

toolchain = {'name': 'GCCcore', 'version': '6.3.0'}

source_urls = ['http://cgit.freedesktop.org/xorg/util/macros/snapshot'] # no slash ('/') at the end!
source_urls = ['https://gitlab.freedesktop.org/xorg/util/macros/-/archive/util-macros-%(version)s']
sources = ['util-macros-%(version)s.tar.gz']
Copy link
Member

@boegel boegel Dec 21, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@robqiao You're using util-macros-1.19.1.tar.gz here, while you use macros-util-macros-1.19.1.tar.gz in xorg-macros-1.19.1-GCCcore-6.4.0.eb, is that intentional?

The source code is identical though if you check the unpacked directories (just the top-level dir is different):

$ tar xfvz util-macros-1.19.1.tar.gz
x macros-util-macros-1.19.1-4b6b1dfea16214b5104b5373341dc8bc7016d0b5/
x macros-util-macros-1.19.1-4b6b1dfea16214b5104b5373341dc8bc7016d0b5/.gitignore
x macros-util-macros-1.19.1-4b6b1dfea16214b5104b5373341dc8bc7016d0b5/COPYING
x macros-util-macros-1.19.1-4b6b1dfea16214b5104b5373341dc8bc7016d0b5/INSTALL
x macros-util-macros-1.19.1-4b6b1dfea16214b5104b5373341dc8bc7016d0b5/Makefile.am
x macros-util-macros-1.19.1-4b6b1dfea16214b5104b5373341dc8bc7016d0b5/README
x macros-util-macros-1.19.1-4b6b1dfea16214b5104b5373341dc8bc7016d0b5/autogen.sh
x macros-util-macros-1.19.1-4b6b1dfea16214b5104b5373341dc8bc7016d0b5/configure.ac
x macros-util-macros-1.19.1-4b6b1dfea16214b5104b5373341dc8bc7016d0b5/xorg-macros.m4.in
x macros-util-macros-1.19.1-4b6b1dfea16214b5104b5373341dc8bc7016d0b5/xorg-macros.pc.in
x macros-util-macros-1.19.1-4b6b1dfea16214b5104b5373341dc8bc7016d0b5/xorgversion.m4

$ tar xfvz macros-util-macros-1.19.1.tar.gz
x macros-util-macros-1.19.1/
x macros-util-macros-1.19.1/.gitignore
x macros-util-macros-1.19.1/COPYING
x macros-util-macros-1.19.1/INSTALL
x macros-util-macros-1.19.1/Makefile.am
x macros-util-macros-1.19.1/README
x macros-util-macros-1.19.1/autogen.sh
x macros-util-macros-1.19.1/configure.ac
x macros-util-macros-1.19.1/xorg-macros.m4.in
x macros-util-macros-1.19.1/xorg-macros.pc.in
x macros-util-macros-1.19.1/xorgversion.m4

$ diff -ru macros-util-macros-1.19.1 macros-util-macros-1.19.1-4b6b1dfea16214b5104b5373341dc8bc7016d0b5
$

So, I would opt for using macros-util-macros-%(version)s.tar.gz everywhere, partially because that helps to avoid that people will run into checksum failures if they have the previous source tarballs already downloaded.

The good news is that the contents of the (previous) util-macros-1.19.1.tar.gz and macros-util-macros-1.19.1.tar.gz is identical:

$ diff -ru macros-util-macros-1.19.1 util-macros-1.19.1
$

checksums = ['52f6e8c86a40cff3fd840783d338da6430e1441ce4d0546179c0f74ea90591ac']

builddependencies = [
# use same binutils version that was used when building GCC toolchain
Expand Down
18 changes: 14 additions & 4 deletions easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.19.1-GCCcore-6.4.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
##
# This is a contribution from DeepThought HPC Service, Flinders University, Adelaide, Australia
# Homepage: https://staff.flinders.edu.au/research/deep-thought
#
# Authors:: Robert Qiao <[email protected]>
# License:: Custom
#
# Notes::
##

easyblock = 'ConfigureMake'

name = 'xorg-macros'
version = '1.19.1'

homepage = 'http://cgit.freedesktop.org/xorg/util/macros'
homepage = 'https://cgit.freedesktop.org/xorg/util/macros'
description = """X.org macros utilities."""

toolchain = {'name': 'GCCcore', 'version': '6.4.0'}

source_urls = ['http://cgit.freedesktop.org/xorg/util/macros/snapshot'] # no slash ('/') at the end!
sources = ['util-macros-%(version)s.tar.gz']
checksums = ['f056411c49a9955f141cad4d7b258a1a5e5bcc0f2a197ee00c63ac3bbe9f347a']
source_urls = ['https://gitlab.freedesktop.org/xorg/util/macros/-/archive/util-macros-%(version)s']
sources = ['macros-util-macros-%(version)s.tar.gz']
checksums = ['0bb70872f45d9973db645123fe9fae9c587d1cc0ad1b3bfa67864c3f99adbd2a']

builddependencies = [
('binutils', '2.28'),
Expand Down
16 changes: 13 additions & 3 deletions easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.19.2-GCCcore-7.2.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
##
# This is a contribution from DeepThought HPC Service, Flinders University, Adelaide, Australia
# Homepage: https://staff.flinders.edu.au/research/deep-thought
#
# Authors:: Robert Qiao <[email protected]>
# License:: Custom
#
# Notes::
##

easyblock = 'ConfigureMake'

name = 'xorg-macros'
version = '1.19.2'

homepage = 'http://cgit.freedesktop.org/xorg/util/macros'
homepage = 'https://cgit.freedesktop.org/xorg/util/macros'
description = """X.org macros utilities."""

toolchain = {'name': 'GCCcore', 'version': '7.2.0'}

source_urls = ['http://cgit.freedesktop.org/xorg/util/macros/snapshot'] # no slash ('/') at the end!
source_urls = ['https://gitlab.freedesktop.org/xorg/util/macros/-/archive/util-macros-%(version)s']
sources = ['util-macros-%(version)s.tar.gz']
checksums = ['5d6e62803c9f20830b28ad8a9800c97a9987635089229e3e380ef3848c84d2a6']
checksums = ['aae54a5b4556f35a85d6808e8d9a467156697c71f66b4142e42330e3a79f80c6']

builddependencies = [
('binutils', '2.29'),
Expand Down
18 changes: 14 additions & 4 deletions easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.19.2-GCCcore-7.3.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
##
# This is a contribution from DeepThought HPC Service, Flinders University, Adelaide, Australia
# Homepage: https://staff.flinders.edu.au/research/deep-thought
#
# Authors:: Robert Qiao <[email protected]>
# License:: Custom
#
# Notes::
##

easyblock = 'ConfigureMake'

name = 'xorg-macros'
version = '1.19.2'

homepage = 'http://cgit.freedesktop.org/xorg/util/macros'
homepage = 'https://cgit.freedesktop.org/xorg/util/macros'
description = """X.org macros utilities."""

toolchain = {'name': 'GCCcore', 'version': '7.3.0'}

source_urls = ['http://cgit.freedesktop.org/xorg/util/macros/snapshot'] # no slash ('/') at the end!
sources = ['util-macros-%(version)s.tar.gz']
checksums = ['5d6e62803c9f20830b28ad8a9800c97a9987635089229e3e380ef3848c84d2a6']
source_urls = ['https://gitlab.freedesktop.org/xorg/util/macros/-/archive/util-macros-%(version)s']
sources = ['macros-util-macros-%(version)s.tar.gz']
checksums = ['326e51a5d673e3d9cc7f139aee469a11e18ea060b1d06c22694612e68a2089b1']

builddependencies = [
('binutils', '2.30'),
Expand Down
18 changes: 14 additions & 4 deletions easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.19.2-GCCcore-8.2.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
##
# This is a contribution from DeepThought HPC Service, Flinders University, Adelaide, Australia
# Homepage: https://staff.flinders.edu.au/research/deep-thought
#
# Authors:: Robert Qiao <[email protected]>
# License:: Custom
#
# Notes::
##

easyblock = 'ConfigureMake'

name = 'xorg-macros'
version = '1.19.2'

homepage = 'http://cgit.freedesktop.org/xorg/util/macros'
homepage = 'https://cgit.freedesktop.org/xorg/util/macros'
description = """X.org macros utilities."""

toolchain = {'name': 'GCCcore', 'version': '8.2.0'}

source_urls = ['http://cgit.freedesktop.org/xorg/util/macros/snapshot'] # no slash ('/') at the end!
sources = ['util-macros-%(version)s.tar.gz']
checksums = ['5d6e62803c9f20830b28ad8a9800c97a9987635089229e3e380ef3848c84d2a6']
source_urls = ['https://gitlab.freedesktop.org/xorg/util/macros/-/archive/util-macros-%(version)s']
sources = ['macros-util-macros-%(version)s.tar.gz']
checksums = ['326e51a5d673e3d9cc7f139aee469a11e18ea060b1d06c22694612e68a2089b1']
Copy link
Member

@boegel boegel Dec 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, the original source tarball is not available anymore, from anywhere? :(

Copy link
Contributor Author

@manifestoso manifestoso Dec 11, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not I am aware of though. 😏


builddependencies = [
('binutils', '2.31.1'),
Expand Down
18 changes: 14 additions & 4 deletions easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.19.2-GCCcore-8.3.0.eb
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
##
# This is a contribution from DeepThought HPC Service, Flinders University, Adelaide, Australia
# Homepage: https://staff.flinders.edu.au/research/deep-thought
#
# Authors:: Robert Qiao <[email protected]>
# License:: Custom
#
# Notes::
##

easyblock = 'ConfigureMake'

name = 'xorg-macros'
version = '1.19.2'

homepage = 'http://cgit.freedesktop.org/xorg/util/macros'
homepage = 'https://cgit.freedesktop.org/xorg/util/macros'
description = """X.org macros utilities."""

toolchain = {'name': 'GCCcore', 'version': '8.3.0'}

source_urls = ['http://cgit.freedesktop.org/xorg/util/macros/snapshot'] # no slash ('/') at the end!
sources = ['util-macros-%(version)s.tar.gz']
checksums = ['5d6e62803c9f20830b28ad8a9800c97a9987635089229e3e380ef3848c84d2a6']
source_urls = ['https://gitlab.freedesktop.org/xorg/util/macros/-/archive/util-macros-%(version)s']
sources = ['macros-util-macros-%(version)s.tar.gz']
checksums = ['326e51a5d673e3d9cc7f139aee469a11e18ea060b1d06c22694612e68a2089b1']

builddependencies = [
('binutils', '2.32'),
Expand Down