Skip to content

Commit 3058fb6

Browse files
authored
Loc moved to prev consolidation change (#12427)
Why I did it Issue was caused by this #11341 *.bin image structure in 202205: vkarri@19d5638dde2d:/sonic$ ls -l /tmp/tmp.9ibWSipeRw/installer/x86_64/ total 12 drwxr-xr-x 2 vkarri dip 12288 Oct 14 13:16 platforms However install.sh which runs on ONiE parition expects the platform specific kernel cmd line conf file under platform/$onie_platform_string file https://github.com/sonic-net/sonic-buildimage/blob/master/installer/install.sh#L102 Thus, any platform which defines and depends on these params might be broken on master label. How I did it Since we are already filtering the conf files based on TARGET_PLATFORM in build_image.sh, i've just updated the location to installer/platforms instead of installer/$arch/platforms Signed-off-by: Vivek Reddy Karri <[email protected]>
1 parent 198b629 commit 3058fb6

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

build_image.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ generate_onie_installer_image()
7171
output_file=$OUTPUT_ONIE_IMAGE
7272
[ -n "$1" ] && output_file=$1
7373
# Copy platform-specific ONIE installer config files where onie-mk-demo.sh expects them
74-
rm -rf ./installer/${TARGET_PLATFORM}/platforms/
75-
mkdir -p ./installer/${TARGET_PLATFORM}/platforms/
74+
rm -rf ./installer/platforms/
75+
mkdir -p ./installer/platforms/
7676
for VENDOR in `ls ./device`; do
7777
for PLATFORM in `ls ./device/$VENDOR | grep ^${TARGET_PLATFORM}`; do
7878
if [ -f ./device/$VENDOR/$PLATFORM/installer.conf ]; then
79-
cp ./device/$VENDOR/$PLATFORM/installer.conf ./installer/${TARGET_PLATFORM}/platforms/$PLATFORM
79+
cp ./device/$VENDOR/$PLATFORM/installer.conf ./installer/platforms/$PLATFORM
8080
fi
8181

8282
done

0 commit comments

Comments
 (0)