Skip to content

Commit

Permalink
Merge branch 'sonic-net:master' into pacmgr_changes
Browse files Browse the repository at this point in the history
  • Loading branch information
vijaya-ops authored May 14, 2024
2 parents 6d5d8bc + 07cd4ff commit a924d62
Show file tree
Hide file tree
Showing 1,070 changed files with 47,741 additions and 17,335 deletions.
2 changes: 2 additions & 0 deletions .azure-pipelines/azure-pipelines-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,15 @@ jobs:
pool: sonicbld-armhf
timeoutInMinutes: 2880
variables:
PLATFORM_NAME: marvell
PLATFORM_ARCH: armhf

- name: marvell-arm64
${{ if not(parameters.qemuOrCrossBuild) }}:
pool: sonicbld-arm64
timeoutInMinutes: 2880
variables:
PLATFORM_NAME: marvell
PLATFORM_ARCH: arm64

- name: marvell
Expand Down
3 changes: 2 additions & 1 deletion .azure-pipelines/azure-pipelines-image-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ jobs:
sudo modprobe overlay
sudo apt-get install -y acl
sudo bash -c "echo 1 > /proc/sys/vm/compact_memory"
ENABLE_DOCKER_BASE_PULL=y make PLATFORM=$(PLATFORM_AZP) PLATFORM_ARCH=$(PLATFORM_ARCH) $(BUILD_OPTIONS) configure
[ -z "$PLATFORM_NAME" ] && PLATFORM_NAME=$(PLATFORM_AZP)
ENABLE_DOCKER_BASE_PULL=y make PLATFORM=$PLATFORM_NAME PLATFORM_ARCH=$(PLATFORM_ARCH) $(BUILD_OPTIONS) configure
displayName: 'Make configure'
postSteps:
- script: |
Expand Down
1 change: 1 addition & 0 deletions .azure-pipelines/official-build-cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,5 @@ stages:
pool: sonicbld-armhf
timeoutInMinutes: 1200
variables:
PLATFORM_NAME: marvell
PLATFORM_ARCH: armhf
6 changes: 5 additions & 1 deletion .github/workflows/semgrep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,8 @@ jobs:
- uses: actions/checkout@v3
- run: semgrep ci
env:
SEMGREP_RULES: p/default
SEMGREP_RULES: |
p/default
r/python.lang.security.audit.dangerous-system-call-audit.dangerous-system-call-audit
r/c.lang.security.insecure-use-strcat-fn.insecure-use-strcat-fn
r/c.lang.security.insecure-use-string-copy-fn.insecure-use-string-copy-fn
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ fsroot/
fs.*
target/
*.deb
*.udeb
*.changes
*.buildinfo
*.tar
Expand All @@ -28,8 +29,13 @@ sonic-slave*/*.log
# Autogenerated Dockerfiles
sonic-slave*/Dockerfile
sonic-slave*/Dockerfile.user
sonic-slave*/Dockerfile.cleanup
dockers/*/Dockerfile
dockers/*/Dockerfile.cleanup
dockers/*/Dockerfile-dbg.cleanup
platform/*/docker-*/Dockerfile
platform/*/docker-*/Dockerfile.cleanup
platform/*/docker-*/Dockerfile-dbg.cleanup

