diff options
| author | Bryan Drewery <bryan@shatow.net> | 2017-07-06 20:27:13 +0300 |
|---|---|---|
| committer | Bryan Drewery <bryan@shatow.net> | 2017-07-06 20:28:09 +0300 |
| commit | f0b2132f9d247573532b5741bd10c90e841bdc46 (patch) | |
| tree | 0de9d2ce3c2fae0b0c98cc844754385ebda7e92e | |
| parent | 8f09d601522a0c38d5ddbaffd212b01b99642272 (diff) | |
bulk: Store build name in PACKAGES/.buildname
| -rwxr-xr-x | src/share/poudriere/common.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh index c36da0c4..d4964813 100755 --- a/src/share/poudriere/common.sh +++ b/src/share/poudriere/common.sh @@ -1568,13 +1568,13 @@ commit_packages() { # mostly incase pkg adds a new top-level repo or the ports framework # starts creating a new directory find ${PACKAGES}/ -mindepth 1 -maxdepth 1 \ - \( ! -name '.*' -o -name '.jailversion' \) | + \( ! -name '.*' -o -name '.jailversion' -o -name '.buildname' \) | while read path; do name=${path##*/} [ ! -L "${PACKAGES_ROOT}/${name}" ] || continue if [ -e "${PACKAGES_ROOT}/${name}" ]; then case "${name}" in - .jailversion|meta.txz|digests.txz|packagesite.txz|All|Latest) + .buildname|.jailversion|meta.txz|digests.txz|packagesite.txz|All|Latest) # Auto fix pkg-owned files rm -f "${PACKAGES_ROOT}/${name}" ;; @@ -1605,7 +1605,7 @@ symlink to .latest/${name}" # Look for broken top-level links and remove them, if they reference # the old directory find -L ${PACKAGES_ROOT}/ -mindepth 1 -maxdepth 1 \ - \( ! -name '.*' -o -name '.jailversion' \) \ + \( ! -name '.*' -o -name '.jailversion' -o -name '.buildname' \) \ -type l | while read path; do link=$(readlink ${path}) @@ -4581,6 +4581,7 @@ prepare_ports() { fi jget ${JAILNAME} version > ${PACKAGES}/.jailversion + echo "${BUILDNAME}" > "${PACKAGES}/.buildname" fi return 0 |