Skip to content

Commit 3196a41

Browse files
authored
Merge pull request #61 from flashbots/fix-umask-main
Normalize u/o permissions to prevent umask issues
2 parents ca29892 + ef25ae4 commit 3196a41

File tree

4 files changed

+7
-40
lines changed

4 files changed

+7
-40
lines changed

Makefile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,21 @@ ifndef IMAGE
2424
$(error IMAGE is not set. Please specify IMAGE=<image> when running make build or make build-dev)
2525
endif
2626

27-
.PHONY: all build build-dev setup measure clean check-perms check-module
27+
.PHONY: all build build-dev setup measure clean check-module
2828

2929
# Default target
3030
all: build
3131

32-
# Ensure repo was cloned with correct permissions
33-
check-perms: ## Check repository permissions
34-
@scripts/check_perms.sh
35-
3632
# Setup dependencies (Linux only)
3733
setup: ## Install dependencies (Linux only)
3834
@scripts/setup_deps.sh
3935

4036
# Build module
41-
build: check-perms setup ## Build the specified module
37+
build: setup ## Build the specified module
4238
$(WRAPPER) mkosi --force --image-id $(IMAGE) -I $(IMAGE).conf
4339

4440
# Build module with devtools profile
45-
build-dev: check-perms setup ## Build module with development tools
41+
build-dev: setup ## Build module with development tools
4642
$(WRAPPER) mkosi --force --image-id $(IMAGE)-dev --profile=devtools -I $(IMAGE).conf
4743

4844
##@ Utilities

base/mkosi.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ PostInstallationScripts=base/efi-stub.sh
2525
SyncScripts=base/add-backports.sh
2626
FinalizeScripts=base/debloat.sh
2727
FinalizeScripts=base/remove-image-version.sh
28+
SyncScripts=base/normalize-umask.sh
2829

2930
CleanPackageMetadata=true
3031
Packages=kmod

base/normalize-umask.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
set -euo pipefail
3+
chmod -cR go-w "$SRCDIR"

scripts/check_perms.sh

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)