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.

Sign up for GitHub

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

Jump to bottom

packaging: Fix up make_osx_package to work for version 4+ #5827

Merged
merged 1 commit into from
Sep 26, 2019
Merged

packaging: Fix up make_osx_package to work for version 4+ #5827

merged 1 commit into from
Sep 26, 2019

Conversation

theopolis
Copy link
Member

Example test plan:

$ ./tools/deployment/make_osx_package1.sh 
[+] using /vagrant/tools/deployment/com.facebook.osqueryd.plist as the launchd source
[+] copying osquery binaries into /vagrant/tools/deployment/../../build/_packaging/prefix
[+] copying osquery configurations
[+] finalizing preinstall and postinstall scripts
[+] creating package
[+] package created at /vagrant/tools/deployment/../../build/osquery-4.0.2-7-g33f7c6fc.pkg
[+] creating debug package
[+] package created at /vagrant/tools/deployment/../../build/osquery-debug-4.0.2-7-g33f7c6fc.pkg

zwass
zwass approved these changes Sep 25, 2019
View reviewed changes
tools/deployment/make_osx_package.sh
@@ -50,42 +39,22 @@ NEWSYSLOG_SRC="$SCRIPT_DIR/$LD_IDENTIFIER.conf"
NEWSYSLOG_DST="/private/var/osquery/$LD_IDENTIFIER.conf"
PACKS_SRC="$SOURCE_DIR/packs"
PACKS_DST="/private/var/osquery/packs/"
LENSES_LICENSE="${OSQUERY_DEPS}/Cellar/augeas/*/COPYING"
LENSES_SRC="${OSQUERY_DEPS}/share/augeas/lenses/dist"
LENSES_LICENSE="libs/fb/augeas/augeas/1.9.0/COPYING"
Copy link
Member

Choose a reason for hiding this comment

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

If we continue using this script it would be nice to pull these Augeas paths from the CMake discovery.

Copy link
Member

Choose a reason for hiding this comment

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

II think a better approach would be to make DESTDIR="${INSTALLPREFIX}" install instead of manually copying the files. This would future-proof this script against any modification on the build system

Copy link
Member Author

Choose a reason for hiding this comment

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

I think so to, my plan is to fix these scripts then follow up to change the API (parameters) to use make install approach.

Copy link
Member Author

Choose a reason for hiding this comment

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

I'll track that next change here: #5842

@theopolis theopolis merged commit e5599c0 into osquery:master Sep 26, 2019
muffins pushed a commit to muffins/osquery that referenced this pull request Oct 15, 2019
@theopolis @muffins
packaging: Fix up make_osx_package to work for version 4+ (osquery#5827)
0dce92f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alessandrogario alessandrogario alessandrogario left review comments

@zwass zwass zwass approved these changes

Assignees
No one assigned
Labels
macOS packaging
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@theopolis @zwass @alessandrogario