diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2016-01-05 21:05:17 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2016-01-05 21:05:17 +0000 |
| commit | 8834318685bc0063c7e5c8643cbd4d8168eac56c (patch) | |
| tree | 8337325a8f7623b8920901e3734301b0b26c68fb /release/Makefile | |
| parent | bd81fe68ee5c1e0b044670ea5f1757d1c1c222c9 (diff) | |
| download | src-test2-8834318685bc0063c7e5c8643cbd4d8168eac56c.tar.gz src-test2-8834318685bc0063c7e5c8643cbd4d8168eac56c.zip | |
Merge ^/projects/release-install-debug:
- Rework MANIFEST generation and parsing via bsdinstall(8).
- Allow selecting debugging distribution sets during install.
- Rework bsdinstall(8) to fetch remote debug distribution sets
when they are not available on the local install medium.
- Allow selecting additional non-GENERIC kernels during install.
At present, GENERIC is still required, and installed by default.
Tested with: head@r293203
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/head/; revision=293223
Diffstat (limited to 'release/Makefile')
| -rw-r--r-- | release/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/release/Makefile b/release/Makefile index e3a233d355d2..07b8048de483 100644 --- a/release/Makefile +++ b/release/Makefile @@ -176,7 +176,7 @@ disc1: packagesystem MK_DEBUG_FILES=no # Copy distfiles mkdir -p ${.TARGET}/usr/freebsd-dist - for dist in MANIFEST $$(ls *.txz | grep -v -- '-dbg'); \ + for dist in MANIFEST $$(ls *.txz | grep -vE -- '(base|lib32)-dbg'); \ do cp $${dist} ${.TARGET}/usr/freebsd-dist; \ done # Copy documentation, if generated @@ -225,7 +225,7 @@ dvd: packagesystem MK_TESTS=no MK_DEBUG_FILES=no # Copy distfiles mkdir -p ${.TARGET}/usr/freebsd-dist - for dist in MANIFEST $$(ls *.txz | grep -v -- '-dbg'); \ + for dist in MANIFEST $$(ls *.txz | grep -v -- '(base|lib32)-dbg'); \ do cp $${dist} ${.TARGET}/usr/freebsd-dist; \ done # Copy documentation, if generated |