Skip to content
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

net/route: adjust some constants for DragonFly BSD #34724

Closed
wants to merge 1 commit into from

Conversation

tuxillo
Copy link
Contributor

@tuxillo tuxillo commented Oct 6, 2019

RTM_VERSION was bumped in DragonFly BSD. While here also remove
RTM_OLDADD and RTM_OLDDEL which were removed a while ago.

Fixes #34368

- RTM_VERSION was bumped in DragonFly BSD. While here also remove
  RTM_OLDADD and RTM_OLDDEL which were removed a while ago.
@googlebot googlebot added the cla: yes Used by googlebot to label PRs as having a valid CLA. The text of this label should not change. label Oct 6, 2019
@gopherbot
Copy link

This PR (HEAD: 7bc6dff) has been imported to Gerrit for code review.

Please visit https://go-review.googlesource.com/c/go/+/199557 to see it.

Tip: You can toggle comments from me using the comments slash command (e.g. /comments off)
See the Wiki page for more info

@gopherbot
Copy link

Message from Brad Fitzpatrick:

Patch Set 1: Code-Review-2

temporary -2 until we update this CL to update the vendor files the normal way. will help later when at a computer.


Please don’t reply on this GitHub thread. Visit golang.org/cl/199557.
After addressing review feedback, remember to publish your drafts!

@gopherbot
Copy link

Message from Brad Fitzpatrick:

Patch Set 1:

See https://github.com/golang/go/blob/master/src/README.vendor


Please don’t reply on this GitHub thread. Visit golang.org/cl/199557.
After addressing review feedback, remember to publish your drafts!

@gopherbot
Copy link

Message from Antonio Huete Jimenez:

Patch Set 1:

Patch Set 1:

See https://github.com/golang/go/blob/master/src/README.vendor

Isn't that for importing the whole vendor package? I followed the instructions from @andybons from here: #34368 (comment)


Please don’t reply on this GitHub thread. Visit golang.org/cl/199557.
After addressing review feedback, remember to publish your drafts!

@gopherbot
Copy link

Message from Brad Fitzpatrick:

Patch Set 1:

Patch Set 1:

Patch Set 1:

See https://github.com/golang/go/blob/master/src/README.vendor

Isn't that for importing the whole vendor package? I followed the instructions from @andybons from here: #34368 (comment)

We don't modify files in src/vendor/* directly. You fix it upstream and then import from upstream into vendor.


Please don’t reply on this GitHub thread. Visit golang.org/cl/199557.
After addressing review feedback, remember to publish your drafts!

@gopherbot
Copy link

Message from Antonio Huete Jimenez:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

See https://github.com/golang/go/blob/master/src/README.vendor

Isn't that for importing the whole vendor package? I followed the instructions from @andybons from here: #34368 (comment)

We don't modify files in src/vendor/* directly. You fix it upstream and then import from upstream into vendor.

Okay then. I'm trying with the instructions you provided and I get:

$ go mod tidy
std/bytes/hash tested by
std/bytes/hash.test imports
bytes/hash: malformed module path "bytes/hash": missing dot in first path element


Please don’t reply on this GitHub thread. Visit golang.org/cl/199557.
After addressing review feedback, remember to publish your drafts!

@gopherbot
Copy link

Message from Andrew Bonventre:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

See https://github.com/golang/go/blob/master/src/README.vendor

Isn't that for importing the whole vendor package? I followed the instructions from @andybons from here: #34368 (comment)

We don't modify files in src/vendor/* directly. You fix it upstream and then import from upstream into vendor.

Okay then. I'm trying with the instructions you provided and I get:

$ go mod tidy
std/bytes/hash tested by
std/bytes/hash.test imports
bytes/hash: malformed module path "bytes/hash": missing dot in first path element

This is https://golang.org/issue/34184

Ensure you have GOROOT set properly when running these commands


Please don’t reply on this GitHub thread. Visit golang.org/cl/199557.
After addressing review feedback, remember to publish your drafts!

@gopherbot
Copy link

Message from Antonio Huete Jimenez:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

See https://github.com/golang/go/blob/master/src/README.vendor

Isn't that for importing the whole vendor package? I followed the instructions from @andybons from here: #34368 (comment)

We don't modify files in src/vendor/* directly. You fix it upstream and then import from upstream into vendor.

Okay then. I'm trying with the instructions you provided and I get:

$ go mod tidy
std/bytes/hash tested by
std/bytes/hash.test imports
bytes/hash: malformed module path "bytes/hash": missing dot in first path element

