build/update: include rewind functionality via VERSION use; closes #373
This commit is contained in:
Franco Fichtner
parent
7ed5150fed
commit
2eee340031
2
Makefile
2
Makefile
|
|
@ -26,7 +26,7 @@
|
|||
STEPS= audit arm base boot chroot clean clone compress confirm \
|
||||
connect core distfiles download dvd fingerprint info \
|
||||
kernel list make.conf nano options packages plugins ports \
|
||||
prefetch print rebase release rename rewind serial sign \
|
||||
prefetch print rebase release rename serial sign \
|
||||
skim test update upload verify vga vm xtools
|
||||
SCRIPTS= custom distribution factory hotfix nightly watch
|
||||
|
||||
|
|
|
|||
|
|
@ -211,10 +211,12 @@ Updating the code repositories
|
|||
|
||||
Updating all or individual repositories can be done as follows:
|
||||
|
||||
# make update[-<repo1>[,...]]
|
||||
# make update[-<repo1>[,...]] [VERSION=git.tag]
|
||||
|
||||
Available update options are: core, plugins, ports, portsref, src, tools
|
||||
|
||||
VERSION can be used to update to the matching git tag instead of HEAD.
|
||||
|
||||
Regression tests and ports audit
|
||||
--------------------------------
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Copyright (c) 2014-2022 Franco Fichtner <franco@opnsense.org>
|
||||
# Copyright (c) 2014-2023 Franco Fichtner <franco@opnsense.org>
|
||||
# Copyright (c) 2010-2011 Scott Ullrich <sullrich@gmail.com>
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
|
|
@ -410,6 +410,9 @@ git_branch()
|
|||
git_tag()
|
||||
{
|
||||
# Fuzzy-match a tag and return it for the caller.
|
||||
local FUZZY
|
||||
local MAX
|
||||
local VERSION
|
||||
|
||||
POOL=$(git -C ${1} tag | awk '$1 == "'"${2}"'"')
|
||||
if [ -z "${POOL}" ]; then
|
||||
|
|
|
|||
|
|
@ -1,71 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Copyright (c) 2018-2019 Franco Fichtner <franco@opnsense.org>
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
#
|
||||
# 1. Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
#
|
||||
# 2. Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in the
|
||||
# documentation and/or other materials provided with the distribution.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
# SUCH DAMAGE.
|
||||
|
||||
set -e
|
||||
|
||||
SELF=rewind
|
||||
|
||||
. ./common.sh
|
||||
|
||||
if [ -n "${EXTRABRANCH}" ]; then
|
||||
echo ">>> Cannot rewind, please unset EXTRABRANCH=${EXTRABRANCH}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
ARGS="src ports plugins core tools"
|
||||
|
||||
for ARG in ${ARGS}; do
|
||||
case ${ARG} in
|
||||
core)
|
||||
BRANCH=${COREBRANCH}
|
||||
DIR=${COREDIR}
|
||||
;;
|
||||
plugins)
|
||||
BRANCH=${PLUGINSBRANCH}
|
||||
DIR=${PLUGINSDIR}
|
||||
;;
|
||||
ports)
|
||||
BRANCH=${PORTSBRANCH}
|
||||
DIR=${PORTSDIR}
|
||||
;;
|
||||
src)
|
||||
BRANCH=${SRCBRANCH}
|
||||
DIR=${SRCDIR}
|
||||
;;
|
||||
tools)
|
||||
BRANCH=${TOOLSBRANCH}
|
||||
DIR=${TOOLSDIR}
|
||||
;;
|
||||
*)
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
|
||||
git_tag ${DIR} ${PRODUCT_VERSION}
|
||||
git_pull ${DIR} ${BRANCH}
|
||||
git_reset ${DIR}
|
||||
done
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Copyright (c) 2017-2019 Franco Fichtner <franco@opnsense.org>
|
||||
# Copyright (c) 2017-2023 Franco Fichtner <franco@opnsense.org>
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
|
|
@ -31,6 +31,11 @@ SELF=update
|
|||
|
||||
. ./common.sh
|
||||
|
||||
if [ -n "${VERSION}" -a -n "${EXTRABRANCH}" ]; then
|
||||
echo ">>> Cannot check out VERSION=${VERSION} while using EXTRABRANCH=${EXTRABRANCH}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
ARGS=${@}
|
||||
if [ -z "${ARGS}" ]; then
|
||||
ARGS="core plugins ports src tools"
|
||||
|
|
@ -75,4 +80,10 @@ for ARG in ${ARGS}; do
|
|||
for BRANCH in ${BRANCHES}; do
|
||||
git_pull ${DIR} ${BRANCH}
|
||||
done
|
||||
|
||||
if [ -n "${VERSION}" ]; then
|
||||
git_tag ${DIR} ${VERSION}
|
||||
git_pull ${DIR} ${BRANCHES}
|
||||
git_reset ${DIR}
|
||||
fi
|
||||
done
|
||||
|
|
|
|||
Loading…
Reference in New Issue