diff options
| author | Renato Botelho <renato@netgate.com> | 2015-12-30 16:21:07 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-12-30 16:21:07 -0200 |
| commit | d8ff3484131f428fcc0727cd504acb5050a36490 (patch) | |
| tree | 8adfbb5b779f497e621d29277fcbe1536012eeb0 /release | |
| parent | 0319542cc712df59c57f014b4f925f516bcb5b4b (diff) | |
| parent | ecf8336fcdf81e2aeb30a7ab82841dd7299ceb98 (diff) | |
| download | FreeBSD-src-d8ff3484131f428fcc0727cd504acb5050a36490.zip FreeBSD-src-d8ff3484131f428fcc0727cd504acb5050a36490.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 13 | ||||
| -rw-r--r-- | release/Makefile.vm | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/release/Makefile b/release/Makefile index 4cd82c3..976f651 100644 --- a/release/Makefile +++ b/release/Makefile @@ -40,7 +40,6 @@ WORLDDIR?= ${.CURDIR}/.. PORTSDIR?= /usr/ports DOCDIR?= /usr/doc RELNOTES_LANG?= en_US.ISO8859-1 -XZCMD?= /usr/bin/xz .if !defined(TARGET) || empty(TARGET) TARGET= ${MACHINE} @@ -161,16 +160,18 @@ kernel.txz: src.txz: mkdir -p ${DISTDIR}/usr ln -fs ${WORLDDIR} ${DISTDIR}/usr/src - cd ${DISTDIR} && tar cLvJf ${.OBJDIR}/src.txz --exclude .svn --exclude .zfs \ - --exclude .git --exclude @ --exclude usr/src/release/dist usr/src + cd ${DISTDIR} && tar cLvf - --exclude .svn --exclude .zfs \ + --exclude .git --exclude @ --exclude usr/src/release/dist usr/src | \ + ${XZ_CMD} > ${.OBJDIR}/src.txz ports.txz: mkdir -p ${DISTDIR}/usr ln -fs ${PORTSDIR} ${DISTDIR}/usr/ports - cd ${DISTDIR} && tar cLvJf ${.OBJDIR}/ports.txz \ + cd ${DISTDIR} && tar cLvf - \ --exclude .git --exclude .svn \ --exclude usr/ports/distfiles --exclude usr/ports/packages \ - --exclude 'usr/ports/INDEX*' --exclude work usr/ports + --exclude 'usr/ports/INDEX*' --exclude work usr/ports | \ + ${XZ_CMD} > ${.OBJDIR}/ports.txz reldoc: cd ${.CURDIR}/doc && ${MAKE} all install clean 'FORMATS=html txt' \ @@ -333,7 +334,7 @@ release-install: .for I in ${IMAGES} cp -p ${I} ${DESTDIR}/${OSRELEASE}-${I} . if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES) - ${XZCMD} -k ${DESTDIR}/${OSRELEASE}-${I} + ${XZ_CMD} -k ${DESTDIR}/${OSRELEASE}-${I} . endif .endfor cd ${DESTDIR} && sha512 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA512 diff --git a/release/Makefile.vm b/release/Makefile.vm index f4de633..902442f 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -137,7 +137,7 @@ vm-install: . if defined(WITH_COMPRESSED_VMIMAGES) && !empty(WITH_COMPRESSED_VMIMAGES) . for FORMAT in ${VMFORMATS} # Don't keep the originals. There is a copy in ${.OBJDIR} if needed. - ${XZCMD} ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT} + ${XZ_CMD} ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT} . endfor . endif cd ${DESTDIR}/vmimages && sha512 ${OSRELEASE}* > \ |
