Fix sonic frr makefile to handle multiple builds

[nikos-github]

This fixes #3407.

The logic is to try a dry run on the patch and if that passes, apply the patch. If not, try a dry run removal. If it passes, the patch is already applied and the code hasn't changed significantly to affect it. If it doesn't pass, fail the build as the patch most probably needs to be reworked.

@lguohan @pavel-shirshov Please review.

FYI: @ben-gale @MichelMoriniaux @mslocrian @heidinet2007

[pavel-shirshov]

Hi Nikos,

Thank you for the patch. Can we make a loop over an array?
for patch_file in patch_file1 patch_file2 patch_file3
do

done
Also we could make a list of patches from ls of the patches directory.

[ben-gale]

+Dilip

…

On Tue, Sep 24, 2019 at 2:22 PM pavel-shirshov ***@***.***> wrote: Hi Nikos, Thank you for the patch. Can we make a loop over an array? for patch_file in patch_file1 patch_file2 patch_file3 do done Also we could make a list of patches from ls of the patches directory. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#3483>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ACPRCWZVHFMX2ZMY3KXIQPDQLJLIFANCNFSM4IYG3LDQ> .

[lguohan]

#3480 is a much simpler way to fix this issue. but I do not know why stg init fails?

[nikos-github]

Hi Nikos,

Thank you for the patch. Can we make a loop over an array?
for patch_file in patch_file1 patch_file2 patch_file3
do

done

Will do.

Also we could make a list of patches from ls of the patches directory.

I'm really not keen on parsing screen output in the makefile. How strongly do you feel about this?

[nikos-github]

#3480 is a much simpler way to fix this issue. but I do not know why stg init fails?

@lguohan I don't think that's the right approach. Issuing git reset --hard will cause any user changes to be lost.

[sudhanshukumar22]

Hi,
what does "if patch -sfp1 --dry-run < ../patch/$(patch5);" mean ? Also, I am adding a new patch6. For every new patch, should we change the sonic-frr/makefile.

[nikos-github]

Yes, with each patch the makefile would have to be changed. if patch -sfp1 --dry-run < ../patch/$(patch5) tries (without applying hence the dry-run) to see if the patch can apply.

[nikos-github]

retest this please

[nikos-github]

retest this please

[sudhanshukumar22]

Hi Nikos,
I needed this patch for my broadcom image. I had taken your changes and made some additions since I needed it urgently for submitting my changes. The below script works for broadcom image.
.ONESHELL:
SHELL = /bin/bash
.SHELLFLAGS += -e

MAIN_TARGET = $(FRR)
DERIVED_TARGET = $(FRR_PYTHONTOOLS) $(FRR_DBG) $(FRR_SNMP) $(FRR_SNMP_DBG)

patch1 = 0001-Add-support-of-bgp-tcp-DSCP-value.patch
patch2 = 0002-Reduce-severity-of-Vty-connected-from-message.patch
patch3 = 0003-ignore-nexthop-attribute-when-NLRI-is-present.patch
patch4 = 0004-Allow-BGP-attr-NEXT_HOP-to-be-0.0.0.0-due-to-allevia.patch
patch5 = 0005-Support-VRF.patch

$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
# Build the package
pushd ./frr
for frr_patch in $(patch1) $(patch2) $(patch3) $(patch4) $(patch5); do
echo "Patch $$frr_patch"
if patch -sfp1 --dry-run < ../patch/$$frr_patch; then
patch -sfp1 < ../patch/$$frr_patch
else
if ! patch -Rsfp1 --dry-run < ../patch/$$frr_patch; then
echo "Patch $$frr_patch failure"
exit 1
fi
fi
done
tools/tarsource.sh -V -e '-sonic'
dpkg-buildpackage -rfakeroot -b -us -uc -Ppkg.frr.nortrlib -j$(SONIC_CONFIG_MAKE_JOBS)
popd
mv $(DERIVED_TARGET) $* $(DEST)/

$(addprefix $(DEST)/, $(DERIVED_TARGET)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)

[nikos-github]

Yes my latest patch is somewhat similar.

[sudhanshukumar22]

You need to replace $(frr_patch) by $$frr_patch. This is because, for a loop variable, we should not let the makefile change the frr_patch content.

[nikos-github]

Thank you for the correction.

[pavel-shirshov]

Good for now

[nikos-github]

@lguohan Can we merge this?

[pavel-shirshov]

@nikos-github Currently I'm working on #3480
Which makes the same but with stg. Guohan asked me to use stg for applying patches into sonic-frr

[nikos-github]

@nikos-github Currently I'm working on #3480
Which makes the same but with stg. Guohan asked me to use stg for applying patches into sonic-frr

@pavel-shirshov Is your solution considering private changes? Can you explain how it will work if someone has modified frr code and wants to re-build?

The solution in this PR will work with private changes too if any of the patches are not affected.

[pavel-shirshov]

Close in favor of #3480