Page MenuHomeFreeBSD
Differential D47303

pkgbase: don't remove the 'latest' symlink until the repo is final
ClosedPublic
Actions

Authored by kevans on Oct 28 2024, 4:52 AM.
Tags
None
Referenced Files
Unknown Object (File)
Feb 27 2025, 12:34 AM
Unknown Object (File)
Feb 10 2025, 5:40 AM
Unknown Object (File)
Feb 7 2025, 6:08 PM
Unknown Object (File)
Feb 7 2025, 11:29 AM
Unknown Object (File)
Jan 15 2025, 12:43 PM
Unknown Object (File)
Jan 15 2025, 12:40 PM
Unknown Object (File)
Jan 15 2025, 9:13 AM
Unknown Object (File)
Jan 15 2025, 8:12 AM
View All 31 Files
Subscribers
emaste
imp

Details

Reviewers
emaste
bapt
Group Reviewers
pkgbase
Commits
rG1e8db1f74e42: pkgbase: don't remove the 'latest' symlink until the repo is final
rG8549e3ce0cd6: pkgbase: don't remove the 'latest' symlink until the repo is final
Summary

We can encounter many issues in the pkg-repo(8) process which would
currently leave us with no more 'latest' symlink in the repository. The
main problems with this are that we've now broken a subsequent
update-packages because we can't determine a PKG_VERSION_FROM, but
also we break configured clients that are still expecting to see *some*
repository.

Switch to just replacing the latest symlink entirely after we have
made it past the pkg-repo(8) step so that we only swap over when we have
a finished repository.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
5 lines

Diff 145644

View Options

Makefile.inc1

Show First 20 Lines • Show All 2,361 Lines • ▼ Show 20 Linessign-packages: .PHONY
${_+_}@cd ${.CURDIR}; \ ${_+_}@cd ${.CURDIR}; \
${MAKE} -f Makefile.inc1 PKG_VERSION=${PKG_VERSION} real-sign-packages ${MAKE} -f Makefile.inc1 PKG_VERSION=${PKG_VERSION} real-sign-packages
real-sign-packages: _pkgbootstrap .PHONY real-sign-packages: _pkgbootstrap .PHONY
printf "version = 2;\n" > ${WSTAGEDIR}/meta printf "version = 2;\n" > ${WSTAGEDIR}/meta
.if ${PKG_BIN_VERSION} < 11700 .if ${PKG_BIN_VERSION} < 11700
printf "packing_format = \"${PKG_FORMAT}\";\n" >> ${WSTAGEDIR}/meta printf "packing_format = \"${PKG_FORMAT}\";\n" >> ${WSTAGEDIR}/meta
.endif .endif
@[ -L "${REPODIR}/${PKG_ABI}/latest" ] && unlink ${REPODIR}/${PKG_ABI}/latest; \ @${PKG_CMD} -o ABI=${PKG_ABI} repo -o OSVERSION="${SRCRELDATE}" \
${PKG_CMD} -o ABI=${PKG_ABI} repo -o OSVERSION="${SRCRELDATE}" \
-m ${WSTAGEDIR}/meta \ -m ${WSTAGEDIR}/meta \
-o ${REPODIR}/${PKG_ABI}/${PKG_VERSION} \ -o ${REPODIR}/${PKG_ABI}/${PKG_VERSION} \
${REPODIR}/${PKG_ABI}/${PKG_VERSION} \ ${REPODIR}/${PKG_ABI}/${PKG_VERSION} \
${PKG_REPO_SIGNING_KEY} ; \ ${PKG_REPO_SIGNING_KEY} ; \
cd ${REPODIR}/${PKG_ABI}; \ cd ${REPODIR}/${PKG_ABI}; \
ln -s ${PKG_OUTPUT_DIR} latest ln -hfs ${PKG_OUTPUT_DIR} latest
# #
# #
# checkworld # checkworld
# #
# Run test suite on installed world. # Run test suite on installed world.
# #
checkworld: .PHONY checkworld: .PHONY
▲ Show 20 Lines • Show All 1,522 Lines • Show Last 20 Lines