Skip to content

Commit a1e7352

Browse files
yxiecayxieca
committed
Merged PR 6148955: Manual merge internal branch with github master branch
Related work items: #52, #71, #73, #75, #77, sonic-net#1306, sonic-net#1588, sonic-net#1991, sonic-net#2031, sonic-net#2040, sonic-net#2053, sonic-net#2066, sonic-net#2069, sonic-net#2087, sonic-net#2107, sonic-net#2110, sonic-net#2112, sonic-net#2113, sonic-net#2117, sonic-net#2124, sonic-net#2125, sonic-net#2126, sonic-net#2128, sonic-net#2130, sonic-net#2131, sonic-net#2132, sonic-net#2133, sonic-net#2134, sonic-net#2135, sonic-net#2136, sonic-net#2137, sonic-net#2138, sonic-net#2139, sonic-net#2140, sonic-net#2143, sonic-net#2158, sonic-net#2161, sonic-net#2233, sonic-net#2243, sonic-net#2250, sonic-net#2254, sonic-net#2260, sonic-net#2261, sonic-net#2267, sonic-net#2278, sonic-net#2282, sonic-net#2285, sonic-net#2288, sonic-net#2289, sonic-net#2292, sonic-net#2294, sonic-net#8887, sonic-net#9279, sonic-net#9390, sonic-net#9511, sonic-net#9700, sonic-net#10025, sonic-net#10322, sonic-net#10479, sonic-net#10484, sonic-net#10493, sonic-net#10500, sonic-net#10580, sonic-net#10595, sonic-net#10628, sonic-net#10634, sonic-net#10635, sonic-net#10644, sonic-net#10670, sonic-net#10691, sonic-net#10716, sonic-net#10731, sonic-net#10750, sonic-net#10751, sonic-net#10752, sonic-net#10761, sonic-net#10769, sonic-net#10775, sonic-net#10776, sonic-net#10779, sonic-net#10786, sonic-net#10792, sonic-net#10793, sonic-net#10800, sonic-net#10806, sonic-net#10826, sonic-net#10839, sonic-net#10840, sonic-net#10842, sonic-net#10844, sonic-net#10847, sonic-net#10849, sonic-net#10852, sonic-net#10865, sonic-net#10872, sonic-net#10877, sonic-net#10886, sonic-net#10889, sonic-net#10903, sonic-net#10904, sonic-net#10905, sonic-net#10913, sonic-net#10914, sonic-net#10916, sonic-net#10919, sonic-net#10925, sonic-net#10926, sonic-net#10929, sonic-net#10933, sonic-net#10934, sonic-net#10937, sonic-net#10941, sonic-net#10947, sonic-net#10952, sonic-net#10953, sonic-net#10957, sonic-net#10959, sonic-net#10971, sonic-net#10972, sonic-net#10980
2 parents de2887b + 8b69540 commit a1e7352

File tree

327 files changed

+70533
-1743
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

327 files changed

+70533
-1743
lines changed

‎.azure-pipelines/azure-pipelines-image-template.yml

