summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbuild1
-rwxr-xr-xinclude/err.sh16
-rwxr-xr-xscript/update/release23
3 files changed, 18 insertions, 22 deletions
diff --git a/build b/build
index 80ee1827..4ade5e7e 100755
--- a/build
+++ b/build
@@ -46,6 +46,7 @@ main()
check_git
check_project "fail"
+ git_init xx_ fail
execute_command $@
lbmk_exit 0
diff --git a/include/err.sh b/include/err.sh
index 12bba8fb..83c88ab9 100755
--- a/include/err.sh
+++ b/include/err.sh
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: MIT
# SPDX-FileCopyrightText: 2022, 2023 Leah Rowe <leah@libreboot.org>
-version=""; versiondate=""; projectname=""
+version=""; versiondate=""; projectname=""; _nogit=""
x_() {
[ $# -lt 1 ] || ${@} || err_exit err ${@}
@@ -27,6 +27,20 @@ check_git()
git_err "git config --global user.email \"john.doe@example.com\""
}
+# release archives contain .gitignore, but not .git.
+# lbmk can be run from lbmk.git, or an archive.
+git_init()
+{
+ [ -L ".git" ] && ${2} "Reference .git is a symlink"
+ [ -e ".git" ] && return 0
+ eval "$(setvars "$(date -Rd @${versiondate})" cdate _nogit)"
+
+ ${1} git init
+ ${1} git add -A .
+ ${1} git commit -m "${projectname} ${version}" --date "${cdate}"
+ ${1} git tag -a "${version}" -m "${projectname} ${version}"
+}
+
git_err()
{
printf "You need to set git name/email, like so:\n%s\n\n" "${1}" 1>&2
diff --git a/script/update/release b/script/update/release
index 67ec8bec..1875f160 100755
--- a/script/update/release
+++ b/script/update/release
@@ -8,7 +8,7 @@ set -u -e
. "include/err.sh"
. "include/option.sh"
-eval "$(setvars "" vdir relname src_dirname srcdir _nogit _xm target romdir \
+eval "$(setvars "" vdir relname src_dirname srcdir _xm target romdir \
microcode_required mode)"
main()
@@ -37,29 +37,10 @@ main()
mkvdir()
{
mkdir -p "${vdir}" || err "mkvdir: !mkdir -p \"${vdir}\""
-
- git_init || err "mkvdir: !git_init \"${vdir}\""
git clone . "${srcdir}" || err "mkdir: !gitclone \"${srcdir}\""
- [ -z "${_nogit}" ] || x_ rm -Rf ".git"
-
- rm -Rf "${srcdir}/.git" || err "mkvdir: !rm -Rf ${srcdir}/.git"
insert_version_files "${srcdir}" || err "mkvdir ${srcdir}: versionfile"
}
-# release archives contain .gitignore, but not .git.
-# this script can be run from lbmk.git, or an archive.
-git_init()
-{
- [ -L ".git" ] && err "Reference .git is a symlink"
- [ -e ".git" ] && return 0
- eval "$(setvars "$(date -Rd @${versiondate})" cdate _nogit)"
-
- git init || return 1
- git add -A . || return 1
- git commit -m "${projectname} ${version}" --date "${cdate}" || return 1
- git tag -a "${version}" -m "${projectname} ${version}" || return 1
-}
-
build_release()
{
_xm="build_release ${vdir}"
@@ -94,7 +75,7 @@ fetch_trees()
find . -name ".git" -exec rm -Rf {} + || err "${_xm}: rm .git"
find . -name ".gitmodules" -exec rm -Rf {} + || err "${_xm}: rm .gitmod"
- x_ rm -Rf tmp
+ x_ rm -Rf tmp .git
}
mkrom_images()