From 5364926b4574a0f3b8e58b37e57c47b046b9cf3a Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Thu, 1 Mar 2018 09:52:00 +0000 Subject: [PATCH] [build]: build initramfs, libwrap, tacacs packages under stretch docker initramfs/libwrap/tacacs packages are installed on stretch base image --- rules/initramfs-tools.mk | 2 ++ rules/libwrap.mk | 4 +++- rules/tacacs.mk | 2 ++ sonic-slave-stretch/Dockerfile | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/rules/initramfs-tools.mk b/rules/initramfs-tools.mk index 9fbeb249a6..974da74b02 100644 --- a/rules/initramfs-tools.mk +++ b/rules/initramfs-tools.mk @@ -6,3 +6,5 @@ export INITRAMFS_TOOLS_VERSION INITRAMFS_TOOLS = initramfs-tools_$(INITRAMFS_TOOLS_VERSION)_all.deb $(INITRAMFS_TOOLS)_SRC_PATH = $(SRC_PATH)/initramfs-tools SONIC_MAKE_DEBS += $(INITRAMFS_TOOLS) + +SONIC_STRETCH_DEBS += $(INITRAMFS_TOOLS) diff --git a/rules/libwrap.mk b/rules/libwrap.mk index aab8e959d1..20a4b5ed20 100644 --- a/rules/libwrap.mk +++ b/rules/libwrap.mk @@ -1,6 +1,6 @@ # libwrap packages -LIBWRAP_VERSION = 7.6.q-25 +LIBWRAP_VERSION = 7.6.q-26 export LIBWRAP_VERSION @@ -10,3 +10,5 @@ SONIC_MAKE_DEBS += $(LIBWRAP) TCPD = tcpd_$(LIBWRAP_VERSION)_amd64.deb $(eval $(call add_derived_package,$(LIBWRAP),$(TCPD))) + +SONIC_STRETCH_DEBS += $(LIBWRAP) diff --git a/rules/tacacs.mk b/rules/tacacs.mk index e31f52d9ab..649f6af080 100644 --- a/rules/tacacs.mk +++ b/rules/tacacs.mk @@ -27,3 +27,5 @@ $(LIBNSS_TACPLUS)_DEPENDS += $(LIBTAC_DEV) $(LIBNSS_TACPLUS)_RDEPENDS += $(LIBTAC2) $(LIBNSS_TACPLUS)_SRC_PATH = $(SRC_PATH)/tacacs/nss SONIC_MAKE_DEBS += $(LIBNSS_TACPLUS) + +SONIC_STRETCH_DEBS += $(LIBPAM_TACPLUS) $(LIBNSS_TACPLUS) diff --git a/sonic-slave-stretch/Dockerfile b/sonic-slave-stretch/Dockerfile index 3b1a333f48..4f7582efa0 100644 --- a/sonic-slave-stretch/Dockerfile +++ b/sonic-slave-stretch/Dockerfile @@ -198,6 +198,8 @@ RUN apt-get update && apt-get install -y \ # For gtest libgtest-dev \ cmake \ +# For pam_tacplus build + autoconf-archive \ # For initramfs bash-completion