# Autogenerated manifest files
dockers/*/*manifest*
Expand Down
11 changes: 7 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,12 @@
[submodule "src/sonic-dash-api"]
path = src/sonic-dash-api
url = https://github.com/sonic-net/sonic-dash-api.git
[submodule "platform/marvell-arm64/mrvl-prestera"]
path = platform/marvell-arm64/mrvl-prestera
[submodule "platform/marvell/mrvl-prestera"]
path = platform/marvell/mrvl-prestera
url = https://github.com/Marvell-switching/mrvl-prestera.git
[submodule "platform/marvell-arm64/sonic-platform-marvell"]
path = platform/marvell-arm64/sonic-platform-marvell
[submodule "platform/marvell/sonic-platform-marvell"]
path = platform/marvell/sonic-platform-marvell
url = https://github.com/Marvell-switching/sonic-platform-arm64.git
[submodule "platform/innovium/sonic-platform-marvell"]
path = platform/innovium/sonic-platform-marvell
url = https://github.com/Marvell-switching/sonic-platform-marvell
5 changes: 4 additions & 1 deletion Makefile.work
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@
# * value to anything will enable it
# * Default: unset
# * Value: y
#
# * SONIC_PTF_ENV_PY_VER: Python version for PTF image
# * Default: mixed
# * Values: mixed,py3
###############################################################################

SHELL = /bin/bash
Expand Down Expand Up @@ -592,6 +594,7 @@ SONIC_BUILD_INSTRUCTION := $(MAKE) \
SONIC_OS_VERSION=$(SONIC_OS_VERSION) \
PIP_HTTP_TIMEOUT=$(PIP_HTTP_TIMEOUT) \
LEGACY_SONIC_MGMT_DOCKER=$(LEGACY_SONIC_MGMT_DOCKER) \
SONIC_PTF_ENV_PY_VER=$(SONIC_PTF_ENV_PY_VER) \
$(SONIC_OVERRIDE_BUILD_VARS)

.PHONY: sonic-slave-build sonic-slave-bash init reset
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ make target/sonic-[ASIC_VENDER]-armhf.bin
_example:_

```shell
make configure PLATFORM=marvell-armhf PLATFORM_ARCH=armhf
make configure PLATFORM=marvell PLATFORM_ARCH=armhf
make target/sonic-marvell-armhf.bin
```

Expand All @@ -215,7 +215,7 @@ using cross-compilation, run the following commands:
# Execute make configure once to configure ASIC and ARCH for cross-compilation build

NOJESSIE=1 NOSTRETCH=1 BLDENV=buster CROSS_BLDENV=1 \
make configure PLATFORM=marvell-armhf PLATFORM_ARCH=armhf
make configure PLATFORM=marvell PLATFORM_ARCH=armhf

# Execute Arm32 build using cross-compilation environment

Expand All @@ -234,7 +234,7 @@ make configure PLATFORM=[ASIC_VENDOR] PLATFORM_ARCH=arm64

# example:

make configure PLATFORM=marvell-arm64 PLATFORM_ARCH=arm64
make configure PLATFORM=marvell PLATFORM_ARCH=arm64
```

**NOTE**:
Expand Down
2 changes: 2 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,13 @@ stages:
- name: marvell-arm64
pool: sonicbld-arm64
variables:
PLATFORM_NAME: marvell
PLATFORM_ARCH: arm64
- name: marvell-armhf
pool: sonicbld-armhf
timeoutInMinutes: 1200
variables:
PLATFORM_NAME: marvell
PLATFORM_ARCH: armhf
INCLUDE_RESTAPI: y

Expand Down
11 changes: 6 additions & 5 deletions build_debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -402,10 +402,11 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
auditd \
linux-perf \
resolvconf \
lsof \
sysstat \
xxd \
zstd
lsof \
sysstat \
xxd \
wireless-regdb \
zstd

# Have systemd create the auditd log directory
sudo mkdir -p ${FILESYSTEM_ROOT}/etc/systemd/system/auditd.service.d
Expand Down Expand Up @@ -781,7 +782,7 @@ if [[ $TARGET_BOOTLOADER == uboot ]]; then
## Overwriting the initrd image with uInitrd
sudo LANG=C chroot $FILESYSTEM_ROOT mv /boot/u${INITRD_FILE} /boot/$INITRD_FILE
else
sudo cp -v $PLATFORM_DIR/${sonic_asic_platform}-${CONFIGURED_ARCH}/sonic_fit.its $FILESYSTEM_ROOT/boot/
sudo cp -v $PLATFORM_DIR/$CONFIGURED_PLATFORM/sonic_fit.its $FILESYSTEM_ROOT/boot/
sudo LANG=C chroot $FILESYSTEM_ROOT mkimage -f /boot/sonic_fit.its /boot/sonic_${CONFIGURED_ARCH}.fit
fi
fi
Expand Down
12 changes: 10 additions & 2 deletions build_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ set -x -e
CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64)

if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
. ./onie-image-${CONFIGURED_ARCH}.conf
if [ -r ./platform/${CONFIGURED_PLATFORM}/onie-image-${CONFIGURED_ARCH}.conf ]; then
. ./platform/${CONFIGURED_PLATFORM}/onie-image-${CONFIGURED_ARCH}.conf
else
. ./onie-image-${CONFIGURED_ARCH}.conf
fi
else
. ./onie-image.conf
fi
Expand Down Expand Up @@ -82,10 +86,14 @@ generate_onie_installer_image()
done
done

platform_conf_file="platform/$TARGET_MACHINE/platform_${CONFIGURED_ARCH}.conf"
if [ ! -f $platform_conf_file ]; then
platform_conf_file="platform/$TARGET_MACHINE/platform.conf"
fi
## Generate an ONIE installer image
## Note: Don't leave blank between lines. It is single line command.
./onie-mk-demo.sh $CONFIGURED_ARCH $TARGET_MACHINE $TARGET_PLATFORM-$TARGET_MACHINE-$ONIEIMAGE_VERSION \
installer platform/$TARGET_MACHINE/platform.conf $output_file OS $IMAGE_VERSION $ONIE_IMAGE_PART_SIZE \
installer $platform_conf_file $output_file OS $IMAGE_VERSION $ONIE_IMAGE_PART_SIZE \
$INSTALLER_PAYLOAD $SECURE_UPGRADE_SIGNING_CERT $SECURE_UPGRADE_DEV_SIGNING_KEY
}

Expand Down
18 changes: 16 additions & 2 deletions device/arista/x86_64-arista_7060px5_64s/sensors.conf
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,30 @@ chip "tmp464-i2c-19-48"
label temp1 "Board sensor"
label temp2 "TH4 exhaust temp sensor"
label temp3 "Inlet temp sensor"
ignore temp4
ignore temp5
ignore temp6
ignore temp7
ignore temp8
ignore temp9

chip "dps800-i2c-22-58"
label temp1 "Power supply 1 hotspot sensor"
label temp2 "Power supply 1 inlet temp sensor"
ignore temp3 "Power supply 1 exhaust temp sensor"
ignore temp3

ignore fan2
ignore fan3
ignore fan4

chip "dps800-i2c-23-58"
label temp1 "Power supply 2 hotspot sensor"
label temp2 "Power supply 2 inlet temp sensor"
label temp3 "Power supply 2 exhaust temp sensor"
ignore temp3

ignore fan2
ignore fan3
ignore fan4

chip "lm73-i2c-24-48"
label temp1 "Front panel temp sensor"
Expand Down
Loading

0 comments on commit a924d62

Please sign in to comment.