+9-2
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,23 @@ jobs:
4848
ENABLE_DOCKER_BASE_PULL=y make PLATFORM=$(PLATFORM_AZP) PLATFORM_ARCH=$(PLATFORM_ARCH) $(BUILD_OPTIONS) configure
4949
displayName: 'Make configure'
5050
postSteps:
51-
- script: cp target -r $(Build.ArtifactStagingDirectory)/
51+
- script: |
52+
mkdir -p $(Build.ArtifactStagingDirectory)/target
53+
mv target/* $(Build.ArtifactStagingDirectory)/target/
5254
displayName: Copy Artifacts
5355
condition: always()
5456
- publish: $(Build.ArtifactStagingDirectory)
5557
artifact: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)'
5658
displayName: "Archive sonic image"
5759
- publish: $(Build.ArtifactStagingDirectory)
58-
condition: failed()
60+
condition: or(failed(), canceled())
5961
artifact: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)$(System.JobAttempt)'
6062
displayName: "Archive failed sonic image"
63+
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
64+
- template: trigger-publish-artifacts-build.yml
65+
parameters:
66+
artifactName: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)'
67+
publishPrefix: '$(Build.DefinitionName)/$(Build.SourceBranchName)/$(GROUP_NAME)'
6168
- ${{ parameters.postSteps }}
6269
- template: cleanup.yml
6370
jobGroups: ${{ parameters.jobGroups }}

‎.azure-pipelines/run-test-template.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ parameters:
77
type: string
88
- name: ptf_name
99
type: string
10+
- name: vmtype
11+
type: string
12+
default: 'ceos'
1013
- name: section
1114
type: string
1215
default: ''
@@ -41,13 +44,15 @@ steps:
4144
git reset --hard origin/master
4245
sed -i s/use_own_value/${username}/ ansible/veos_vtb
4346
echo aaa > ansible/password.txt
44-
docker exec sonic-mgmt bash -c "pushd /data/sonic-mgmt/ansible;./testbed-cli.sh -d /data/sonic-vm -m $(inventory) -t $(testbed_file) -k ceos refresh-dut ${{ parameters.tbname }} password.txt" && sleep 180
47+
docker exec sonic-mgmt bash -c "pushd /data/sonic-mgmt/ansible;./testbed-cli.sh -d /data/sonic-vm -m $(inventory) -t $(testbed_file) -k ${{ parameters.vmtype }} refresh-dut ${{ parameters.tbname }} password.txt" && sleep 180
4548
displayName: "Setup testbed"
4649

4750
- script: |
4851
rm -rf $(Build.ArtifactStagingDirectory)/*
4952
docker exec sonic-mgmt bash -c "/data/sonic-mgmt/tests/kvmtest.sh -en -T ${{ parameters.tbtype }} ${{ parameters.tbname }} ${{ parameters.dut }} ${{ parameters.section }}"
5053
displayName: "Run tests"
54+
${{ if eq(parameters.tbtype, 't0-sonic') }}:
55+
continueOnError: true
5156

5257
- script: |
5358
# save dut state if test fails

‎.azure-pipelines/template-commonlib.yml

+52-39
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,53 @@
1-
jobs:
2-
- job: Build
3-
timeoutInMinutes: 120
4-
pool: sonicbld
5-
variables:
6-
- template: template-variables.yml
7-
steps:
8-
- checkout: self
9-
clean: true
10-
submodules: recursive
11-
- script: |
12-
set -ex
13-
branch=$(Build.SourceBranchName)
14-
# DIST_MASTER is set in variable.
15-
BRANCH=DIST_${branch^^}
16-
bldenvs=${!BRANCH}
17-
[ "$bldenvs" == "" ] && bldenvs="$(COMMON_LIB_BUILD_ENVS)"
18-
for bldenv in $bldenvs
19-
do
20-
BLDENV=$bldenv make -f Makefile.work configure PLATFORM=vs ENABLE_DOCKER_BASE_PULL=y
21-
done
22-
set +x
23-
echo "##vso[task.setvariable variable=bldenvs;]$bldenvs"
24-
displayName: Make configure
25-
- script: |
26-
set -ex
27-
for bldenv in $(bldenvs)
28-
do
29-
LIBNL3_VERSION_BASE=$(grep "LIBNL3_VERSION_BASE =" rules/libnl3.mk | awk '{print$3}')
30-
LIBNL3_VERSION=$(grep "LIBNL3_VERSION =" rules/libnl3.mk | awk '{print$3}' | sed -e "s/(//" -e "s/)//" -e "s/\\$//" -e "s/LIBNL3_VERSION_BASE/$LIBNL3_VERSION_BASE/")
31-
SONIC_BUILD_JOBS=$(nproc) BLDENV=$bldenv make -f Makefile.work target/debs/$bldenv/libnl-3-200_${LIBNL3_VERSION}_amd64.deb ENABLE_DOCKER_BASE_PULL=y
1+
parameters:
2+
- name: archs
3+
type: object
4+
default:
5+
- amd64
6+
- armhf
7+
- arm64
328

33-
LIBYANG_VERSION_BASE=$(grep "LIBYANG_VERSION_BASE =" rules/libyang.mk | awk '{print$3}')
34-
LIBYANG_VERSION=$(grep "LIBYANG_VERSION =" rules/libyang.mk | awk '{print$3}' | sed -e "s/\\$//" -e "s/(//" -e "s/)//" -e "s/LIBYANG_VERSION_BASE/$LIBYANG_VERSION_BASE/")
35-
SONIC_BUILD_JOBS=$(nproc) BLDENV=$bldenv make -f Makefile.work target/debs/$bldenv/libyang_${LIBYANG_VERSION}_amd64.deb
36-
done
37-
mv target $(Build.ArtifactStagingDirectory)
38-
displayName: Make common lib packages
39-
- publish: $(Build.ArtifactStagingDirectory)
40-
artifact: common-lib
9+
jobs:
10+
- ${{ each arch in parameters.archs }}:
11+
- job: Build_${{ arch }}
12+
timeoutInMinutes: 120
13+
${{ if eq(arch,'amd64') }}:
14+
pool: sonicbld
15+
${{ else }}:
16+
pool: sonicbld-${{ arch }}
17+
variables:
18+
- template: template-variables.yml
19+
steps:
20+
- checkout: self
21+
clean: true
22+
submodules: recursive
23+
- script: |
24+
set -ex
25+
branch=$(Build.SourceBranchName)
26+
# replace all: '-' -> '_'
27+
branch=${branch//-/_}
28+
# replace all: 'a' -> 'A', DIST_MASTER is set in variable.
29+
BRANCH=DIST_${branch^^}
30+
# variable name is dynamic
31+
bldenvs=${!BRANCH}
32+
[ "$bldenvs" == "" ] && bldenvs="$(COMMON_LIB_BUILD_ENVS)"
33+
for bldenv in $bldenvs
34+
do
35+
BLDENV=$bldenv make -f Makefile.work configure PLATFORM_ARCH=${{ arch }} PLATFORM=vs ENABLE_DOCKER_BASE_PULL=y
36+
done
37+
set +x
38+
echo "##vso[task.setvariable variable=bldenvs;]$bldenvs"
39+
displayName: Make configure
40+
- script: |
41+
set -ex
42+
for bldenv in $(bldenvs)
43+
do
44+
SONIC_BUILD_JOBS=$(nproc) BLDENV=$bldenv make -f Makefile.work lib-packages ENABLE_DOCKER_BASE_PULL=y
45+
done
46+
mv target $(Build.ArtifactStagingDirectory)
47+
displayName: Make common lib packages
48+
- ${{ if eq(arch,'amd64') }}:
49+
- publish: $(Build.ArtifactStagingDirectory)
50+
artifact: common-lib
51+
- ${{ else }}:
52+
- publish: $(Build.ArtifactStagingDirectory)
53+
artifact: common-lib.${{ arch }}

‎.azure-pipelines/trigger-publish-artifacts-build.yml

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# The steps to trigger the pipeline to publish the artifacts
2+
3+
parameters:
4+
- name: artifactName
5+
type: string
6+
default: ""
7+
- name: publishPrefix
8+
type: string
9+
default: "$(Build.DefinitionName)/$(Build.SourceBranchName)"
10+
11+
steps:
12+
- script: |
13+
. functions.sh
14+
sonic_version=$(sonic_get_version)
15+
latest_tag=$(git describe --tags --abbrev=0)
16+
docker_tags="$sonic_version $(Build.SourceBranchName)"
17+
if [ "$(Build.SourceBranchName)" == "master" ]; then
18+
docker_tags="$docker_tags latest"
19+
fi
20+
echo "##vso[task.setvariable variable=sonic_version]$sonic_version"
21+
echo "##vso[task.setvariable variable=latest_tag]$latest_tag"
22+
echo "##vso[task.setvariable variable=docker_tags]$docker_tags"
23+
displayName: 'Set trigger build variables'
24+
- task: TriggerBuild@4
25+
inputs:
26+
definitionIsInCurrentTeamProject: false
27+
teamProject: internal
28+
tfsServer: $(System.CollectionUri)
29+
buildDefinition: 'publish-artifacts'
30+
queueBuildForUserThatTriggeredBuild: true
31+
ignoreSslCertificateErrors: false
32+
useSameSourceVersion: false
33+
useCustomSourceVersion: false
34+
useSameBranch: false
35+
waitForQueuedBuildsToFinish: false
36+
storeInEnvironmentVariable: true
37+
authenticationMethod: 'Personal Access Token'
38+
password: '$(system.accesstoken)'
39+
enableBuildInQueueCondition: false
40+
dependentOnSuccessfulBuildCondition: false
41+
dependentOnFailedBuildCondition: false
42+
checkbuildsoncurrentbranch: false
43+
failTaskIfConditionsAreNotFulfilled: false
44+
buildParameters: ''
45+
templateParameters: |
46+
pipelineContext: {"buildId":"$(Build.BuildId)",
47+
"pipelineId":"$(System.DefinitionId)",
48+
"project": "$(System.TeamProject)",
49+
"branchName":"$(Build.SourceBranchName)"},
50+
artifactContext: {"artifactName":"${{ parameters.artifactName }}",
51+
"artifactPatterns":"**/*.bin\n
52+
**/*.swi\n
53+
**/*.raw\n
54+
**/*.img.gz\n
55+
**/*-rpc.gz\n
56+
**/python-saithrift*.deb"},
57+
publishContext: {"publishPrefix":"${{ parameters.publishPrefix }}",
58+
"keepArtifactName":false,
59+
"dockerImagePatterns":"target/*-rpc.gz",
60+
"dockerTags":"$(docker_tags)",
61+
"version":"$(sonic_version)",
62+
"latestTag":"$(latest_tag)"}

