From 4a41ca4e2f8800dcf72afb15ea04f70e3bd858a9 Mon Sep 17 00:00:00 2001 From: Nianyu Shen Date: Fri, 26 Jul 2024 15:48:33 -0700 Subject: [PATCH 1/2] install latest pam in opensuse Signed-off-by: Nianyu Shen --- Earthfile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index e9e25af..604e2cf 100644 --- a/Earthfile +++ b/Earthfile @@ -99,10 +99,12 @@ IF [ "$FIPS_ENABLED" = "true" ] ARG STYLUS_BASE=$SPECTRO_PUB_REPO/stylus-framework-fips-linux-$ARCH:$PE_VERSION ARG STYLUS_PACKAGE_BASE=$SPECTRO_PUB_REPO/stylus-fips-linux-$ARCH:$PE_VERSION ARG CLI_IMAGE=$SPECTRO_PUB_REPO/palette-edge-cli-fips-${TARGETARCH}:${PE_VERSION} + ARG UBUNTU_SYSTEMD_IMG=$SPECTRO_PUB_REPO/third-party/ubuntu-systemd-fips:22.04 ELSE ARG STYLUS_BASE=$SPECTRO_PUB_REPO/stylus-framework-linux-$ARCH:$PE_VERSION ARG STYLUS_PACKAGE_BASE=$SPECTRO_PUB_REPO/stylus-linux-$ARCH:$PE_VERSION ARG CLI_IMAGE=$SPECTRO_PUB_REPO/palette-edge-cli-${TARGETARCH}:${PE_VERSION} + ARG UBUNTU_SYSTEMD_IMG=$SPECTRO_PUB_REPO/third-party/ubuntu-systemd:22.04 END IF [ "$CUSTOM_TAG" != "" ] @@ -787,6 +789,14 @@ base-image: END IF [ "$OS_DISTRIBUTION" = "opensuse-leap" ] + RUN zypper addrepo https://download.opensuse.org/repositories/Linux-PAM/openSUSE_Tumbleweed/Linux-PAM.repo && \ + zypper refresh + IF [ "$ARCH" = "amd64" ] + zypper install -y pam-1.6.1-1.4.x86_64 + ELSE IF [ "$ARCH" = "arm64" ] + zypper install -y pam-1.6.1-1.4.aarch64 + END + RUN zypper install -y apparmor-parser apparmor-profiles rsyslog logrotate RUN zypper cc && \ zypper clean @@ -932,7 +942,7 @@ iso-efi-size-check: SAVE ARTIFACT efi-size-check.iso AS LOCAL ./build/ ubuntu-systemd: - FROM $SPECTRO_PUB_REPO/ubuntu-systemd:22.04 + FROM $UBUNTU_SYSTEMD_IMG OS_RELEASE: COMMAND From 00471643da0958702027ad50465366b8e88d594c Mon Sep 17 00:00:00 2001 From: abhinav Date: Sat, 27 Jul 2024 01:23:56 +0000 Subject: [PATCH 2/2] more updates --- Earthfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Earthfile b/Earthfile index 604e2cf..f254ed4 100644 --- a/Earthfile +++ b/Earthfile @@ -792,9 +792,9 @@ base-image: RUN zypper addrepo https://download.opensuse.org/repositories/Linux-PAM/openSUSE_Tumbleweed/Linux-PAM.repo && \ zypper refresh IF [ "$ARCH" = "amd64" ] - zypper install -y pam-1.6.1-1.4.x86_64 + RUN zypper install -y pam-1.6.1-1.4.x86_64 ELSE IF [ "$ARCH" = "arm64" ] - zypper install -y pam-1.6.1-1.4.aarch64 + RUN zypper install -y pam-1.6.1-1.4.aarch64 END RUN zypper install -y apparmor-parser apparmor-profiles rsyslog logrotate