mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-06 16:40:47 +00:00
pkgbase: propagate SRCRELDATE to the packages correctly
MFC After: 3 days Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D42892
This commit is contained in:
parent
7893419d49
commit
5faaa602ce
|
@ -2013,6 +2013,7 @@ package-pkg: .PHONY
|
||||||
env ${WMAKEENV:Q} SRCDIR=${.CURDIR} PORTSDIR=${PORTSDIR} REVISION=${_REVISION} \
|
env ${WMAKEENV:Q} SRCDIR=${.CURDIR} PORTSDIR=${PORTSDIR} REVISION=${_REVISION} \
|
||||||
PKG_CMD=${PKG_CMD} PKG_VERSION=${PKG_VERSION} REPODIR=${REPODIR} \
|
PKG_CMD=${PKG_CMD} PKG_VERSION=${PKG_VERSION} REPODIR=${REPODIR} \
|
||||||
WSTAGEDIR=${WSTAGEDIR} \
|
WSTAGEDIR=${WSTAGEDIR} \
|
||||||
|
OSVERSION="${SRCRELDATE}" \
|
||||||
sh ${.CURDIR}/release/scripts/make-pkg-package.sh
|
sh ${.CURDIR}/release/scripts/make-pkg-package.sh
|
||||||
|
|
||||||
real-packages: stage-packages create-packages sign-packages .PHONY
|
real-packages: stage-packages create-packages sign-packages .PHONY
|
||||||
|
@ -2108,12 +2109,16 @@ create-source-packages: _pkgbootstrap .PHONY
|
||||||
-e "s|%PKG_WWW%|${PKG_WWW}|" \
|
-e "s|%PKG_WWW%|${PKG_WWW}|" \
|
||||||
${SRCDIR}/release/packages/src-sys.ucl \
|
${SRCDIR}/release/packages/src-sys.ucl \
|
||||||
> ${SSTAGEDIR}/src-sys.ucl
|
> ${SSTAGEDIR}/src-sys.ucl
|
||||||
${PKG_CMD} -o ABI=${PKG_ABI} create -f ${PKG_FORMAT} \
|
${PKG_CMD} -o ABI=${PKG_ABI} \
|
||||||
|
-o OSVERSION="${SRCRELDATE}" \
|
||||||
|
create -f ${PKG_FORMAT} \
|
||||||
-M ${SSTAGEDIR}/src.ucl \
|
-M ${SSTAGEDIR}/src.ucl \
|
||||||
-p ${SSTAGEDIR}/src.plist \
|
-p ${SSTAGEDIR}/src.plist \
|
||||||
-r ${SRCDIR} \
|
-r ${SRCDIR} \
|
||||||
-o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR}
|
-o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR}
|
||||||
${PKG_CMD} -o ABI=${PKG_ABI} create -f ${PKG_FORMAT} \
|
${PKG_CMD} -o ABI=${PKG_ABI} \
|
||||||
|
-o OSVERSION="${SRCRELDATE}" \
|
||||||
|
create -f ${PKG_FORMAT} \
|
||||||
-M ${SSTAGEDIR}/src-sys.ucl \
|
-M ${SSTAGEDIR}/src-sys.ucl \
|
||||||
-p ${SSTAGEDIR}/src-sys.plist \
|
-p ${SSTAGEDIR}/src-sys.plist \
|
||||||
-r ${SRCDIR} \
|
-r ${SRCDIR} \
|
||||||
|
@ -2153,6 +2158,7 @@ create-world-package-${pkgname}: .PHONY
|
||||||
sed -i '' -e "s/%VCS_REVISION%/${VCS_REVISION}/" ${WSTAGEDIR}/${pkgname}.ucl ; \
|
sed -i '' -e "s/%VCS_REVISION%/${VCS_REVISION}/" ${WSTAGEDIR}/${pkgname}.ucl ; \
|
||||||
fi
|
fi
|
||||||
${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname -o ALLOW_BASE_SHLIBS=yes \
|
${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname -o ALLOW_BASE_SHLIBS=yes \
|
||||||
|
-o OSVERSION="${SRCRELDATE}" \
|
||||||
create -f ${PKG_FORMAT} -M ${WSTAGEDIR}/${pkgname}.ucl \
|
create -f ${PKG_FORMAT} -M ${WSTAGEDIR}/${pkgname}.ucl \
|
||||||
-p ${WSTAGEDIR}/${pkgname}.plist \
|
-p ${WSTAGEDIR}/${pkgname}.plist \
|
||||||
-r ${WSTAGEDIR} \
|
-r ${WSTAGEDIR} \
|
||||||
|
@ -2188,6 +2194,7 @@ create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap
|
||||||
/version/ {print $$2; next } ' \
|
/version/ {print $$2; next } ' \
|
||||||
${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \
|
${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \
|
||||||
${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \
|
${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \
|
||||||
|
-o OSVERSION="${SRCRELDATE}" \
|
||||||
create -f ${PKG_FORMAT} \
|
create -f ${PKG_FORMAT} \
|
||||||
-M ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl \
|
-M ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl \
|
||||||
-p ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.plist \
|
-p ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.plist \
|
||||||
|
@ -2224,6 +2231,7 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kerne
|
||||||
/version/ {print $$2; next } ' \
|
/version/ {print $$2; next } ' \
|
||||||
${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \
|
${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \
|
||||||
${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname -o ALLOW_BASE_SHLIBS=yes \
|
${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname -o ALLOW_BASE_SHLIBS=yes \
|
||||||
|
-o OSVERSION="${SRCRELDATE}" \
|
||||||
create -f ${PKG_FORMAT} \
|
create -f ${PKG_FORMAT} \
|
||||||
-M ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl \
|
-M ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl \
|
||||||
-p ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.plist \
|
-p ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.plist \
|
||||||
|
|
|
@ -9,6 +9,7 @@ export WSTAGEDIR=${WSTAGEDIR}
|
||||||
export REPODIR=${REPODIR}
|
export REPODIR=${REPODIR}
|
||||||
export PKG_CMD=${PKG_CMD}
|
export PKG_CMD=${PKG_CMD}
|
||||||
export PKG_VERSION=${PKG_VERSION}
|
export PKG_VERSION=${PKG_VERSION}
|
||||||
|
export OSVERSION=${OSVERSION}
|
||||||
export WRKDIR=$(make -C ${PORTSDIR}/ports-mgmt/pkg -V WRKDIR)
|
export WRKDIR=$(make -C ${PORTSDIR}/ports-mgmt/pkg -V WRKDIR)
|
||||||
|
|
||||||
make -C ${PORTSDIR}/ports-mgmt/pkg TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
|
make -C ${PORTSDIR}/ports-mgmt/pkg TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
|
||||||
|
|
Loading…
Reference in a new issue