From 9c758be211684204c5f05c4c8d4c186d205daea9 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Sun, 21 Sep 2003 06:33:14 +0000 Subject: [PATCH] Make LOCAL_PATCHES accept multiple patch files, as its name suggests. --- release/Makefile | 9 +++++++-- share/man/man7/release.7 | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/release/Makefile b/release/Makefile index 9e9579a4a230..f44893e77cb5 100644 --- a/release/Makefile +++ b/release/Makefile @@ -345,8 +345,13 @@ release rerelease: cd ${CHROOTDIR}/usr && \ ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} ${CVS_SRCARGS} ${RELEASESRCMODULE} .endif -.if defined(LOCAL_PATCHES) && exists(${LOCAL_PATCHES}) - cd ${CHROOTDIR}/usr/src && patch ${PATCH_FLAGS} < ${LOCAL_PATCHES} +.if defined(LOCAL_PATCHES) && !empty(LOCAL_PATCHES) + cd ${CHROOTDIR}/usr/${RELEASESRCMODULE} +.for p in ${LOCAL_PATCHES} +.if exists(${p}) + patch ${PATCH_FLAGS} < ${p} +.endif +.endfor .endif .if defined(LOCAL_SCRIPT) && exists(${LOCAL_SCRIPT}) cd ${CHROOTDIR} && env CHROOTDIR=${CHROOTDIR} BUILDNAME=${BUILDNAME} RELEASETAG=${RELEASETAG} ${LOCAL_SCRIPT} diff --git a/share/man/man7/release.7 b/share/man/man7/release.7 index 7fa2b46e8f4a..fd1055cbc141 100644 --- a/share/man/man7/release.7 +++ b/share/man/man7/release.7 @@ -260,7 +260,7 @@ Each kernel is installed into so that it can be booted from the loader via .Dq Li "boot " . .It Va LOCAL_PATCHES -A patch file against +Patch files against .Pa /usr/src that will be applied in the .Xr chroot 8