‎.github/CODEOWNERS

+73-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
/Makefile.work @qiluo-msft @xumia @lguohan
2020
/slave.mk @qiluo-msft @xumia @lguohan
2121
/scripts @qiluo-msft @xumia @lguohan
22+
/src/sonic-build-hooks/ @Azure/sonic-build
23+
/src/debootstrap/ @Azure/sonic-build
24+
/src/sonic-fips/ @Azure/sonic-build
2225

2326
# installer
2427
/installer/ @qiluo-msft
@@ -31,8 +34,77 @@
3134
/dockers/docker-config-engine*/ @qiluo-msft
3235
/dockers/docker-snmp/ @qiluo-msft
3336

34-
# src
37+
# kernel
38+
/src/sonic-linux-kernel/ @Azure/sonic-kernel
39+
40+
# devices
41+
/device/ @Azure/sonic-platform
42+
/src/sonic-platform-common/ @Azure/sonic-platform
43+
/src/sonic-platform-daemons/ @Azure/sonic-platform
44+
/src/sonic-platform-pde/ @Azure/sonic-platform
45+
/src/lm-sensors/ @Azure/sonic-platform
46+
/src/flashrom/ @Azure/sonic-platform
47+
48+
# common library
3549
/src/initramfs-tools/ @qiluo-msft
50+
/src/redis-dump-load/ @Azure/sonic-management
51+
/src/sonic-py-common/ @Azure/sonic-management
52+
/src/sonic-py-swsssdk/ @Azure/sonic-management
53+
/src/sonic-swss-common/ @Azure/sonic-management
54+
/src/bash/ @Azure/sonic-management
55+
/src/tacacs/ @Azure/sonic-management
56+
/src/radius/ @Azure/sonic-management
57+
/src/swig/ @Azure/sonic-management
58+
/src/socat/ @Azure/sonic-management
59+
60+
# redis
61+
/src/redis/ @Azure/sonic-management
62+
/src/hiredis/ @Azure/sonic-management
3663

