Skip to content

Commit b1ba2cf

Browse files
mssonicbldmssonicbld
authored
[code sync] Merge code from sonic-net/sonic-buildimage:202411 to 202412 (sonic-net#868)
```<br>* 8f9b9216c - (HEAD -> 202412) Merge branch '202411' of https://github.com/sonic-net/sonic-buildimage into 202412 (2025-03-13) [Sonic Automation] * 3283497 - (head/202411) [Nokia-7215-A1] Update EZB files for SAI 15.1 (sonic-net#22004) (2025-03-13) [mssonicbld] * c807b26 - Build fix for ptf-py3 issue on bullseye (sonic-net#21925) (2025-03-12) [mssonicbld] * be28041 - Use pzstd to compress the Docker in SWI slim images (sonic-net#22005) (2025-03-12) [mssonicbld] * c371cd3 - [202411]Upgrade SONiC package versions (sonic-net#21971) (2025-03-11) [mssonicbld] * ad28af8 - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (sonic-net#21968) (2025-03-11) [mssonicbld] * 6cb2941 - [YANG] Add yang model to `SUBNET_DECAP` table (sonic-net#21118) (sonic-net#21974) (2025-03-11) [Longxiang Lyu] * ef9e911 - [Mellanox] Support new field "supporting_bulk_counter_groups" in DEVICE_METADATA|localhost for Mellanox-SN4280-O28 (sonic-net#21986) (2025-03-11) [mssonicbld] * 39dbcfd - [SNMP] Fix config template issue when setting snmpagentaddress (sonic-net#21987) (2025-03-11) [mssonicbld] * 5e6a202 - Merge pull request sonic-net#21964 from Aravind-Subbaroyan/patch-5 (2025-03-10) [Kumaresh Perumal] |\ | failure_prs.log skip_prs.log e1be5dd - Update cisco-8000.ini (2025-03-07) [Aravind-Subbaroyan] * | 37df4a3 - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (sonic-net#21912) (2025-03-08) [mssonicbld] |/ * a414a7f - [submodule] Update submodule sonic-swss to the latest HEAD automatically (sonic-net#21933) (2025-03-08) [mssonicbld]<br>```
1 parent 2f8a7ba commit b1ba2cf

File tree

19 files changed

+295
-196
lines changed

19 files changed

+295
-196
lines changed

‎build_debian.sh

+11-1
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,12 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
391391
zstd \
392392
nvme-cli
393393

394+
sudo cp files/initramfs-tools/pzstd $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/pzstd
395+
sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/pzstd
396+
397+
sudo cp files/initramfs-tools/file $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/file
398+
sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/file
399+
394400
# Have systemd create the auditd log directory
395401
sudo mkdir -p ${FILESYSTEM_ROOT}/etc/systemd/system/auditd.service.d
396402
sudo tee ${FILESYSTEM_ROOT}/etc/systemd/system/auditd.service.d/log-directory.conf >/dev/null <<EOF
@@ -851,7 +857,11 @@ if [[ $MULTIARCH_QEMU_ENVIRON == y || $CROSS_BUILD_ENVIRON == y ]]; then
851857
fi
852858

853859
## Compress docker files
854-
pushd $FILESYSTEM_ROOT && sudo tar -I pigz -cf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd
860+
if [ "$BUILD_REDUCE_IMAGE_SIZE" = "y" ]; then
861+
pushd $FILESYSTEM_ROOT && sudo tar -I pzstd -cf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd
862+
else
863+
pushd $FILESYSTEM_ROOT && sudo tar -I pigz -cf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd
864+
fi
855865

856866
## Compress together with /boot, /var/lib/docker and $PLATFORM_DIR as an installer payload zip file
857867
pushd $FILESYSTEM_ROOT && sudo tar -I pigz -cf platform.tar.gz -C $PLATFORM_DIR . && sudo zip -n .gz $OLDPWD/$INSTALLER_PAYLOAD -r boot/ platform.tar.gz; popd

‎device/nokia/arm64-nokia_ixs7215_52xb-r0/Nokia-7215-A1/ASK-Board-AC5X-xb.md5

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7333f3669bbbd18bcc3890028d7afb39
1+
281851c080b0939f8d5df37d470488b6

‎device/nokia/arm64-nokia_ixs7215_52xb-r0/Nokia-7215-A1/ASK-Board-AC5X-xb.xml

+12-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2024-09-24-1.09" profile="Askboard" sid="f5800f14-68b6-4eed-bd32-d93056a9feef">
2+
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2024-10-24-1.10" profile="Askboard" dsig="md5" sid="7093bb99-b026-4a69-990a-db984aab32e7">
33
<askboardplt:ASK-Board xmlns:askboardplt="urn:marvell:askboard:yang">
44
<askboardplt:typedefs>
55
<askboardplt:typedef>
@@ -183,6 +183,12 @@ with IEEE 1588v2 PTP Support</askboardplt:description>
183183
with IEEE 1588v2 PTP Support</askboardplt:description>
184184
<askboardplt:value>6</askboardplt:value>
185185
</askboardplt:enum>
186+
<askboardplt:enum>
187+
<askboardplt:name>alaska-88E1781</askboardplt:name>
188+
<askboardplt:description>Specifies PHY identifier 88E1781, Integrated Octal 10/100/1000 Mbps Energy
189+
Efficient Ethernet Transceiver</askboardplt:description>
190+
<askboardplt:value>7</askboardplt:value>
191+
</askboardplt:enum>
186192
</askboardplt:typedef>
187193
<askboardplt:typedef>
188194
<askboardplt:name>physical-port-num-type</askboardplt:name>
@@ -513,15 +519,6 @@ with IEEE 1588v2 PTP Support</askboardplt:description>
513519
<askboardplt:min>0</askboardplt:min>
514520
<askboardplt:max>1</askboardplt:max>
515521
</askboardplt:typedef>
516-
<askboardplt:typedef>
517-
<askboardplt:name>led-stream-force-data-type</askboardplt:name>
518-
<askboardplt:type>string</askboardplt:type>
519-
<askboardplt:description>A hexadecimal string with octets represented as hex digits
520-
separated by colons. The canonical representation uses
521-
lowercase characters.</askboardplt:description>
522-
<askboardplt:min>3</askboardplt:min>
523-
<askboardplt:max>11</askboardplt:max>
524-
</askboardplt:typedef>
525522
<askboardplt:typedef>
526523
<askboardplt:name>bit-type</askboardplt:name>
527524
<askboardplt:type>uint32</askboardplt:type>
@@ -642,6 +639,11 @@ lowercase characters.</askboardplt:description>
642639
<askboardplt:description>FALCON</askboardplt:description>
643640
<askboardplt:value>2</askboardplt:value>
644641
</askboardplt:enum>
642+
<askboardplt:enum>
643+
<askboardplt:name>ASIC_AC5P</askboardplt:name>
644+
<askboardplt:description>AC5P</askboardplt:description>
645+
<askboardplt:value>3</askboardplt:value>
646+
</askboardplt:enum>
645647
</askboardplt:typedef>
646648
<askboardplt:typedef>
647649
<askboardplt:name>mpp-num-type</askboardplt:name>

‎device/nokia/arm64-nokia_ixs7215_52xb-r0/Nokia-7215-A1/ASK-L1-AC5X-xb.md5

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1f97e3150eec3a7ee6f56f51f9229db3
1+
6273881a99a44a9ff33fbadcd535a15a

‎device/nokia/arm64-nokia_ixs7215_52xb-r0/Nokia-7215-A1/ASK-L1-AC5X-xb.xml

+156-141
Large diffs are not rendered by default.

‎device/nokia/arm64-nokia_ixs7215_52xb-r0/Nokia-7215-A1/ASK-PP-AC5X-xb.md5

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
306e882317520250db0161d1cf4c8a3b
1+
f14a2376cd158ea00f075675ed33dd1f

‎device/nokia/arm64-nokia_ixs7215_52xb-r0/Nokia-7215-A1/ASK-PP-AC5X-xb.xml

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2024-09-24-1.09" profile="Askpp" sid="6abefd8a-3345-40a7-b180-4e9375f341df">
2+
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2024-10-24-1.10" profile="Askpp" sid="85d852e5-1e5a-4b9b-a68d-7c1f65f7a541">
33
<askppplt:ASK-PP xmlns:askppplt="urn:marvell:askpp:yang">
44
<askppplt:typedefs>
55
<askppplt:typedef>
@@ -378,7 +378,7 @@
378378
<askppplt:typedef>
379379
<askppplt:name>number-physical-port-type</askppplt:name>
380380
<askppplt:type>enumeration</askppplt:type>
381-
<askppplt:description>AC3X/AC5X 128, falcon 64, 128, 256, 512, 1024</askppplt:description>
381+
<askppplt:description>AC3X/AC5X/AC5P 128, falcon 64, 128, 256, 512, 1024</askppplt:description>
382382
<askppplt:enum>
383383
<askppplt:name>no-ports</askppplt:name>
384384
<askppplt:description>no-ports</askppplt:description>
@@ -538,6 +538,11 @@
538538
<askppplt:description>FALCON</askppplt:description>
539539
<askppplt:value>2</askppplt:value>
540540
</askppplt:enum>
541+
<askppplt:enum>
542+
<askppplt:name>ASIC_AC5P</askppplt:name>
543+
<askppplt:description>AC5P</askppplt:description>
544+
<askppplt:value>3</askppplt:value>
545+
</askppplt:enum>
541546
</askppplt:typedef>
542547
</askppplt:typedefs>
543548
<askppplt:ASIC_Type askppplt:type="asic-type">ASIC_AC5X</askppplt:ASIC_Type>

‎device/nokia/arm64-nokia_ixs7215_52xb-r0/Nokia-7215-A1/SAI-AC5X-xb.md5

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
05614f693742dfda5c7140c186516f0c
1+
3b29ed5e5751923b3f346370c6f0d124

‎device/nokia/arm64-nokia_ixs7215_52xb-r0/Nokia-7215-A1/SAI-AC5X-xb.xml

+22-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2024-09-24-1.09" profile="SAI" sid="b48431f8-351b-4524-babb-1ce99b72cd68">
2+
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2024-10-24-1.10" profile="SAI" dsig="md5" sid="1ed4cd3c-ea04-44f4-8a20-4d1336284709">
33
<SAIplt:SAI xmlns:SAIplt="urn:marvell:SAI:yang">
44
<SAIplt:typedefs>
55
<SAIplt:typedef>
@@ -166,6 +166,26 @@
166166
<SAIplt:description>FALCON</SAIplt:description>
167167
<SAIplt:value>2</SAIplt:value>
168168
</SAIplt:enum>
169+
<SAIplt:enum>
170+
<SAIplt:name>ASIC_AC5P</SAIplt:name>
171+
<SAIplt:description>AC5P</SAIplt:description>
172+
<SAIplt:value>3</SAIplt:value>
173+
</SAIplt:enum>
174+
</SAIplt:typedef>
175+
<SAIplt:typedef>
176+
<SAIplt:name>boolean-type</SAIplt:name>
177+
<SAIplt:type>enumeration</SAIplt:type>
178+
<SAIplt:description>Boolean 32 bits , due to bing endian</SAIplt:description>
179+
<SAIplt:enum>
180+
<SAIplt:name>false</SAIplt:name>
181+
<SAIplt:description>False</SAIplt:description>
182+
<SAIplt:value>0</SAIplt:value>
183+
</SAIplt:enum>
184+
<SAIplt:enum>
185+
<SAIplt:name>true</SAIplt:name>
186+
<SAIplt:description>True</SAIplt:description>
187+
<SAIplt:value>1</SAIplt:value>
188+
</SAIplt:enum>
169189
</SAIplt:typedef>
170190
</SAIplt:typedefs>
171191
<SAIplt:ASIC_Type SAIplt:type="asic-type">ASIC_AC5X</SAIplt:ASIC_Type>
@@ -453,7 +473,7 @@
453473
<SAIplt:log_dest SAIplt:type="logDest-type">SAI_LOG_SYSLOG</SAIplt:log_dest>
454474
</SAIplt:Logging>
455475
<SAIplt:Feature>
456-
<SAIplt:MACsec SAIplt:type="Feature-enable">Disabled</SAIplt:MACsec>
476+
<SAIplt:PHY_Temperature SAIplt:type="Feature-enable">Disabled</SAIplt:PHY_Temperature>
457477
</SAIplt:Feature>
458478
<SAIplt:Features-using-acl>
459479
<SAIplt:feature SAIplt:type="acl-feature-name-type">control-acl</SAIplt:feature>

‎files/build/versions/default/versions-git

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
https://chromium.googlesource.com/chromium/tools/depot_tools.git==50eedb1b5a74772dd77f9fe6b1cd82e3c4c1d9a7
1+
https://chromium.googlesource.com/chromium/tools/depot_tools.git==b123624ac67cea6c6b3e629bae5da9ffd33f58e3
22
https://github.com/aristanetworks/swi-tools.git==989aec67105f565836364b4167c9566c132d0b54
33
https://github.com/CESNET/libyang.git==03e294d83b610f89e8ba7b2156a80dc0ad534443
44
https://github.com/daveolson53/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9502b12a75b6
55
https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
66
https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
7-
https://github.com/flashrom/flashrom.git==0b39a3e00c3f1ebbcc910dfbe08ab3312afa19c1
8-
https://github.com/FreeRADIUS/freeradius-server.git==994b6a1975b0812c6b4bdd890c6cb666c1ccaf46
7+
https://github.com/flashrom/flashrom.git==f5a3c7a35b6489496a9ca985b80adbce8626de8f
8+
https://github.com/FreeRADIUS/freeradius-server.git==5322f9ebf6862595c5de48fc212036690d9d082a
99
https://github.com/FreeRADIUS/pam_radius.git==1b7484783cc0f813ecf11fe8ff21677ec6760791
1010
https://github.com/jeroennijhof/pam_tacplus.git==b839c440e33c36eced9dcbc287fcfe6237c4c4ce
1111
https://github.com/lguohan/gnxi.git==3adf8b97755b49947e465b5a14645f11e79fa0cd
1212
https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
1313
https://github.com/openconfig/oc-pyang.git==4607fd1987d4f586aba03b40f222015cb3ef8161
14-
https://github.com/p4lang/ptf.git==77a5ba448f3db54b45a03a6235b7cec8c8c7d093
14+
https://github.com/p4lang/ptf.git==8e0fdf8b214422ea6db6c6b41042160b9be2d8c3
1515
https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
1616
https://github.com/redis/librdb.git==26e8897e0dbc88750a736baccbd5637ee1dbced1
1717
https://github.com/sflow/host-sflow==9cea724e67186c8bc3e4e6257363e1c6610b7229
18-
https://github.com/sflow/sflowtool==a30bbf2956fa3d17332b6e64750f176df42a50a0
19-
https://github.com/sonic-net/DASH.git==5cc71d180ea3a1315644fa6f4ae4232bef8a493b
20-
https://salsa.debian.org/kernel-team/initramfs-tools.git==af25dc3ff4c99176b26e125fcf1abf4c1e85c8fc
18+
https://github.com/sflow/sflowtool==c41959af1271f493ef33229d4197040d6e38dbbb
19+
https://github.com/sonic-net/DASH.git==fc7e0756554131ef0d98228c2ba62bf8b476e1af
20+
https://salsa.debian.org/kernel-team/initramfs-tools.git==81f2063c45af88ce724403940de056bf84c382ed
2121
https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
2222
https://salsa.debian.org/tai271828/rasdaemon.git==51a7f485f8b2e2ae43e613f19c5a387595174132

‎files/build/versions/default/versions-mirror

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
archive.ubuntu.com_ubuntu_dists_focal==2020-04-23T17:33:17Z
2-
archive.ubuntu.com_ubuntu_dists_focal-backports==2025-03-02T02:59:47Z
3-
archive.ubuntu.com_ubuntu_dists_focal-updates==2025-03-02T02:55:36Z
2+
archive.ubuntu.com_ubuntu_dists_focal-backports==2025-03-08T21:50:30Z
3+
archive.ubuntu.com_ubuntu_dists_focal-updates==2025-03-09T01:25:39Z
44
deb.nodesource.com_node%5f14.x_dists_bookworm==2023-02-17T00:35:29Z
55
deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z
66
deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z
7-
debian==20250301T000938Z
8-
debian-security==20250301T000908Z
9-
download.docker.com_linux_debian_dists_bookworm==2025-02-27T13:23:19Z
7+
debian==20250308T000907Z
8+
debian-security==20250308T000950Z
9+
download.docker.com_linux_debian_dists_bookworm==2025-03-03T10:37:36Z
1010
download.docker.com_linux_debian_dists_bullseye==2025-02-26T13:28:50Z
1111
download.docker.com_linux_debian_dists_buster==2024-06-17T16:53:50Z
12-
packages.trafficmanager.net_snapshot_debian-security_20250301T000908Z_dists_bookworm-security==2025-02-28T23:25:48Z
13-
packages.trafficmanager.net_snapshot_debian-security_20250301T000908Z_dists_bullseye-security==2025-02-28T23:25:48Z
14-
packages.trafficmanager.net_snapshot_debian-security_20250301T000908Z_dists_buster_updates==2024-12-29T19:56:34Z
15-
packages.trafficmanager.net_snapshot_debian_20250301T000938Z_dists_bookworm==2025-01-11T10:25:55Z
16-
packages.trafficmanager.net_snapshot_debian_20250301T000938Z_dists_bookworm-backports==2025-02-28T20:24:23Z
17-
packages.trafficmanager.net_snapshot_debian_20250301T000938Z_dists_bookworm-updates==2025-02-28T20:24:23Z
18-
packages.trafficmanager.net_snapshot_debian_20250301T000938Z_dists_bullseye==2024-08-31T11:02:15Z
19-
packages.trafficmanager.net_snapshot_debian_20250301T000938Z_dists_bullseye-backports==2025-02-28T20:24:23Z
20-
packages.trafficmanager.net_snapshot_debian_20250301T000938Z_dists_bullseye-updates==2025-02-28T20:24:24Z
21-
packages.trafficmanager.net_snapshot_debian_20250301T000938Z_dists_buster==2023-06-10T08:53:33Z
22-
packages.trafficmanager.net_snapshot_debian_20250301T000938Z_dists_buster-backports==2024-03-09T20:54:54Z
23-
packages.trafficmanager.net_snapshot_debian_20250301T000938Z_dists_buster-updates==2023-06-10T08:55:10Z
24-
security.ubuntu.com_ubuntu_dists_focal-security==2025-03-02T02:51:50Z
12+
packages.trafficmanager.net_snapshot_debian-security_20250308T000950Z_dists_bookworm-security==2025-03-07T00:14:51Z
13+
packages.trafficmanager.net_snapshot_debian-security_20250308T000950Z_dists_bullseye-security==2025-03-07T00:14:51Z
14+
packages.trafficmanager.net_snapshot_debian-security_20250308T000950Z_dists_buster_updates==2024-12-29T19:56:34Z
15+
packages.trafficmanager.net_snapshot_debian_20250308T000907Z_dists_bookworm==2025-01-11T10:25:55Z
16+
packages.trafficmanager.net_snapshot_debian_20250308T000907Z_dists_bookworm-backports==2025-03-07T20:25:41Z
17+
packages.trafficmanager.net_snapshot_debian_20250308T000907Z_dists_bookworm-updates==2025-03-07T20:25:41Z
18+
packages.trafficmanager.net_snapshot_debian_20250308T000907Z_dists_bullseye==2024-08-31T11:02:15Z
19+
packages.trafficmanager.net_snapshot_debian_20250308T000907Z_dists_bullseye-backports==2025-03-07T20:25:41Z
20+
packages.trafficmanager.net_snapshot_debian_20250308T000907Z_dists_bullseye-updates==2025-03-07T20:25:41Z
21+
packages.trafficmanager.net_snapshot_debian_20250308T000907Z_dists_buster==2023-06-10T08:53:33Z
22+
packages.trafficmanager.net_snapshot_debian_20250308T000907Z_dists_buster-backports==2024-03-09T20:54:54Z
23+
packages.trafficmanager.net_snapshot_debian_20250308T000907Z_dists_buster-updates==2023-06-10T08:55:10Z
24+
security.ubuntu.com_ubuntu_dists_focal-security==2025-03-08T21:44:06Z

‎files/build/versions/default/versions-web

+7-6
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,11 @@ https://launchpad.net/debian/+archive/primary/+sourcefiles/bash/5.1-2/bash_5.1-2
9797
https://launchpad.net/debian/+archive/primary/+sourcefiles/bash/5.1-2/bash_5.1.orig.tar.xz==6ddb13b6111f601db08fc7c72afa0263
9898
https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py==b16e05ede6aed78f7abadae1185f487d
9999
https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/4.2.3/openapi-generator-cli-4.2.3.jar==cda48eb414c8b4585e280c3fb2656e24
100-
https://security.debian.org/pool/updates/main/o/openssh/openssh_9.2p1-2+deb12u3.debian.tar.xz==d964cfd6d26adb608cd507af3007831a
101-
https://security.debian.org/pool/updates/main/o/openssh/openssh_9.2p1-2+deb12u3.dsc==d72fe6644fab4225d7ca09c4e43446a3
100+
https://security.debian.org/pool/updates/main/o/openssh/openssh_9.2p1-2+deb12u5.debian.tar.xz==5b7453ca259106ec2cfe413482f51ed2
101+
https://security.debian.org/pool/updates/main/o/openssh/openssh_9.2p1-2+deb12u5.dsc==4598828e248aa58052ed6ae9509ca9f2
102102
https://security.debian.org/pool/updates/main/o/openssh/openssh_9.2p1.orig.tar.gz==f78b2acac4bb299629a8c58ddc3fac63
103-
https://sh.rustup.rs==803438f3247334c786f7ad7efebf662e
103+
https://security.debian.org/pool/updates/main/o/openssh/openssh_9.2p1.orig.tar.gz.asc==4b8baeab4dd1ff732a02e94c227cf788
104+
https://sh.rustup.rs==635982ad66d588d7c934a07102b5bfb0
104105
https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_6.1.94-1.debian.tar.xz==d56c205bc0c7cf511619540631c58ab7
105106
https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_6.1.94-1.dsc==0fbe62084fd643bd0b67446bc5f14fcb
106107
https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_6.1.94.orig.tar.xz==eb98947ccae11f6bcd33e835b05a932f
@@ -272,9 +273,9 @@ https://sonicstorage.blob.core.windows.net/public/onie/onie-recovery-x86_64-kvm_
272273
https://sonicstorage.blob.core.windows.net/public/onie/onie-recovery-x86_64-kvm_x86_64_4_asic-r0.iso==1d8b8d3fa37f842d0184b5205be22be9
273274
https://sonicstorage.blob.core.windows.net/public/onie/onie-recovery-x86_64-kvm_x86_64_6_asic-r0.iso==58494305d4ac201daedf9364a1018a1b
274275
https://sonicstorage.blob.core.windows.net/public/sai/bcmpai/REL_3.11/3.11/libsaibroncos_3.11_amd64.deb==6e21a16126e833516a9659d4c35c284e
275-
https://static.rust-lang.org/rustup/dist/aarch64-unknown-linux-gnu/rustup-init==21b27f4a24c066ff3c4158998d4f794b
276-
https://static.rust-lang.org/rustup/dist/armv7-unknown-linux-gnueabihf/rustup-init==13b8d6e5edef35414c2e28db31576656
277-
https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init==eedd8a5a6ebbc921301660acb99646a5
276+
https://static.rust-lang.org/rustup/dist/aarch64-unknown-linux-gnu/rustup-init==a5e99c90d522b8072a862beb06a74f86
277+
https://static.rust-lang.org/rustup/dist/armv7-unknown-linux-gnueabihf/rustup-init==6b36676bb95b65bc38085395d2465f7c
278+
https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init==0f2f9af4b867f369ba00b1e3a5081b7c
278279
https://storage.googleapis.com/golang/go1.15.15.linux-amd64.tar.gz==b75227438c6129b5013da053b3aa3f38
279280
https://storage.googleapis.com/golang/go1.15.15.linux-arm64.tar.gz==6d721146a9195592d92a80cf27d475f9
280281
https://storage.googleapis.com/golang/go1.15.15.linux-armv6l.tar.gz==23d140bbeedc978b954de1a199a22bdb

‎files/dsc/install_debian.j2

+4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ image_dir=image-$image_version
1515

1616
INSTALLER_PAYLOAD=fs.zip
1717
DOCKERFS_DIR=docker
18+
{% if BUILD_REDUCE_IMAGE_SIZE == "y" -%}
19+
FILESYSTEM_DOCKERFS=dockerfs.tar.zstd
20+
{%- else -%}
1821
FILESYSTEM_DOCKERFS=dockerfs.tar.gz
22+
{%- endif %}
1923
BL_CONF=boot.conf
2024

2125
DATA_PARTUUID=6ED62003-DD8D-44B8-9538-0A2B7C7E628F

‎files/initramfs-tools/file

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/sh
2+
set -e
3+
PREREQ=""
4+
prereqs() {
5+
echo "$PREREQ"
6+
}
7+
case "$1" in
8+
prereqs)
9+
prereqs
10+
exit 0
11+
;;
12+
esac
13+
. /usr/share/initramfs-tools/hook-functions
14+
# Include file binary
15+
copy_exec /usr/bin/file /usr/bin
16+
# Include magic database
17+
copy_exec /usr/lib/file/magic.mgc /etc
18+
exit 0

