diff options
| author | ru <ru@FreeBSD.org> | 2003-09-21 06:33:14 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2003-09-21 06:33:14 +0000 |
| commit | 35b0a3b4a9eee7ad55947b2794bdaf3ed2be1fef (patch) | |
| tree | d56150212037055b0dfb3d5c65bcbb9cf05729dc | |
| parent | 1343b60a86e91326dd52b1e3cef081808324d205 (diff) | |
| download | FreeBSD-src-35b0a3b4a9eee7ad55947b2794bdaf3ed2be1fef.zip FreeBSD-src-35b0a3b4a9eee7ad55947b2794bdaf3ed2be1fef.tar.gz | |
Make LOCAL_PATCHES accept multiple patch files, as its name suggests.
| -rw-r--r-- | release/Makefile | 9 | ||||
| -rw-r--r-- | share/man/man7/release.7 | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/release/Makefile b/release/Makefile index 9e9579a..f44893e 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 7fa2b46..fd1055c 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 <config>" . .It Va LOCAL_PATCHES -A patch file against +Patch files against .Pa /usr/src that will be applied in the .Xr chroot 8 |