3764
# yang
3865
/src/sonic-yang-models/ @praveen-li @dgsudharsan @rathnasabapathyv @venkatmahalingam @qiluo-msft
66+
/src/sonic-yang-mgmt/ @Azure/sonic-management
67+
/src/libyang/ @Azure/sonic-management
68+
/src/libyang1/ @Azure/sonic-management
69+
/src/libyang2/ @Azure/sonic-management
70+
71+
# bgpcfgd
72+
/src/sonic-bgpcfgd/ @StormLiangMS
73+
74+
# sonic-config-engine
75+
/src/sonic-config-engine/ @Azure/sonic-management
76+
77+
# sonic-utilities
78+
/src/sonic-utilities/ @Azure/sonic-management
79+
80+
# sonic-telemetry
81+
/src/sonic-telemetry/ @Azure/sonic-management
82+
83+
# snmp
84+
/src/sonic-snmpagent/ @Azure/sonic-management
85+
/src/snmpd/ @Azure/sonic-management
86+
87+
# dhcp relay
88+
/src/dhcp6relay/ @Azure/sonic-fundamentals
89+
/src/dhcpmon/ @Azure/sonic-fundamentals
90+
/src/isc-dhcp/ @Azure/sonic-fundamentals
91+
92+
# sflow
93+
/src/sflow/ @Azure/sonic-dataplane
94+
95+
# sonic restapi
96+
/src/sonic-restapi/ @Azure/sonic-dataplane
97+
98+
# sonic swss
99+
/src/sonic-swss/ @Azure/sonic-dataplane
100+
101+
# linux networking, e.g., libnl3, iproute2, ifupdown2, ethtool
102+
/src/libnl3/ @Azure/sonic-dataplane
103+
/src/iproute2/ @Azure/sonic-dataplane
104+
/src/ifupdown2/ @Azure/sonic-dataplane
105+
/src/ethtool/ @Azure/sonic-dataplane
106+
107+
# ptf
108+
/src/ptf/ @Azure/sonic-fundamentals
109+
/src/ptf-py3/ @Azure/sonic-fundamentals
110+
/src/scapy/ @Azure/sonic-fundamentals

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ target/
2222
*.img
2323
*.pyc
2424