‎files/initramfs-tools/pzstd

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/sh
2+
set -e
3+
PREREQ=""
4+
prereqs() {
5+
echo "$PREREQ"
6+
}
7+
case "$1" in
8+
prereqs)
9+
prereqs
10+
exit 0
11+
;;
12+
esac
13+
. /usr/share/initramfs-tools/hook-functions
14+
# Include pzstd binary
15+
copy_exec /usr/bin/pzstd /usr/bin
16+
exit 0

‎files/initramfs-tools/union-mount.j2

+9-3
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,15 @@ extract_dockerfs()
130130
{
131131
echo "Extracting {{ FILESYSTEM_DOCKERFS }}"
132132
if [ -f "${rootmnt}/host/$image_dir/{{ FILESYSTEM_DOCKERFS }}" ] && [ "$secureboot" = false ]; then
133-
# Extract dockerfs.tar.gz into /var/lib/docker unless the system booted with secureboot
134-
# In secureboot dockerfs.tar.gz cannot be trusted as it does not have a signature
135-
tar xz --numeric-owner -f ${rootmnt}/host/$image_dir/{{ FILESYSTEM_DOCKERFS }} -C ${rootmnt}/var/lib/docker
133+
# Check if the file is zstd compressed
134+
file_type=$(file -b --mime-type "${rootmnt}/host/$image_dir/{{ FILESYSTEM_DOCKERFS }}")
135+
if [ "$file_type" = "application/zstd" ]; then
136+
echo "Detected zstd compression, extracting with pzstd..."
137+
pzstd -d -q ${rootmnt}/host/$image_dir/{{ FILESYSTEM_DOCKERFS }} -c | tar x --numeric-owner -C ${rootmnt}/var/lib/docker
138+
else
139+
echo "Using default extraction method (gzip assumed)..."
140+
tar xz --numeric-owner -f "${rootmnt}/host/$image_dir/{{ FILESYSTEM_DOCKERFS }}" -C "${rootmnt}/var/lib/docker"
141+
fi
136142
elif [ "$bootloader" = "aboot" ] && unzip -l "$swi_path" | grep -q {{ FILESYSTEM_DOCKERFS }}; then
137143
# Aboot swi images also support extracting dockerfs.tar.gz directly from them
138144
unzip -qp "$swi_path" {{ FILESYSTEM_DOCKERFS }} | tar xz --numeric-owner -C ${rootmnt}/var/lib/docker

‎platform/marvell/sonic-platform-nokia/7215-a1/service/nokia-7215init.service

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ After=sysinit.target
44
Before=pmon.service
55

66
[Service]
7+
Type=oneshot
78
ExecStart=/usr/local/bin/nokia-7215-init.sh
89
StandardOutput=tty
910

0 commit comments

Comments
 (0)