-
Notifications
You must be signed in to change notification settings - Fork 772
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.
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
Conversation
boegel
left a comment
There was a problem hiding this 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'] |
There was a problem hiding this comment.
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? :(
There was a problem hiding this comment.
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. 😏
I don't seem to see original tarballs. All checksums will need to be updated though, @boegel still want me to go ahead? |
|
@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. |
|
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 |
|
Sure, some convention probably is needed here. Ideally, this URL config should be something like Given that |
|
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 |
|
Test report by @Flamefire Only intel stuff failed, GCC PASSED, so 👍 |
Correct, shorthand format was adopted for all easyconfig files in this PR. |
|
|
||
| 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'] |
There was a problem hiding this comment.
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
$
xorg-macros-1.19.2 broken url updated