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

Update paths, and remove deprecated Facebook names #7210

Merged
merged 4 commits into from
Aug 6, 2021

Conversation

directionless
Copy link
Member

Changes to update the various facebook names to the osquery ones.

I tried to get the paths as well. I might have missed a couple

Closes: #7159

@directionless directionless requested review from a team as code owners July 25, 2021 01:22
@directionless directionless added this to the 5.0.0 milestone Jul 25, 2021
@theopolis
Copy link
Member

theopolis commented Jul 25, 2021

If you rename the launchctl related files then you'll also need a change in osquery-packaging, for example we could land this PR first: https://github.com/osquery/osquery-packaging/pull/3/files, then within your PR here, also update the pinned version of the osquery/osquery-packaging checkout within .github/workflows/build_*.yml

@theopolis
Copy link
Member

Ok this should work if you:

  1. Rebase onto master
  2. Add to the PR, updating both of the locations below to be the new osquery/osquery-packaging HEAD: 372cc337d6dfe769cfd18bf24c13093225166ae0

https://github.com/osquery/osquery/blob/master/.github/workflows/build_aarch64.yml#L32
https://github.com/osquery/osquery/blob/master/.github/workflows/build_x86.yml#L36

@directionless directionless requested a review from a team as a code owner July 27, 2021 02:04
@theopolis
Copy link
Member

Looks like the three executable files need a DESTINATION of /opt/osquery/bin, here: https://github.com/osquery/osquery/pull/7210/files#diff-1e7de1ae2d059d21e1dd75d5812d5a34b0222cef273b7c3a2af62eb747f9d20aR469, and also with osquery and osqueryctl

Copy link
Member

@theopolis theopolis left a comment

Choose a reason for hiding this comment

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

(see comment above)

@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Aug 2, 2021

CLA Signed

The committers are authorized under a signed CLA.

@theopolis
Copy link
Member

@sharvilshah
Copy link
Member

Hey @theopolis they are from #7184

@theopolis
Copy link
Member

Awesome, what do we need to do to merge that PR?

directionless and others added 2 commits August 3, 2021 22:29
Changes to update the various facebook names to the osquery ones.

I tried to get the paths as well. I might have missed a couple
@directionless directionless changed the title Deprecate Facebook Naming Update paths, and remove deprecated Facebook names Aug 4, 2021
@directionless
Copy link
Member Author

Passes CI. I can see there are some issues in the resultant packages, but I'm inclined to merge this and let someone pick up #7236 and #7237 separately.

@alessandrogario
Copy link
Member

I think the only missing part is to update osquery-packaging, then include the new submodule commit here so that we don't break the packages generated by the CI from master; currently, the .pkg archive does not install correctly

@directionless
Copy link
Member Author

I think the only missing part is to update osquery-packaging, then include the new submodule commit here so that we don't break the packages generated by the CI from master; currently, the .pkg archive does not install correctly

Huh? I thought we did that in #7184

@alessandrogario
Copy link
Member

I think the only missing part is to update osquery-packaging, then include the new submodule commit here so that we don't break the packages generated by the CI from master; currently, the .pkg archive does not install correctly

Huh? I thought we did that in #7184

I am not sure if I am doing something wrong, but I have attempted to download and install the .pkg file generated by the CI, and it installed empty folders:

$ find /opt/osquery
/opt/osquery
/opt/osquery/lib

@theopolis theopolis merged commit 0873664 into osquery:master Aug 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants