[PATCH 1/3] rsb: Store patches in separate directories

Alex White alex.white at oarcorp.com
Tue Jul 27 03:30:00 UTC 2021


This prevents patches with the same name from conflicting and causing
the build to fail.
---
 source-builder/defaults.mc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source-builder/defaults.mc b/source-builder/defaults.mc
index 98775e8..d24d969 100644
--- a/source-builder/defaults.mc
+++ b/source-builder/defaults.mc
@@ -101,7 +101,7 @@ _topdir:             dir,     required, '%{_cwd}'
 _configdir:          dir,     optional, '%{_topdir}/config:%{_sbdir}/config:%{_sbtop}/bare/config'
 _tardir:             dir,     optional, '%{_topdir}/tar'
 _sourcedir:          dir,     optional, '%{_topdir}/sources'
-_patchdir:           dir,     optional, '%{_topdir}/patches:%{_sbdir}/patches'
+_patchdir:           dir,     optional, '%{_topdir}/patches/%{buildname}:%{_sbdir}/patches'
 _builddir:           dir,     optional, '%{_topdir}/build/%{buildname}'
 _buildcxcdir:        dir,     optional, '%{_topdir}/build/%{buildname}-cxc'
 _buildxcdir:         dir,     optional, '%{_topdir}/build/%{buildname}-xc'
-- 
2.30.2



More information about the devel mailing list