Commit Graph

197 Commits

Author SHA1 Message Date
Greg Neagle acfbe8ea3f Change package directory structure creation methods to not trigger CrowdStrike :-( 2021-10-04 11:00:56 -07:00
Greg Neagle 87365bef62 Bump Python version to 3.9.7; bump PyObjC to 7.3 2021-09-08 14:23:40 -07:00
macmule e8ccc5f53e Update build_python_framework.sh (#1096)
Corrects the Python.framework path, and end of the script.

Before:

```
Verifying Universal2 builds...
     182 libraries (*.so and *.dylib) found in the framework; only       90 are universal!
The following libraries are not universal:
find: Python.framework: No such file or directory
```

After:

```
Verifying Universal2 builds...
     182 libraries (*.so and *.dylib) found in the framework; only       90 are universal!
The following libraries are not universal:
/Users/ben/Git/munki/Python.framework/Versions/3.9/lib/python3.9/site-packages/StoreKit/_StoreKit.abi3.so:                                                 Mach-O 64-bit bundle x86_64
</snip>
```
2021-06-17 10:25:43 -07:00
Greg Neagle 75010e835c Bump Python version to 3.9.5 2021-05-24 15:36:32 -07:00
rrenstrom 56a1dd0cee Add support for client cert package (#1091)
* Build script flag to include client cert

Adds -T flag to make_munki_pkg build scripts to include a component package containing a client certificate for server mTLS

* define no script for certain component packages

In make_munki_mpkg.sh add SCRIPTS="" to  clientcert"), "bootstrap") and "config") cases for pkgbuild, so no script is included in these component packages.
2021-05-14 14:25:02 -07:00
Greg Neagle b4190710c2 Add asn1crypto to py3_requirements.txt to support new client cert functionality 2021-05-11 15:01:50 -07:00
Greg Neagle 43eb5405df Bump PyObjC version to 7.1; sadly need to compile from source since the wheels are x86_64 only 2021-04-12 08:38:06 -07:00
Greg Neagle 7d53d176b0 Update Python version to 3.9.4 2021-04-09 15:21:05 -07:00
Greg Neagle 7f554f5bfb Bump Python version to 3.9.2 2021-03-02 08:28:22 -08:00
Greg Neagle 165e3e79a2 Merge branch 'main' into universal2 2021-02-12 13:37:18 -08:00
Greg Neagle 0620b2330c Fix typos in help text for make_munki_mpkg.sh and make_munki_mpkg_from_git.sh 2021-02-12 13:36:30 -08:00
Greg Neagle d48a622e34 No longer include a no_python component package in the generated distribution package 2021-02-04 08:10:03 -08:00
Greg Neagle 5096c0a209 Merge branch 'main' into universal2 2021-01-19 09:47:03 -08:00
Greg Neagle 053e3eac9e Update pkg pre and postinstall scripts to use os version comparision compatible with Big Sur 2021-01-19 09:46:18 -08:00
Greg Neagle 778d01f5ab build_python_framework.sh: print any libraries found inside the generated Python framework that are not universal 2021-01-06 08:51:21 -08:00
Greg Neagle a2fde07886 update build script and requirements for universal Python3 2020-12-11 16:31:31 -08:00
Greg Neagle 518dbade54 Pin xattr, pyobjc and six versions in pip requirements file 2020-12-08 10:02:37 -08:00
Greg Neagle 72dc2a652f Update build_python_framework.sh to build from 3.9.1 release 2020-12-08 10:01:51 -08:00
dhmoore 4c5485d6af = instead of == for POSIX sh compliance (#1063) 2020-12-07 10:53:38 -08:00
dhmoore e8732e0924 = instead of == for POSIX sh compliance (#1063) 2020-12-07 10:48:21 -08:00
Greg Neagle 3d92ba59ba For Universal2 builds, declare arm64 support in the installer pkg 2020-12-02 07:57:57 -08:00
Greg Neagle e724297686 Ad-hoc code signing of Python framework so it will work on Apple Silicon 2020-11-30 13:59:30 -08:00
Greg Neagle 0ae0d5c609 Changes for Universal2 builds including Python 3.9.1rc1 and PyObjC 7.0 2020-11-29 16:18:29 -08:00
Greg Neagle d9520b8af6 Do not attempt to install Rosetta2 if we're not installing to the current startup disk 2020-11-24 09:11:39 -08:00
Greg Neagle fcf6e8c7a8 Explictly set hostArchitectures in the Distribution only if -R (Rosetta) option is given; leave undefined (and default) otherwise 2020-11-18 14:46:26 -08:00
eholtam 5fd7f00885 Add rosetta2 option to build script (#1056)
* Added option for Rosetta2 install for ARM hardware.

* Add hostArchitectures option to Distribution for arm64 support

* Removed file based arm64 arch addition attempt to Distribution

* Adjusted hostArchitecture to be a variable, adding arm64 only if Rosetta is included

Co-authored-by: eholtam <(none)>
2020-11-18 14:07:55 -08:00
Greg Neagle 5da152bd76 Change volume-check in mpkg distribution so minimum OS version is 10.11. 2020-11-17 16:57:39 -08:00
Greg Neagle 32267f4285 Fix lack of newline at end of code/tools/py3_requirements.txt 2020-11-07 11:28:27 -08:00
Greg Neagle 645a7cdb91 Error output tweak 2020-10-22 13:24:10 -07:00
thefuzzyjew 0576697cf4 Differentiate between version.plist not existing and being unreadable (#1035)
* Differentiate between version.plist not existing and being unreadable

* change $versionfile to ${versionfile}.plist for clarity
2020-10-22 13:21:51 -07:00
Greg Neagle 2cbc98df7e Merge branch 'Munki5dev' into new-msc-design 2020-09-16 14:46:29 -07:00
Graham Gilbert 401f521f48 Add cleanup scripts (#1025)
* Run cleanup scripts if they're there

* Cleanup script, add to build script

* okay

* I'm all shelled out

* Comment for future greg
2020-09-16 14:05:08 -07:00
Greg Neagle c27fd3c07f Logic change to get the Python revision number to increment 'better' 2020-09-15 17:08:33 -07:00
Greg Neagle e1b5d505bc Revert "Revert "munki: rename "/usr/local/munki/python" symlink to "munki-python" (#997)""
IOW, restore the rename of "/usr/local/munki/python" symlink to "munki-python" (#997)

This reverts commit b9f9fffccc.
2020-09-15 16:46:34 -07:00
Greg Neagle aa66b4cda5 Don't do any attempted cleanup of the Python framework so that Munki-driven updates of Munki don't crash mid-upgrade 2020-09-15 14:54:37 -07:00
Greg Neagle 69411e7e24 Merge branch 'Munki5dev' into new-msc-design 2020-09-15 09:08:09 -07:00
Greg Neagle b9f9fffccc Revert "munki: rename "/usr/local/munki/python" symlink to "munki-python" (#997)"
This change is still a good future goal, but is causing problems that are too difficult to work around right now and is delaying the vital release of Munki 5.1 for Big Sur compatibility.

This reverts commit 3bb91cabca.
2020-09-15 09:04:47 -07:00
Greg Neagle e86e2c0698 Merge branch 'Munki5dev' into new-msc-design 2020-09-14 13:20:09 -07:00
eholtam 0e14dccdb1 Removed detection of absolute path (#1016)
* Removed detection of absolute path. It paths wrong if the supplied file is not in the cwd.

* Convert supplied config file to an absolute path and use that variable for all references to the file.

Co-authored-by: eholtam <(none)>
2020-09-03 15:48:02 -07:00
Greg Neagle 54d3b56b93 Merge Steve Kueng's MSC work into new-msc-design 2020-09-02 16:36:45 -07:00
Greg Neagle 85dde11196 Better processing of addditional options to make_munki_mpkg.sh 2020-08-25 08:40:32 -07:00
Greg Neagle 1399cfa839 Merge branch 'newbuildscript' of https://github.com/munki/munki into newbuildscript 2020-08-24 21:06:30 -07:00
Marnin ee755fe295 Fixed minor typos (#1015)
* Fixed minor typo

* Fixed minor typo
2020-08-24 19:20:20 -07:00
Greg Neagle 45ec30f7b9 Fix for default output dir 2020-08-24 13:43:22 -07:00
Greg Neagle aa91e5a7a7 Tweak help text 2020-08-24 08:54:16 -07:00
Greg Neagle d5474f9271 Tweak help text 2020-08-23 18:49:06 -07:00
Greg Neagle 631095fc78 Tweak help text 2020-08-23 18:34:01 -07:00
Greg Neagle b39b5b8c20 Update make_munki_mpkg_from_git.sh to reflect changes in make_munki_mpkg.sh 2020-08-23 18:32:41 -07:00
Greg Neagle e7b688dc66 Add support for building a config pkg from a preferences plist 2020-08-23 18:31:51 -07:00
Greg Neagle a7d097291e Remove unsupported make_munki_mpkg_DEP.sh script. 2020-08-23 14:13:31 -07:00