Skip to content

Commit

Permalink
Bump version to v1.0.25
Browse files Browse the repository at this point in the history
Do another round of emerge @preserved-rebuild at the end, with
getbinpkg suppressed in FEATURES (thanks to while true for reporting!)

Make output of eix-sync -0 less chatty.
  • Loading branch information
sakaki- committed Apr 9, 2020
1 parent 259487e commit ccb5f28
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 5 deletions.
20 changes: 17 additions & 3 deletions genup
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Will offer to update the kernel, if a new version has become available.
# Intended to be run interactively.
#
# Copyright (c) 2014-2019 sakaki <sakaki@deciban.com>
# Copyright (c) 2014-2020 sakaki <sakaki@deciban.com>
#
# License (GPL v3.0)
# ------------------
Expand All @@ -29,7 +29,7 @@ shopt -s nullglob

# ********************** variables *********************
PROGNAME="$(basename "${0}")"
VERSION="1.0.24"
VERSION="1.0.25"
ETCPROFILE="/etc/profile"
UPDATERSDIR="/etc/${PROGNAME}/updaters.d"
RED_TEXT="" GREEN_TEXT="" YELLOW_TEXT="" RESET_ATTS="" ALERT_TEXT=""
Expand Down Expand Up @@ -344,10 +344,24 @@ rebuild_packages_depending_on_stale_libraries() {
# the below emerge will rebuild any such consumers, so that the old
# library may be freed
show "Rebuilding any consumers of old shared libraries, which did not autoupdate..."
# do this twice - first, with getbinpkg enabled (as this'll pick up anything
# already rebuilt on the binhost, if one is used, saving time) and then again with it
# disabled, in case there are any local packages which need rebuilding (and
# where we need to suppress getbinpkg, otherwise it'll just re-install from the
# local tbz2)
if ! ${PUMP} ${EMERGE} ${VERBOSITYFLAG} @preserved-rebuild; then
if MAKEOPTS="${MAKEOPTS-} -j1" FEATURES="${NOPUMP}" ${EMERGE} --resume; then
warning "emerge @preserved-rebuild completed successfully, but only by restricting"
warning "build parallelism and distcc"
else
warning "Failed to complete emerge @preserved-rebuild due to error"
fi
fi
show "Rebuilding again, with getbinpkg suppressed, to catch any local-only packages..."
if ! FEATURES="-getbinpkg" ${PUMP} ${EMERGE} ${VERBOSITYFLAG} @preserved-rebuild; then
if MAKEOPTS="${MAKEOPTS-} -j1" FEATURES="-getbinpkg ${NOPUMP}" ${EMERGE} --resume; then
warning "emerge @preserved-rebuild completed successfully, but only by restricting"
warning "build parallelism and distcc"
else
die "Failed to complete emerge @preserved-rebuild due to error"
fi
Expand Down Expand Up @@ -484,7 +498,7 @@ update_eix_metadata() {
if ((ARG_NO_EIX_METADATA_UPDATE==0)); then
# following does not hit the network
show "Updating eix metadata..."
eix-sync -0
eix-sync -0 |& sed -e '/^Processing/d'
else
warning "As requested, not updating eix metadata"
fi
Expand Down
4 changes: 2 additions & 2 deletions genup.8
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH GENUP 8 "Version 1.0.24: August 2019"
.TH GENUP 8 "Version 1.0.25: April 2020"
.SH NAME
genup \- update Portage tree, all installed packages, and kernel
.SH SYNOPSIS
Expand Down Expand Up @@ -335,7 +335,7 @@ NB: most users will \fBnot\fR have the webrsync-gpg FEATURE set, and so should i
this note.
.SH COPYRIGHT
.nf
Copyright \(co 2014-2019 sakaki
Copyright \(co 2014-2020 sakaki
License GPLv3+ (GNU GPL version 3 or later)
<http://gnu.org/licenses/gpl.html>

Expand Down

0 comments on commit ccb5f28

Please sign in to comment.