-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
Replace opensource.apple.com/tarballs to macports_distfiles #18956
Conversation
some ports are static and will never be changed, so doesn't really matter for them. but if you do this for ld64, sometime we'll need to undo it again when it gets updated, eg |
@kencu or tag this site as Anyway, right now you aren't able to build ld64 on 10.5 because it hasn't got binary distirbutives and dowloads from github an archive which doesn't match. Thus, apple not just change archive checksum, it changes it and it requires some work to fix. |
@kencu anyway, may I ask you to merge it? :) At least it covers an issue that exists right now. |
I'll leave this for @jmroot -- it's a big change, and we'll let the admins own it. |
It is unlikely that any upcoming version will be placed on opensource.apple.com, but they only seem to use GitHub now. Wouldn't it make sense to switch these ports to always use downloads from GitHub and update the checksums (with a revision bump)? I guess the different checksum is likely due to the subdirectory name introduced by GitHub, but the contents should be the same. |
@raimue unfortunately some files are missed. For example patch which is refered from ld64 ports. Also, they had repack a bit sources and some work were required to migrate to github sources for cctools: a079d1b Right now I have an issue: I can't install any of this ports because it downloads archive from github and checksum isn't match. |
Running into this issue with a few of the ld64 ports now, too... for ld64-236, the error is:
...and for ld64-274 it is:
...and for ld64-latest it is:
|
f5b1c66
to
f3c79bd
Compare
Here we go again. I've switched to fetching distfiles from github for all ports with two exceptions: appel-gcc40 and apple-gcc42; do we really need it? |
apple-gcc42 is required for Tiger to bootstrap and function. |
Ken, here it is. Anyway, I can't switch apple-gcc40 to GitHub and keep it switched to MacPorts
|
there are a bunch here too https://github.com/apple-oss-distributions/gcc/tags |
Ken, good idea. It had missed 5494 build, but has 5493 only. So, I've created a trivial patch to keep the sources as it was before. |
devel/CoreOSMakefiles/Portfile
Outdated
@@ -2,6 +2,7 @@ PortSystem 1.0 | |||
|
|||
name CoreOSMakefiles | |||
version 77 | |||
revision 1 |
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.
Don't bump the revision if the code isn't changing.
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.
Looks like that's fixed as of 6d86c28.
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.
Yes, I did. But I haven't click "resolve conversation" to make things clear and allow Joshua to see that his remarks was addressed.
devel/CoreOSMakefiles/Portfile
Outdated
sha256 b8bf4c3fa727d71615665322bb22813eda15962544df5238cc37aa606bda276c \ | ||
size 17200 | ||
|
||
dist_subdir apple-oss-distributions |
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.
Why would we want all these ports to share a dist_subdir?
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.
6d86c28 has instead:
# simulate stealth update; remove with next version change
dist_subdir ${name}/${version}_1
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.
sames here.
devel/CoreOSMakefiles/Portfile
Outdated
size 17200 | ||
|
||
dist_subdir apple-oss-distributions | ||
extract.rename yes |
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.
The worksrcdir doesn't have anything unpredictable like a hash in it, so prefer to set that correctly rather than set extract.rename.
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.
Nope, it extracts like CoreOSMakefiles-CoreOSMakefiles-77
, and the same pattern is applied for all that ports.
devel/bootstrap_cmds/Portfile
Outdated
@@ -3,20 +3,23 @@ PortGroup xcode 1.0 | |||
|
|||
name bootstrap_cmds | |||
version 121.100.1 | |||
epoch 1 | |||
epoch 2 |
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.
There's no reason to change the epoch since the version isn't changing.
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.
it was a typo, I plan to increase revision.
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.
mark as resolved, then?
edit: confirmed that the epoch bump is gone in 6d86c28
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.
yep, it is resolved.
lang/apple-gcc40/Portfile
Outdated
distfiles gcc-5493${extract.suffix} | ||
# Apple's github had missed 5494 build but it had only 5493, | ||
# here recovery minimal differences betwen them | ||
patchfiles apple-gcc-5493-5494.diff |
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.
If this one is missing upstream, it's probably fine to just use macports_distfiles for the master_sites.
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.
@jmroot but that patch is extremely small; I'd like to say almost nothing.
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.
yeah, the patch is only 51 lines, of which only 2 are functional (3 if you include the version number bump)
@pmetzger can it be merged? |
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.
Looks mostly fine to me, although I'm wondering about the ld64
lint warnings. Note that I haven't actually tested myself, just looked things over. Will approve once question about ld64
lint warnings is answered (if they were already there beforehand, then they're fine to ignore, I guess, but if they're new, I'd think they should be addressed)
Apple moved all sources from opensource.apple.com/tarballs to GitHub, that leads to a different distfiles which hadn't passed checksum. Closes: https://trac.macports.org/ticket/68538
Description
Apple moved all sources from opensource.apple.com/tarballs to github, that leads to a different distfiles which hadn't passed checksum.
Unfortunately they hadn't migrated everything, for example some patches for ld64 are missed.
But, we have it inside distfiles => let use distfiles as mirror.
Type(s)
Tested on
macOS 10.5.8 9L34 i386
Xcode 3.1.4 9M2809
Verification
Have you
port checksum
?