This is https://golang.org/issue/34184

Ensure you have GOROOT set properly when running these commands

Okay, thanks. I've now done what's in the vendor guide, there are a few changes made in x/net but I still can see the wrong RTM_VERSION:

$ fgrep RTM_VERSION vendor/golang.org/x/net/route/zsys_dragonfly.go
sysRTM_VERSION = 0x6

The changes to the defs files were made to x/net, maybe I'm missing some step? Should I now generate the dragonfly-specific file?


Please don’t reply on this GitHub thread. Visit golang.org/cl/199557.
After addressing review feedback, remember to publish your drafts!

@gopherbot
Copy link

Message from Brad Fitzpatrick:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

See https://github.com/golang/go/blob/master/src/README.vendor

Isn't that for importing the whole vendor package? I followed the instructions from @andybons from here: #34368 (comment)

We don't modify files in src/vendor/* directly. You fix it upstream and then import from upstream into vendor.

Okay then. I'm trying with the instructions you provided and I get:

$ go mod tidy
std/bytes/hash tested by
std/bytes/hash.test imports
bytes/hash: malformed module path "bytes/hash": missing dot in first path element

This is https://golang.org/issue/34184

Ensure you have GOROOT set properly when running these commands

Okay, thanks. I've now done what's in the vendor guide, there are a few changes made in x/net but I still can see the wrong RTM_VERSION:

$ fgrep RTM_VERSION vendor/golang.org/x/net/route/zsys_dragonfly.go
sysRTM_VERSION = 0x6

The changes to the defs files were made to x/net, maybe I'm missing some step? Should I now generate the dragonfly-specific file?

You need to fix the code in x/net/route before you update the vendored copy in the "go" repo.

If 0x6 is the wrong RTM_VERSION, then this is still wrong here:

https://github.com/golang/net/blob/master/route/zsys_dragonfly.go#L39

You need to fix that first.


Please don’t reply on this GitHub thread. Visit golang.org/cl/199557.
After addressing review feedback, remember to publish your drafts!

@gopherbot
Copy link

Message from Antonio Huete Jimenez:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

See https://github.com/golang/go/blob/master/src/README.vendor

Isn't that for importing the whole vendor package? I followed the instructions from @andybons from here: #34368 (comment)

We don't modify files in src/vendor/* directly. You fix it upstream and then import from upstream into vendor.

Okay then. I'm trying with the instructions you provided and I get:

$ go mod tidy
std/bytes/hash tested by
std/bytes/hash.test imports
bytes/hash: malformed module path "bytes/hash": missing dot in first path element

This is https://golang.org/issue/34184

Ensure you have GOROOT set properly when running these commands

Okay, thanks. I've now done what's in the vendor guide, there are a few changes made in x/net but I still can see the wrong RTM_VERSION:

$ fgrep RTM_VERSION vendor/golang.org/x/net/route/zsys_dragonfly.go
sysRTM_VERSION = 0x6

The changes to the defs files were made to x/net, maybe I'm missing some step? Should I now generate the dragonfly-specific file?

You need to fix the code in x/net/route before you update the vendored copy in the "go" repo.

If 0x6 is the wrong RTM_VERSION, then this is still wrong here:

https://github.com/golang/net/blob/master/route/zsys_dragonfly.go#L39

You need to fix that first.

I thought I already did, see: golang/net@c5a3c61


Please don’t reply on this GitHub thread. Visit golang.org/cl/199557.
After addressing review feedback, remember to publish your drafts!

@gopherbot
Copy link

Message from Brad Fitzpatrick:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

See https://github.com/golang/go/blob/master/src/README.vendor

Isn't that for importing the whole vendor package? I followed the instructions from @andybons from here: #34368 (comment)

We don't modify files in src/vendor/* directly. You fix it upstream and then import from upstream into vendor.

Okay then. I'm trying with the instructions you provided and I get:

$ go mod tidy
std/bytes/hash tested by
std/bytes/hash.test imports
bytes/hash: malformed module path "bytes/hash": missing dot in first path element

This is https://golang.org/issue/34184

Ensure you have GOROOT set properly when running these commands

Okay, thanks. I've now done what's in the vendor guide, there are a few changes made in x/net but I still can see the wrong RTM_VERSION:

$ fgrep RTM_VERSION vendor/golang.org/x/net/route/zsys_dragonfly.go
sysRTM_VERSION = 0x6

The changes to the defs files were made to x/net, maybe I'm missing some step? Should I now generate the dragonfly-specific file?

You need to fix the code in x/net/route before you update the vendored copy in the "go" repo.

