[Makefile/slave docker] ARM arch doesn't support few packages (#3273)
* [Makefile/slave docker] ARM arch doesn't support few packages iproute2 is missing for ARM sonic-slave docker Signed-off-by: Antony Rheneus <arheneus@marvell.com>
This commit is contained in:
parent
e7af34604c
commit
8de26b7bb9
@ -214,9 +214,11 @@ sudo LANG=C chroot $FILESYSTEM_ROOT useradd -G sudo,docker $USERNAME -c "$DEFAUL
|
|||||||
## Create password for the default user
|
## Create password for the default user
|
||||||
echo "$USERNAME:$PASSWORD" | sudo LANG=C chroot $FILESYSTEM_ROOT chpasswd
|
echo "$USERNAME:$PASSWORD" | sudo LANG=C chroot $FILESYSTEM_ROOT chpasswd
|
||||||
|
|
||||||
## Pre-install hardware drivers
|
if [[ $CONFIGURED_ARCH == amd64 ]]; then
|
||||||
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install \
|
## Pre-install hardware drivers
|
||||||
|
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install \
|
||||||
firmware-linux-nonfree
|
firmware-linux-nonfree
|
||||||
|
fi
|
||||||
|
|
||||||
## Pre-install the fundamental packages
|
## Pre-install the fundamental packages
|
||||||
## Note: gdisk is needed for sgdisk in install.sh
|
## Note: gdisk is needed for sgdisk in install.sh
|
||||||
@ -268,9 +270,14 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
|
|||||||
tcptraceroute \
|
tcptraceroute \
|
||||||
mtr-tiny \
|
mtr-tiny \
|
||||||
locales \
|
locales \
|
||||||
|
cgroup-tools
|
||||||
|
|
||||||
|
if [[ $CONFIGURED_ARCH == amd64 ]]; then
|
||||||
|
## Pre-install the fundamental packages for amd64 (x86)
|
||||||
|
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install \
|
||||||
flashrom \
|
flashrom \
|
||||||
cgroup-tools \
|
|
||||||
mcelog
|
mcelog
|
||||||
|
fi
|
||||||
|
|
||||||
#Adds a locale to a debian system in non-interactive mode
|
#Adds a locale to a debian system in non-interactive mode
|
||||||
sudo sed -i '/^#.* en_US.* /s/^#//' $FILESYSTEM_ROOT/etc/locale.gen && \
|
sudo sed -i '/^#.* en_US.* /s/^#//' $FILESYSTEM_ROOT/etc/locale.gen && \
|
||||||
@ -403,8 +410,10 @@ set /files/etc/sysctl.conf/net.core.rmem_max 2097152
|
|||||||
set /files/etc/sysctl.conf/net.core.wmem_max 2097152
|
set /files/etc/sysctl.conf/net.core.wmem_max 2097152
|
||||||
" -r $FILESYSTEM_ROOT
|
" -r $FILESYSTEM_ROOT
|
||||||
|
|
||||||
# Configure mcelog to log machine checks to syslog
|
if [[ $CONFIGURED_ARCH == amd64 ]]; then
|
||||||
sudo sed -i 's/^#syslog = yes/syslog = yes/' $FILESYSTEM_ROOT/etc/mcelog/mcelog.conf
|
# Configure mcelog to log machine checks to syslog
|
||||||
|
sudo sed -i 's/^#syslog = yes/syslog = yes/' $FILESYSTEM_ROOT/etc/mcelog/mcelog.conf
|
||||||
|
fi
|
||||||
|
|
||||||
## docker-py is needed by Ansible docker module
|
## docker-py is needed by Ansible docker module
|
||||||
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT easy_install pip
|
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT easy_install pip
|
||||||
|
1
device/marvell/armhf-marvell_et6448m_52x-r0/default_sku
Normal file
1
device/marvell/armhf-marvell_et6448m_52x-r0/default_sku
Normal file
@ -0,0 +1 @@
|
|||||||
|
et6448m t1
|
3
installer/armhf/install.sh
Normal file → Executable file
3
installer/armhf/install.sh
Normal file → Executable file
@ -90,8 +90,7 @@ umount $demo_mount
|
|||||||
|
|
||||||
echo "Updating U-Boot environment variables"
|
echo "Updating U-Boot environment variables"
|
||||||
#global uboot enviroment settings
|
#global uboot enviroment settings
|
||||||
#FW_ENV='/dev/mtd0 \t\t 0x00500000 \t 0x80000 \t 0x100000 \t 8'
|
FW_ENV='/dev/mtd0 \t\t 0x00500000 \t 0x80000 \t 0x100000 \t 8'
|
||||||
FW_ENV='/dev/mtd0 \t\t 0x00500000 \t 0x80000 \t 0x100000 \t 2'
|
|
||||||
|
|
||||||
kernel_addr=0x1100000
|
kernel_addr=0x1100000
|
||||||
fdt_addr=0x1000000
|
fdt_addr=0x1000000
|
||||||
|
@ -26,7 +26,7 @@ RUN dpkg -i \
|
|||||||
debs/{{ deb }}{{' '}}
|
debs/{{ deb }}{{' '}}
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
|
|
||||||
COPY ["start.sh", "syncd.sh", "/usr/bin/"]
|
COPY ["start.sh", "/usr/bin/"]
|
||||||
COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
|
COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
|
||||||
|
|
||||||
## Clean up
|
## Clean up
|
||||||
|
2
slave.mk
2
slave.mk
@ -612,7 +612,7 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
|
|||||||
$(LIBNSS_TACPLUS)) \
|
$(LIBNSS_TACPLUS)) \
|
||||||
$$(addprefix $(TARGET_PATH)/,$$($$*_DOCKERS)) \
|
$$(addprefix $(TARGET_PATH)/,$$($$*_DOCKERS)) \
|
||||||
$$(addprefix $(FILES_PATH)/,$$($$*_FILES)) \
|
$$(addprefix $(FILES_PATH)/,$$($$*_FILES)) \
|
||||||
$(addprefix $(STRETCH_FILES_PATH)/,$(IXGBE_DRIVER)) \
|
$(addprefix $(STRETCH_FILES_PATH)/, $(if $(filter $(CONFIGURED_ARCH),amd64), $(IXGBE_DRIVER))) \
|
||||||
$(addprefix $(PYTHON_DEBS_PATH)/,$(SONIC_UTILS)) \
|
$(addprefix $(PYTHON_DEBS_PATH)/,$(SONIC_UTILS)) \
|
||||||
$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_CONFIG_ENGINE)) \
|
$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_CONFIG_ENGINE)) \
|
||||||
$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PLATFORM_COMMON_PY2)) \
|
$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PLATFORM_COMMON_PY2)) \
|
||||||
|
@ -249,6 +249,17 @@ RUN apt-get update && apt-get install -y \
|
|||||||
cmake \
|
cmake \
|
||||||
# For pam_tacplus build
|
# For pam_tacplus build
|
||||||
autoconf-archive \
|
autoconf-archive \
|
||||||
|
# For iproute2
|
||||||
|
cm-super-minimal \
|
||||||
|
libatm1-dev \
|
||||||
|
libelf-dev \
|
||||||
|
libmnl-dev \
|
||||||
|
libselinux1-dev \
|
||||||
|
linuxdoc-tools \
|
||||||
|
lynx \
|
||||||
|
texlive-latex-extra \
|
||||||
|
texlive-latex-recommended \
|
||||||
|
iproute2 \
|
||||||
# For python-click build
|
# For python-click build
|
||||||
python-sphinx \
|
python-sphinx \
|
||||||
python-docutils \
|
python-docutils \
|
||||||
|
Loading…
Reference in New Issue
Block a user