25+
# Slave docker log files
26+
sonic-slave*/*.log
27+
2528
# Autogenerated Dockerfiles
2629
sonic-slave*/Dockerfile
2730
sonic-slave*/Dockerfile.user

‎.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
[submodule "src/sonic-frr/frr"]
4747
path = src/sonic-frr/frr
4848
url = https://github.com/Azure/sonic-frr.git
49-
branch = frr/7.5
49+
branch = frr/8.2
5050
[submodule "platform/p4/p4-hlir/p4-hlir-v1.1"]
5151
path = platform/p4/p4-hlir/p4-hlir-v1.1
5252
url = https://github.com/p4lang/p4-hlir.git

‎Makefile.work

+9-2
Original file line numberDiff line numberDiff line change
@@ -294,12 +294,18 @@ endif
294294

295295
endif
296296

297+
SPLIT_LOG = | tee
298+
299+
DOCKER_BASE_LOG = $(SLAVE_DIR)/$(SLAVE_BASE_IMAGE)_$(SLAVE_BASE_TAG).log
300+
DOCKER_LOG = $(SLAVE_DIR)/$(SLAVE_IMAGE)_$(SLAVE_TAG).log
301+
302+
297303
DOCKER_BASE_BUILD = docker build --no-cache \
298304
-t $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) \
299305
--build-arg http_proxy=$(http_proxy) \
300306
--build-arg https_proxy=$(https_proxy) \
301307
--build-arg no_proxy=$(no_proxy) \
302-
$(SLAVE_DIR)
308+
$(SLAVE_DIR) $(SPLIT_LOG) $(DOCKER_BASE_LOG)
303309

