From 7ab346a1ec6f215ac00d5ab8cac9c3f014019d6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Fri, 26 Mar 2021 21:41:21 +0100
Subject: [PATCH] scripts: don't include pax-utils and paxmark in images
Also don't bootstrap it in bootstrap.sh. Since we no longer use
the grsecurity patchset (which also provides PaX) and paxmark
was recently removed from all remaining packages, there should be
no need to bootstrap it early or include it in the images.
---
scripts/bootstrap.sh | 2 +-
scripts/mkimg.standard.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 876f595a5196..20cc2d5aeb93 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -101,7 +101,7 @@ for PKG in fortify-headers linux-headers musl libc-dev pkgconf zlib \
gmp mpfr4 mpc1 isl22 cloog libucontext gcc \
openrc alpine-conf alpine-baselayout alpine-keys alpine-base patch build-base \
attr libcap acl fakeroot tar \
- pax-utils lzip abuild ncurses libedit openssh \
+ lzip abuild ncurses libedit openssh \
libcap-ng util-linux libaio lvm2 popt xz \
json-c argon2 cryptsetup zstd kmod lddtree mkinitfs \
community/go libffi community/ghc \
diff --git a/scripts/mkimg.standard.sh b/scripts/mkimg.standard.sh
index 434fa003f536..d59252022355 100755
--- a/scripts/mkimg.standard.sh
+++ b/scripts/mkimg.standard.sh
@@ -36,7 +36,7 @@ profile_extended() {
apks="$apks
ethtool hwids lftp links doas
logrotate lua5.3 lsof lm_sensors lxc lxc-templates nano
- pax-utils paxmark pciutils screen strace sudo tmux
+ pciutils screen strace sudo tmux
usbutils v86d vim xtables-addons curl
acct arpon arpwatch awall bridge-utils bwm-ng
--
GitLab