Merge pull request #21843 from cfergeau/entitlements

Add missing vfkit entitlement
This commit is contained in:
openshift-merge-bot[bot]
2024-02-27 18:26:39 +00:00
committed by GitHub
3 changed files with 8 additions and 7 deletions

View File

@ -40,7 +40,7 @@ packagedir: podman_version package_root Distribution welcome.html
../../test/version/version > $(PACKAGE_DIR)/VERSION ../../test/version/version > $(PACKAGE_DIR)/VERSION
echo -n $(ARCH) > $(PACKAGE_DIR)/ARCH echo -n $(ARCH) > $(PACKAGE_DIR)/ARCH
cp ../../LICENSE $(PACKAGE_DIR)/Resources/LICENSE.txt cp ../../LICENSE $(PACKAGE_DIR)/Resources/LICENSE.txt
cp hvf.entitlements $(PACKAGE_DIR)/ cp vfkit.entitlements $(PACKAGE_DIR)/
package_root: clean-pkgroot $(TMP_DOWNLOAD)/gvproxy $(TMP_DOWNLOAD)/vfkit package_root: clean-pkgroot $(TMP_DOWNLOAD)/gvproxy $(TMP_DOWNLOAD)/vfkit
mkdir -p $(PACKAGE_ROOT)/podman/bin mkdir -p $(PACKAGE_ROOT)/podman/bin

View File

@ -4,7 +4,7 @@ set -euxo pipefail
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
OUTPUT=$1 OUTPUT=$1
CODESIGN_IDENTITY=${CODESIGN_IDENTITY:-mock} CODESIGN_IDENTITY=${CODESIGN_IDENTITY:--}
PRODUCTSIGN_IDENTITY=${PRODUCTSIGN_IDENTITY:-mock} PRODUCTSIGN_IDENTITY=${PRODUCTSIGN_IDENTITY:-mock}
NO_CODESIGN=${NO_CODESIGN:-0} NO_CODESIGN=${NO_CODESIGN:-0}
HELPER_BINARIES_DIR="/opt/podman/bin" HELPER_BINARIES_DIR="/opt/podman/bin"
@ -25,9 +25,6 @@ function build_podman() {
} }
function sign() { function sign() {
if [ "${NO_CODESIGN}" -eq "1" ]; then
return
fi
local opts="" local opts=""
entitlements="${BASEDIR}/$(basename "$1").entitlements" entitlements="${BASEDIR}/$(basename "$1").entitlements"
if [ -f "${entitlements}" ]; then if [ -f "${entitlements}" ]; then

View File

@ -2,7 +2,11 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>com.apple.security.hypervisor</key> <key>com.apple.security.network.server</key>
<true/>
<key>com.apple.security.network.client</key>
<true/>
<key>com.apple.security.virtualization</key>
<true/> <true/>
</dict> </dict>
</plist> </plist>