From b18ac4be7f1f67583cec6af97aea656bb9949ec4 Mon Sep 17 00:00:00 2001 From: Dmitry Sharshakov Date: Mon, 19 Aug 2024 18:49:27 +0300 Subject: [PATCH] eudev selinux support --- Dockerfile | 18 ++++++++++++++++++ Makefile | 6 ++++++ 2 files changed, 24 insertions(+) diff --git a/Dockerfile b/Dockerfile index 399c028efc3..ee8bca7db4a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,9 @@ ARG PKG_IPXE ARG PKG_LIBINIH ARG PKG_LIBJSON_C ARG PKG_LIBPOPT +ARG PKG_LIBSEPOL +ARG PKG_LIBSELINUX +ARG PKG_PCRE2 ARG PKG_LIBURCU ARG PKG_OPENSSL ARG PKG_LIBSECCOMP @@ -84,6 +87,15 @@ FROM --platform=arm64 ${PKG_LIBPOPT} AS pkg-libpopt-arm64 FROM --platform=amd64 ${PKG_LIBURCU} AS pkg-liburcu-amd64 FROM --platform=arm64 ${PKG_LIBURCU} AS pkg-liburcu-arm64 +FROM --platform=amd64 ${PKG_LIBSEPOL} AS pkg-libsepol-amd64 +FROM --platform=arm64 ${PKG_LIBSEPOL} AS pkg-libsepol-arm64 + +FROM --platform=amd64 ${PKG_LIBSELINUX} AS pkg-libselinux-amd64 +FROM --platform=arm64 ${PKG_LIBSELINUX} AS pkg-libselinux-arm64 + +FROM --platform=amd64 ${PKG_PCRE2} AS pkg-pcre2-amd64 +FROM --platform=arm64 ${PKG_PCRE2} AS pkg-pcre2-arm64 + FROM --platform=amd64 ${PKG_OPENSSL} AS pkg-openssl-amd64 FROM --platform=arm64 ${PKG_OPENSSL} AS pkg-openssl-arm64 @@ -620,6 +632,9 @@ COPY --link --from=pkg-libinih-amd64 / /rootfs COPY --link --from=pkg-libjson-c-amd64 / /rootfs COPY --link --from=pkg-libpopt-amd64 / /rootfs COPY --link --from=pkg-liburcu-amd64 / /rootfs +COPY --link --from=pkg-libsepol-amd64 / /rootfs +COPY --link --from=pkg-libselinux-amd64 / /rootfs +COPY --link --from=pkg-pcre2-amd64 / /rootfs COPY --link --from=pkg-openssl-amd64 / /rootfs COPY --link --from=pkg-libseccomp-amd64 / /rootfs COPY --link --from=pkg-lvm2-amd64 / /rootfs @@ -692,6 +707,9 @@ COPY --link --from=pkg-libinih-arm64 / /rootfs COPY --link --from=pkg-libjson-c-arm64 / /rootfs COPY --link --from=pkg-libpopt-arm64 / /rootfs COPY --link --from=pkg-liburcu-arm64 / /rootfs +COPY --link --from=pkg-libsepol-arm64 / /rootfs +COPY --link --from=pkg-libselinux-arm64 / /rootfs +COPY --link --from=pkg-pcre2-arm64 / /rootfs COPY --link --from=pkg-openssl-arm64 / /rootfs COPY --link --from=pkg-libseccomp-arm64 / /rootfs COPY --link --from=pkg-lvm2-arm64 / /rootfs diff --git a/Makefile b/Makefile index 3e609ff8226..7137d472d4f 100644 --- a/Makefile +++ b/Makefile @@ -40,6 +40,9 @@ PKG_IPXE ?= $(PKGS_PREFIX)/ipxe:$(PKGS) PKG_LIBINIH ?= $(PKGS_PREFIX)/libinih:$(PKGS) PKG_LIBJSON_C ?= $(PKGS_PREFIX)/libjson-c:$(PKGS) PKG_LIBPOPT ?= $(PKGS_PREFIX)/libpopt:$(PKGS) +PKG_LIBSEPOL ?= $(PKGS_PREFIX)/libsepol:$(PKGS) +PKG_LIBSELINUX ?= $(PKGS_PREFIX)/libselinux:$(PKGS) +PKG_PCRE2 ?= $(PKGS_PREFIX)/pcre2:$(PKGS) PKG_LIBURCU ?= $(PKGS_PREFIX)/liburcu:$(PKGS) PKG_OPENSSL ?= $(PKGS_PREFIX)/openssl:$(PKGS) PKG_LIBSECCOMP ?= $(PKGS_PREFIX)/libseccomp:$(PKGS) @@ -202,6 +205,9 @@ COMMON_ARGS += --build-arg=PKG_IPTABLES=$(PKG_IPTABLES) COMMON_ARGS += --build-arg=PKG_IPXE=$(PKG_IPXE) COMMON_ARGS += --build-arg=PKG_LIBINIH=$(PKG_LIBINIH) COMMON_ARGS += --build-arg=PKG_LIBJSON_C=$(PKG_LIBJSON_C) +COMMON_ARGS += --build-arg=PKG_LIBSEPOL=$(PKG_LIBSEPOL) +COMMON_ARGS += --build-arg=PKG_LIBSELINUX=$(PKG_LIBSELINUX) +COMMON_ARGS += --build-arg=PKG_PCRE2=$(PKG_PCRE2) COMMON_ARGS += --build-arg=PKG_LIBPOPT=$(PKG_LIBPOPT) COMMON_ARGS += --build-arg=PKG_LIBURCU=$(PKG_LIBURCU) COMMON_ARGS += --build-arg=PKG_OPENSSL=$(PKG_OPENSSL)