diff --git a/Makefile b/Makefile index 6094d301..3ad4b73c 100644 --- a/Makefile +++ b/Makefile @@ -81,6 +81,10 @@ ifneq ($(PKG_INSTALL_REF),) EXTRAENV += -e PKG_INSTALL_REF="$(PKG_INSTALL_REF)" endif +ifneq ($(PKG_COMPRESSION),) + EXTRAENV += -e PKG_COMPRESSION="$(PKG_COMPRESSION)" +endif + ifneq ($(EXTRA_OPTIMIZATIONS),) EXTRAENV += -e EXTRA_OPTIMIZATIONS=true endif diff --git a/integration/linux/build/centos-7/Dockerfile b/integration/linux/build/centos-7/Dockerfile index 11f67bdf..5c2e4c31 100644 --- a/integration/linux/build/centos-7/Dockerfile +++ b/integration/linux/build/centos-7/Dockerfile @@ -103,6 +103,10 @@ if [ -n "${PKG_TAGS}" ]; then\n\ extraopts+=" --pkg-tags=${PKG_TAGS}"\n\ fi\n\ \n\ +if [ -n "${PKG_COMPRESSION}" ]; then\n\ + extraopts+=" --pkg-compression=${PKG_COMPRESSION}"\n\ +fi\n\ +\n\ if [ -n "${EXTRA_OPTIMIZATIONS}" ]; then\n\ extraopts+=" --extra-optimizations"\n\ fi\n\ diff --git a/integration/linux/build/centos-8/Dockerfile b/integration/linux/build/centos-8/Dockerfile index 4b705d88..159a21f0 100644 --- a/integration/linux/build/centos-8/Dockerfile +++ b/integration/linux/build/centos-8/Dockerfile @@ -99,6 +99,10 @@ if [ -n "${PKG_TAGS}" ]; then\n\ extraopts+=" --pkg-tags=${PKG_TAGS}"\n\ fi\n\ \n\ +if [ -n "${PKG_COMPRESSION}" ]; then\n\ + extraopts+=" --pkg-compression=${PKG_COMPRESSION}"\n\ +fi\n\ +\n\ if [ -n "${EXTRA_OPTIMIZATIONS}" ]; then\n\ extraopts+=" --extra-optimizations"\n\ fi\n\ diff --git a/integration/linux/build/debian-bookworm/Dockerfile b/integration/linux/build/debian-bookworm/Dockerfile index 3506e86d..6b5670d8 100644 --- a/integration/linux/build/debian-bookworm/Dockerfile +++ b/integration/linux/build/debian-bookworm/Dockerfile @@ -69,6 +69,10 @@ if [ -n "${PKG_TAGS}" ]; then\n\ extraopts+=" --pkg-tags=${PKG_TAGS}"\n\ fi\n\ \n\ +if [ -n "${PKG_COMPRESSION}" ]; then\n\ + extraopts+=" --pkg-compression=${PKG_COMPRESSION}"\n\ +fi\n\ +\n\ if [ -n "${EXTRA_OPTIMIZATIONS}" ]; then\n\ extraopts+=" --extra-optimizations"\n\ fi\n\ diff --git a/integration/linux/build/debian-bullseye/Dockerfile b/integration/linux/build/debian-bullseye/Dockerfile index 5ffbaa44..089e81d9 100644 --- a/integration/linux/build/debian-bullseye/Dockerfile +++ b/integration/linux/build/debian-bullseye/Dockerfile @@ -69,6 +69,10 @@ if [ -n "${PKG_TAGS}" ]; then\n\ extraopts+=" --pkg-tags=${PKG_TAGS}"\n\ fi\n\ \n\ +if [ -n "${PKG_COMPRESSION}" ]; then\n\ + extraopts+=" --pkg-compression=${PKG_COMPRESSION}"\n\ +fi\n\ +\n\ if [ -n "${EXTRA_OPTIMIZATIONS}" ]; then\n\ extraopts+=" --extra-optimizations"\n\ fi\n\ diff --git a/integration/linux/build/debian-buster/Dockerfile b/integration/linux/build/debian-buster/Dockerfile index 09941156..65c013c1 100644 --- a/integration/linux/build/debian-buster/Dockerfile +++ b/integration/linux/build/debian-buster/Dockerfile @@ -69,6 +69,10 @@ if [ -n "${PKG_TAGS}" ]; then\n\ extraopts+=" --pkg-tags=${PKG_TAGS}"\n\ fi\n\ \n\ +if [ -n "${PKG_COMPRESSION}" ]; then\n\ + extraopts+=" --pkg-compression=${PKG_COMPRESSION}"\n\ +fi\n\ +\n\ if [ -n "${EXTRA_OPTIMIZATIONS}" ]; then\n\ extraopts+=" --extra-optimizations"\n\ fi\n\ diff --git a/integration/linux/build/entrypoint.sh b/integration/linux/build/entrypoint.sh index 8468034b..0440b85d 100755 --- a/integration/linux/build/entrypoint.sh +++ b/integration/linux/build/entrypoint.sh @@ -35,6 +35,10 @@ if [ -n "${PKG_TAGS}" ]; then extraopts+=" --pkg-tags=${PKG_TAGS}" fi +if [ -n "${PKG_COMPRESSION}" ]; then + extraopts+=" --pkg-compression=${PKG_COMPRESSION}" +fi + if [ -n "${EXTRA_OPTIMIZATIONS}" ]; then extraopts+=" --extra-optimizations" fi diff --git a/integration/linux/build/fedora-40/Dockerfile b/integration/linux/build/fedora-40/Dockerfile index b877cc38..feecaf04 100644 --- a/integration/linux/build/fedora-40/Dockerfile +++ b/integration/linux/build/fedora-40/Dockerfile @@ -96,6 +96,10 @@ if [ -n "${PKG_TAGS}" ]; then\n\ extraopts+=" --pkg-tags=${PKG_TAGS}"\n\ fi\n\ \n\ +if [ -n "${PKG_COMPRESSION}" ]; then\n\ + extraopts+=" --pkg-compression=${PKG_COMPRESSION}"\n\ +fi\n\ +\n\ if [ -n "${EXTRA_OPTIMIZATIONS}" ]; then\n\ extraopts+=" --extra-optimizations"\n\ fi\n\ diff --git a/integration/linux/build/linux-aarch64/Dockerfile b/integration/linux/build/linux-aarch64/Dockerfile index 53da33a3..9892df58 100644 --- a/integration/linux/build/linux-aarch64/Dockerfile +++ b/integration/linux/build/linux-aarch64/Dockerfile @@ -112,6 +112,10 @@ if [ -n "${PKG_TAGS}" ]; then\n\ extraopts+=" --pkg-tags=${PKG_TAGS}"\n\ fi\n\ \n\ +if [ -n "${PKG_COMPRESSION}" ]; then\n\ + extraopts+=" --pkg-compression=${PKG_COMPRESSION}"\n\ +fi\n\ +\n\ if [ -n "${EXTRA_OPTIMIZATIONS}" ]; then\n\ extraopts+=" --extra-optimizations"\n\ fi\n\ diff --git a/integration/linux/build/linux-x86_64/Dockerfile b/integration/linux/build/linux-x86_64/Dockerfile index 7ef0e4e8..d692addb 100644 --- a/integration/linux/build/linux-x86_64/Dockerfile +++ b/integration/linux/build/linux-x86_64/Dockerfile @@ -112,6 +112,10 @@ if [ -n "${PKG_TAGS}" ]; then\n\ extraopts+=" --pkg-tags=${PKG_TAGS}"\n\ fi\n\ \n\ +if [ -n "${PKG_COMPRESSION}" ]; then\n\ + extraopts+=" --pkg-compression=${PKG_COMPRESSION}"\n\ +fi\n\ +\n\ if [ -n "${EXTRA_OPTIMIZATIONS}" ]; then\n\ extraopts+=" --extra-optimizations"\n\ fi\n\ diff --git a/integration/linux/build/linuxmusl-aarch64/Dockerfile b/integration/linux/build/linuxmusl-aarch64/Dockerfile index 57db4359..ae1bce0c 100644 --- a/integration/linux/build/linuxmusl-aarch64/Dockerfile +++ b/integration/linux/build/linuxmusl-aarch64/Dockerfile @@ -87,6 +87,10 @@ if [ -n "${PKG_TAGS}" ]; then\n\ extraopts+=" --pkg-tags=${PKG_TAGS}"\n\ fi\n\ \n\ +if [ -n "${PKG_COMPRESSION}" ]; then\n\ + extraopts+=" --pkg-compression=${PKG_COMPRESSION}"\n\ +fi\n\ +\n\ if [ -n "${EXTRA_OPTIMIZATIONS}" ]; then\n\ extraopts+=" --extra-optimizations"\n\ fi\n\ diff --git a/integration/linux/build/linuxmusl-x86_64/Dockerfile b/integration/linux/build/linuxmusl-x86_64/Dockerfile index 57db4359..ae1bce0c 100644 --- a/integration/linux/build/linuxmusl-x86_64/Dockerfile +++ b/integration/linux/build/linuxmusl-x86_64/Dockerfile @@ -87,6 +87,10 @@ if [ -n "${PKG_TAGS}" ]; then\n\ extraopts+=" --pkg-tags=${PKG_TAGS}"\n\ fi\n\ \n\ +if [ -n "${PKG_COMPRESSION}" ]; then\n\ + extraopts+=" --pkg-compression=${PKG_COMPRESSION}"\n\ +fi\n\ +\n\ if [ -n "${EXTRA_OPTIMIZATIONS}" ]; then\n\ extraopts+=" --extra-optimizations"\n\ fi\n\ diff --git a/integration/linux/build/rockylinux-9/Dockerfile b/integration/linux/build/rockylinux-9/Dockerfile index 42edd14c..f9903689 100644 --- a/integration/linux/build/rockylinux-9/Dockerfile +++ b/integration/linux/build/rockylinux-9/Dockerfile @@ -101,6 +101,10 @@ if [ -n "${PKG_TAGS}" ]; then\n\ extraopts+=" --pkg-tags=${PKG_TAGS}"\n\ fi\n\ \n\ +if [ -n "${PKG_COMPRESSION}" ]; then\n\ + extraopts+=" --pkg-compression=${PKG_COMPRESSION}"\n\ +fi\n\ +\n\ if [ -n "${EXTRA_OPTIMIZATIONS}" ]; then\n\ extraopts+=" --extra-optimizations"\n\ fi\n\ diff --git a/integration/linux/build/ubuntu-bionic/Dockerfile b/integration/linux/build/ubuntu-bionic/Dockerfile index 1b396562..6bff5fc8 100644 --- a/integration/linux/build/ubuntu-bionic/Dockerfile +++ b/integration/linux/build/ubuntu-bionic/Dockerfile @@ -69,6 +69,10 @@ if [ -n "${PKG_TAGS}" ]; then\n\ extraopts+=" --pkg-tags=${PKG_TAGS}"\n\ fi\n\ \n\ +if [ -n "${PKG_COMPRESSION}" ]; then\n\ + extraopts+=" --pkg-compression=${PKG_COMPRESSION}"\n\ +fi\n\ +\n\ if [ -n "${EXTRA_OPTIMIZATIONS}" ]; then\n\ extraopts+=" --extra-optimizations"\n\ fi\n\ diff --git a/integration/linux/build/ubuntu-focal/Dockerfile b/integration/linux/build/ubuntu-focal/Dockerfile index 37a8c29e..7df2b24c 100644 --- a/integration/linux/build/ubuntu-focal/Dockerfile +++ b/integration/linux/build/ubuntu-focal/Dockerfile @@ -69,6 +69,10 @@ if [ -n "${PKG_TAGS}" ]; then\n\ extraopts+=" --pkg-tags=${PKG_TAGS}"\n\ fi\n\ \n\ +if [ -n "${PKG_COMPRESSION}" ]; then\n\ + extraopts+=" --pkg-compression=${PKG_COMPRESSION}"\n\ +fi\n\ +\n\ if [ -n "${EXTRA_OPTIMIZATIONS}" ]; then\n\ extraopts+=" --extra-optimizations"\n\ fi\n\ diff --git a/integration/linux/build/ubuntu-hirsute/Dockerfile b/integration/linux/build/ubuntu-hirsute/Dockerfile index b7ca6df4..ffa8710f 100644 --- a/integration/linux/build/ubuntu-hirsute/Dockerfile +++ b/integration/linux/build/ubuntu-hirsute/Dockerfile @@ -69,6 +69,10 @@ if [ -n "${PKG_TAGS}" ]; then\n\ extraopts+=" --pkg-tags=${PKG_TAGS}"\n\ fi\n\ \n\ +if [ -n "${PKG_COMPRESSION}" ]; then\n\ + extraopts+=" --pkg-compression=${PKG_COMPRESSION}"\n\ +fi\n\ +\n\ if [ -n "${EXTRA_OPTIMIZATIONS}" ]; then\n\ extraopts+=" --extra-optimizations"\n\ fi\n\ diff --git a/integration/linux/build/ubuntu-jammy/Dockerfile b/integration/linux/build/ubuntu-jammy/Dockerfile index daecab89..d984964c 100644 --- a/integration/linux/build/ubuntu-jammy/Dockerfile +++ b/integration/linux/build/ubuntu-jammy/Dockerfile @@ -69,6 +69,10 @@ if [ -n "${PKG_TAGS}" ]; then\n\ extraopts+=" --pkg-tags=${PKG_TAGS}"\n\ fi\n\ \n\ +if [ -n "${PKG_COMPRESSION}" ]; then\n\ + extraopts+=" --pkg-compression=${PKG_COMPRESSION}"\n\ +fi\n\ +\n\ if [ -n "${EXTRA_OPTIMIZATIONS}" ]; then\n\ extraopts+=" --extra-optimizations"\n\ fi\n\ diff --git a/integration/linux/build/ubuntu-noble/Dockerfile b/integration/linux/build/ubuntu-noble/Dockerfile index 84f04366..481a24b1 100644 --- a/integration/linux/build/ubuntu-noble/Dockerfile +++ b/integration/linux/build/ubuntu-noble/Dockerfile @@ -69,6 +69,10 @@ if [ -n "${PKG_TAGS}" ]; then\n\ extraopts+=" --pkg-tags=${PKG_TAGS}"\n\ fi\n\ \n\ +if [ -n "${PKG_COMPRESSION}" ]; then\n\ + extraopts+=" --pkg-compression=${PKG_COMPRESSION}"\n\ +fi\n\ +\n\ if [ -n "${EXTRA_OPTIMIZATIONS}" ]; then\n\ extraopts+=" --extra-optimizations"\n\ fi\n\ diff --git a/integration/macos/build.sh b/integration/macos/build.sh index 80e9053b..23d87346 100755 --- a/integration/macos/build.sh +++ b/integration/macos/build.sh @@ -25,6 +25,14 @@ if [ -n "${PKG_SUBDIST}" ]; then extraopts+=" --pkg-subdist=${PKG_SUBDIST}" fi +if [ -n "${PKG_TAGS}" ]; then + extraopts+=" --pkg-tags=${PKG_TAGS}" +fi + +if [ -n "${PKG_COMPRESSION}" ]; then + extraopts+=" --pkg-compression=${PKG_COMPRESSION}" +fi + if [ -n "${EXTRA_OPTIMIZATIONS}" ]; then extraopts+=" --extra-optimizations" fi diff --git a/integration/win/build.sh b/integration/win/build.sh index 0331cdee..711d087f 100755 --- a/integration/win/build.sh +++ b/integration/win/build.sh @@ -32,6 +32,14 @@ if [ -n "${PKG_SUBDIST}" ]; then extraopts+=" --pkg-subdist=${PKG_SUBDIST}" fi +if [ -n "${PKG_TAGS}" ]; then + extraopts+=" --pkg-tags=${PKG_TAGS}" +fi + +if [ -n "${PKG_COMPRESSION}" ]; then + extraopts+=" --pkg-compression=${PKG_COMPRESSION}" +fi + if [ -n "${BUILD_GENERIC}" ]; then extraopts+=" --generic" fi