make: mfc files and dirs as well

This commit is contained in:
Franco Fichtner
2019-01-04 09:19:18 +01:00
parent a3591cbc23
commit ce33526b38
+13 -3
View File
@@ -1,4 +1,4 @@
# Copyright (c) 2015-2018 Franco Fichtner <franco@opnsense.org>
# Copyright (c) 2015-2019 Franco Fichtner <franco@opnsense.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -73,11 +73,21 @@ diff:
@git diff --stat -p stable/${PLUGIN_ABI} ${.CURDIR}/${diff_ARGS:[1]}
mfc:
@git checkout stable/${PLUGIN_ABI}
.for MFC in ${mfc_ARGS}
.if exists(${MFC})
@git diff --stat -p stable/${PLUGIN_ABI} ${.CURDIR}/${MFC} > /tmp/mfc.diff
@git checkout stable/${PLUGIN_ABI}
@git apply /tmp/mfc.diff
@git add ${.CURDIR}
@if ! git diff --quiet HEAD; then \
git commit -m "${MFC}: sync with master"; \
fi
.else
@git checkout stable/${PLUGIN_ABI}
@git cherry-pick -x ${MFC}
.endfor
.endif
@git checkout master
.endfor
license:
@${.CURDIR}/Scripts/license . > ${.CURDIR}/LICENSE