If 0x6 is the wrong RTM_VERSION, then this is still wrong here:

https://github.com/golang/net/blob/master/route/zsys_dragonfly.go#L39

You need to fix that first.

I thought I already did, see: golang/net@c5a3c61

You look at that diff and tell me what you see.


Please don’t reply on this GitHub thread. Visit golang.org/cl/199557.
After addressing review feedback, remember to publish your drafts!

@gopherbot
Copy link

Message from Antonio Huete Jimenez:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

See https://github.com/golang/go/blob/master/src/README.vendor

Isn't that for importing the whole vendor package? I followed the instructions from @andybons from here: #34368 (comment)

We don't modify files in src/vendor/* directly. You fix it upstream and then import from upstream into vendor.

Okay then. I'm trying with the instructions you provided and I get:

$ go mod tidy
std/bytes/hash tested by
std/bytes/hash.test imports
bytes/hash: malformed module path "bytes/hash": missing dot in first path element

This is https://golang.org/issue/34184

Ensure you have GOROOT set properly when running these commands

Okay, thanks. I've now done what's in the vendor guide, there are a few changes made in x/net but I still can see the wrong RTM_VERSION:

$ fgrep RTM_VERSION vendor/golang.org/x/net/route/zsys_dragonfly.go
sysRTM_VERSION = 0x6

The changes to the defs files were made to x/net, maybe I'm missing some step? Should I now generate the dragonfly-specific file?

You need to fix the code in x/net/route before you update the vendored copy in the "go" repo.

If 0x6 is the wrong RTM_VERSION, then this is still wrong here:

https://github.com/golang/net/blob/master/route/zsys_dragonfly.go#L39

You need to fix that first.

I thought I already did, see: golang/net@c5a3c61

You look at that diff and tell me what you see.

Let me be more specific. I don't know what's the process of regenerating the platform-specific code that is created out of the defs files. My guess was that some sort of automated process did it but it seems I was wrong. The question is why nobody told me in the PR to generate and include the zsys files manually after changing the defs.


Please don’t reply on this GitHub thread. Visit golang.org/cl/199557.
After addressing review feedback, remember to publish your drafts!

@gopherbot
Copy link

Message from Brad Fitzpatrick:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

Patch Set 1:

See https://github.com/golang/go/blob/master/src/README.vendor

Isn't that for importing the whole vendor package? I followed the instructions from @andybons from here: #34368 (comment)

We don't modify files in src/vendor/* directly. You fix it upstream and then import from upstream into vendor.

Okay then. I'm trying with the instructions you provided and I get:

$ go mod tidy
std/bytes/hash tested by
std/bytes/hash.test imports
bytes/hash: malformed module path "bytes/hash": missing dot in first path element

This is https://golang.org/issue/34184

Ensure you have GOROOT set properly when running these commands

Okay, thanks. I've now done what's in the vendor guide, there are a few changes made in x/net but I still can see the wrong RTM_VERSION:

$ fgrep RTM_VERSION vendor/golang.org/x/net/route/zsys_dragonfly.go
sysRTM_VERSION = 0x6

The changes to the defs files were made to x/net, maybe I'm missing some step? Should I now generate the dragonfly-specific file?

You need to fix the code in x/net/route before you update the vendored copy in the "go" repo.

If 0x6 is the wrong RTM_VERSION, then this is still wrong here:

https://github.com/golang/net/blob/master/route/zsys_dragonfly.go#L39

You need to fix that first.

I thought I already did, see: golang/net@c5a3c61

You look at that diff and tell me what you see.

Let me be more specific. I don't know what's the process of regenerating the platform-specific code that is created out of the defs files. My guess was that some sort of automated process did it but it seems I was wrong. The question is why nobody told me in the PR to generate and include the zsys files manually after changing the defs.

Sorry, I guess your reviewer wasn't familiar with the process either and assumed that if you were sending it, you'd tested it and found that it all fixed it.

In any case, even if we re-generate the zsys_dragonfly.go files in x/net/route and x/net/ipv6, it only removes 3 lines of unexported constants that nothing ever uses, so that won't help fix the broken builders.


Please don’t reply on this GitHub thread. Visit golang.org/cl/199557.
After addressing review feedback, remember to publish your drafts!

@gopherbot
Copy link

This PR is being closed because golang.org/cl/199557 has been abandoned.

@gopherbot gopherbot closed this Oct 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes Used by googlebot to label PRs as having a valid CLA. The text of this label should not change.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

net: test is failing on Dragonfly builder
3 participants