Skip to content

chore(common-files/building-system-patches): remove do-not-use-python-from-usr-bin.patch #2296

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

Merged
licy183 merged 4 commits into from
Mar 4, 2026
Merged

chore(common-files/building-system-patches): remove do-not-use-python-from-usr-bin.patch #2296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b7a919
chore(common-files/building-system-patches): remove `do-not-use-pytho…
robertkirkman Mar 4, 2026
d4f7881
ci: disable seccomp
licy183 Mar 4, 2026
bfd1aa9
ci: set --privileged
licy183 Mar 4, 2026
0ea7807
revert zaproxy
licy183 Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions common-files/building-system-patches/0006-do-not-use-python-from-usr-bin.patch
View file
Open in desktop

This file was deleted.

0 ...m-patches/0007-do-not-xz-when-debug.patch → ...m-patches/0006-do-not-xz-when-debug.patch
View file
Open in desktop
File renamed without changes.
0 ...-system-patches/0008-allow-reuse-pr.patch → ...-system-patches/0007-allow-reuse-pr.patch
View file
Open in desktop
File renamed without changes.
19 changes: 19 additions & 0 deletions common-files/building-system-patches/0008-disable-apparmor.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
--- a/scripts/run-docker.sh
+++ b/scripts/run-docker.sh
@@ -96,7 +96,7 @@ if [ "$UNAME" = Darwin ]; then
SEC_OPT=""
else
REPOROOT="$(dirname $(readlink -f $0))/../"
- SEC_OPT=" --security-opt seccomp=$REPOROOT/scripts/profile.json --security-opt apparmor=_custom-termux-package-builder-$CONTAINER_NAME --cap-add CAP_SYS_ADMIN --device /dev/fuse"
+ SEC_OPT=" --privileged --security-opt seccomp=unconfined --cap-add CAP_SYS_ADMIN --device /dev/fuse"
fi

if [ "${CI:-}" = "true" ]; then
@@ -135,6 +135,7 @@ APPARMOR_PARSER=""
if command -v apparmor_parser > /dev/null; then
APPARMOR_PARSER="apparmor_parser"
fi
+APPARMOR_PARSER=""

if [ -z "$APPARMOR_PARSER" ] || ! $SUDO aa-status --enabled; then
echo "WARNING: apparmor_parser not found, AppArmor profiles will not be loaded!"