Skip to content

Conversation

@manifestoso
Copy link
Contributor

xorg-macros-1.19.2 broken url updated

@manifestoso manifestoso changed the title xorg-macros-1.19.2-GCCcore-8.2.0.eb url update {devel}[GCCcore-8.2.0] xorg-macros-1.19.2 url update Dec 11, 2019
Copy link
Member

@boegel boegel left a comment

Choose a reason for hiding this comment

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

Ideally the same fix is applied to the other xorg-macros easyconfigs, are you up for doing that @robqiao?

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

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

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. 😏

@boegel boegel added this to the release after 4.1.0 (4.1.1?) milestone Dec 11, 2019
@boegel boegel added the bug fix label Dec 11, 2019
@manifestoso
Copy link
Contributor Author

Ideally the same fix is applied to the other xorg-macros easyconfigs, are you up for doing that @robqiao?

I don't seem to see original tarballs. All checksums will need to be updated though, @boegel still want me to go ahead?

@manifestoso manifestoso requested a review from boegel December 11, 2019 22:59
@boegel
Copy link
Member

boegel commented Dec 12, 2019

@robqiao Yeah go ahead, but we should check for surprises by comparing the previous source tarballs with the new ones...

@manifestoso
Copy link
Contributor Author

manifestoso commented Dec 18, 2019

@robqiao Yeah go ahead, but we should check for surprises by comparing the previous source tarballs with the new ones...

@boegel So far, it seems no issues.

@Flamefire
Copy link
Contributor

Tested one of them too and seems to be correct. See also #9527 with the question what the correct usage would be as e.g. X11 ECs are affected by the same issue (and I came up with the same solution after a failed attempt of using only https://gitlab.freedesktop.org/xorg/util/macros/-/archive/' instead of https://gitlab.freedesktop.org/xorg/util/macros/-/archive/util-macros-%(version)s', the former has a differently named folder)

@manifestoso
Copy link
Contributor Author

manifestoso commented Dec 18, 2019

https://gitlab.freedesktop.org/xorg/util/macros/-/archive/

Sure, some convention probably is needed here. Ideally, this URL config should be something like

sources = [{
    'source_urls': ['https://gitlab.freedesktop.org/xorg/util/macros/-/archive/util-macros-%(version)s'], 
    'filename': 'util-macros-%(version)s.tar.gz', 
    'extract_cmd': "tar xfvz %s",  
}]

Given that sources is a list of source files (filenames only) as in easyconfig basics, keep it a pure file name without any appending path maybe is a good convention to stick to plus it is easier to read in my option. See what @Flamefire and @boegel think.

@Flamefire
Copy link
Contributor

The extract command is not required, besides that yes (it is the same as used in this PR, isn't it?)

So IMO this PR is ok and seems to work

@Flamefire
Copy link
Contributor

Flamefire commented Dec 19, 2019

Test report by @Flamefire
FAILED
Build succeeded for 17 out of 54 (11 easyconfigs in this PR)
taurusi6302.taurus.hrsk.tu-dresden.de - Linux RHEL 7.4, Intel(R) Xeon(R) CPU E5-2680 v3 @ 2.50GHz, Python 2.7.5
See https://gist.github.com/1fbc6c97bb1b98b500a7e6810d0621ae for a full test report.

Only intel stuff failed, GCC PASSED, so 👍

@manifestoso
Copy link
Contributor Author

The extract command is not required, besides that yes (it is the same as used in this PR, isn't it?)

So IMO this PR is ok and seems to work

Correct, shorthand format was adopted for all easyconfig files in this PR.

@easybuilders easybuilders deleted a comment from boegelbot Dec 21, 2019

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

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
$ 

@boegel boegel changed the title {devel}[GCCcore-8.2.0] xorg-macros-1.19.2 url update fix source URLs in xorg-macros easyconfigs Dec 24, 2019
@pescobar pescobar merged commit c8e744b into easybuilders:develop Dec 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants