mirror of
https://github.com/netbirdio/plugins.git
synced 2026-05-22 18:44:07 -07:00
make: mfc files and dirs as well
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user