304310
DOCKER_BASE_PULL = docker pull \
305311
$(REGISTRY_SERVER):$(REGISTRY_PORT)/$(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG)
@@ -312,7 +318,7 @@ DOCKER_BUILD = docker build --no-cache \
312318
--build-arg slave_base_tag_ref=$(SLAVE_BASE_TAG) \
313319
-t $(SLAVE_IMAGE):$(SLAVE_TAG) \
314320
-f $(SLAVE_DIR)/Dockerfile.user \
315-
$(SLAVE_DIR)
321+
$(SLAVE_DIR) $(SPLIT_LOG) $(DOCKER_LOG)
316322

317323
SONIC_BUILD_INSTRUCTION := make \
318324
-f slave.mk \
@@ -354,6 +360,7 @@ SONIC_BUILD_INSTRUCTION := make \
354360
SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD=$(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD) \
355361
SONIC_INCLUDE_SYSTEM_TELEMETRY=$(INCLUDE_SYSTEM_TELEMETRY) \
356362
INCLUDE_DHCP_RELAY=$(INCLUDE_DHCP_RELAY) \
363+
INCLUDE_MACSEC=$(INCLUDE_MACSEC) \
357364
SONIC_INCLUDE_RESTAPI=$(INCLUDE_RESTAPI) \
358365
SONIC_INCLUDE_ACMS=$(INCLUDE_ACMS) \
359366
SONIC_INCLUDE_VNET_MONITOR=$(INCLUDE_VNET_MONITOR) \

‎azure-pipelines.yml

+14
Original file line numberDiff line numberDiff line change
@@ -193,3 +193,17 @@ stages:
193193
tbname: vms-kvm-t1-lag
194194
ptf_name: ptf_vms6-2
195195
tbtype: t1-lag
196+
197+
- job:
198+
pool: sonictest-sonic-t0
199+
displayName: "kvmtest-t0-sonic"
200+
timeoutInMinutes: 360
201+
202+
steps:
203+
- template: .azure-pipelines/run-test-template.yml
204+
parameters:
205+
dut: vlab-02
206+
tbname: vms-kvm-t0-64-32
207+
ptf_name: ptf_vms6-1
208+
tbtype: t0-sonic
209+
vmtype: vsonic

‎build_debian.sh

+6-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64)
3333
## docker engine version (with platform)
3434
DOCKER_VERSION=5:20.10.14~3-0~debian-$IMAGE_DISTRO
3535
CONTAINERD_IO_VERSION=1.5.11-1
36-
LINUX_KERNEL_VERSION=5.10.0-8-2
36+
LINUX_KERNEL_VERSION=5.10.0-12-2
3737

3838
## Working directory to prepare the file system
3939
FILESYSTEM_ROOT=./fsroot
@@ -189,6 +189,10 @@ sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/arista-
189189
sudo cp files/initramfs-tools/resize-rootfs $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/resize-rootfs
190190
sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/resize-rootfs
191191

192+
# Hook into initramfs: upgrade SSD from initramfs
193+
sudo cp files/initramfs-tools/ssd-upgrade $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/ssd-upgrade
194+
sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/ssd-upgrade
195+
192196
# Hook into initramfs: run fsck to repair a non-clean filesystem prior to be mounted
193197
sudo cp files/initramfs-tools/fsck-rootfs $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/fsck-rootfs
194198
sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/fsck-rootfs
@@ -663,5 +667,5 @@ fi
663667
pushd $FILESYSTEM_ROOT && sudo tar czf $OLDPWD/$FILESYSTEM_DOCKERFS -C ${DOCKERFS_PATH}var/lib/docker .; popd
664668

665669
## Compress together with /boot, /var/lib/docker and $PLATFORM_DIR as an installer payload zip file
666-
pushd $FILESYSTEM_ROOT && sudo zip --symlinks $OLDPWD/$ONIE_INSTALLER_PAYLOAD -r boot/ $PLATFORM_DIR/; popd
670+
pushd $FILESYSTEM_ROOT && sudo zip $OLDPWD/$ONIE_INSTALLER_PAYLOAD -r boot/ $PLATFORM_DIR/; popd
667671
sudo zip -g -n .squashfs:.gz $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS $FILESYSTEM_DOCKERFS

0 commit comments

Comments
 (0)