From dbe109d7b541af4c218620dee7c3523bad6ed1fc Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 17 May 2025 12:43:25 +0100 Subject: release.sh: don't move src/docs/ otherwise, ./mk -b (without argument) will fail, on release archives. also, perhaps i should add an mkhelper to build it? Signed-off-by: Leah Rowe --- include/release.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'include/release.sh') diff --git a/include/release.sh b/include/release.sh index f0799f17..7a7b96fd 100644 --- a/include/release.sh +++ b/include/release.sh @@ -54,7 +54,6 @@ prep_release_src() x_ ./mk -f fx_ "x_ rm -Rf" x_ find . -name ".git" fx_ "x_ rm -Rf" x_ find . -name ".gitmodules" - x_ mv src/docs docs } prep_release_tarball() -- cgit v1.2.1 From 587d245cafa630ff252a45297760371ef07a7f15 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 17 May 2025 13:17:09 +0100 Subject: release.sh: simplify prep_release_bin() Signed-off-by: Leah Rowe --- include/release.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include/release.sh') diff --git a/include/release.sh b/include/release.sh index 7a7b96fd..618ad633 100644 --- a/include/release.sh +++ b/include/release.sh @@ -30,7 +30,7 @@ release() prep_release src prep_release tarball - prep_release bin + [ "$relmode" = "src" ] || prep_release bin x_ rm -Rf "$relsrcdir" x_ mkdir -p "$reldir" @@ -70,7 +70,6 @@ prep_release_tarball() prep_release_bin() { - [ "$relmode" = "src" ] && return 0 x_ ./mk -d coreboot fx_ "x_ ./mk -b" printf \ "coreboot\npico-serprog\nstm32-vserprog\npcsx-redux\n" -- cgit v1.2.1 From 05c07f7401bf79e6eeb34e12a19ce6d2cabab2ab Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 17 May 2025 15:20:02 +0100 Subject: get.sh: move nuke() to release.sh we really only need it there, because the context is for release archives. normal use of the git repository doesn't matter in the context of deletions, because that will not be distributed. only the result of ./mk release will be distributed. the builds produced will not change as a result of this, for people using the normal git repository, because the files in question are never used anyway, in our configs. this is being done to make working on local repos easier. Signed-off-by: Leah Rowe --- include/release.sh | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'include/release.sh') diff --git a/include/release.sh b/include/release.sh index 618ad633..1eec8fa9 100644 --- a/include/release.sh +++ b/include/release.sh @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Copyright (c) 2023-2025 Leah Rowe -eval "`setvars "" reldir reldest vdir relsrcdir relmode`" +eval "`setvars "" reldir reldest vdir relsrc relmode`" release() { @@ -23,15 +23,15 @@ release() err "already exists: \"$reldest\"" vdir="$XBMK_CACHE/relpwd/${xbmktmp##*/}/$version" - relsrcdir="$vdir/${relname}_src" + relsrc="$vdir/${relname}_src" remkdir "$vdir" - x_ git clone . "$relsrcdir" + x_ git clone . "$relsrc" prep_release src prep_release tarball [ "$relmode" = "src" ] || prep_release bin - x_ rm -Rf "$relsrcdir" + x_ rm -Rf "$relsrc" x_ mkdir -p "$reldir" x_ mv "$vdir" "$reldir" @@ -42,9 +42,9 @@ release() prep_release() { - x_ touch "$relsrcdir/lock" + x_ touch "$relsrc/lock" ( - [ "$1" = "tarball" ] || x_ cd "$relsrcdir" + [ "$1" = "tarball" ] || x_ cd "$relsrc" prep_release_$1 ) || err "can't prep release $1" } @@ -54,17 +54,24 @@ prep_release_src() x_ ./mk -f fx_ "x_ rm -Rf" x_ find . -name ".git" fx_ "x_ rm -Rf" x_ find . -name ".gitmodules" + ( fx_ nuke find config -type f -name "nuke.list" ) || err; : +} + +nuke() +{ + r="${1#config/}" && r="$relsrc/src/${r%/*}" && [ -d "$r" ] && x_ cd \ + "$r" && dx_ "eval [ -L \"\$fx\" ] || x_ rm -Rf" "$relsrc/$1"; : } prep_release_tarball() { git log --graph --pretty=format:'%Cred%h%Creset %s %Creset' \ - --abbrev-commit > "$relsrcdir/CHANGELOG" || err "!log $relsrcdir" - x_ rm -f "$relsrcdir/lock" - x_ rm -Rf "$relsrcdir/cache" "$relsrcdir/tmp" + --abbrev-commit > "$relsrc/CHANGELOG" || err "!log $relsrc" + x_ rm -f "$relsrc/lock" + x_ rm -Rf "$relsrc/cache" "$relsrc/tmp" ( - x_ cd "${relsrcdir%/*}" - x_ mktarball "${relsrcdir##*/}" "${relsrcdir##*/}.tar.xz" + x_ cd "${relsrc%/*}" + x_ mktarball "${relsrc##*/}" "${relsrc##*/}.tar.xz" ) || err "can't create src tarball"; : } -- cgit v1.2.1 From 6dc71cc02468a0fce6d5edbc9c9077c09808acf0 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 17 May 2025 15:38:20 +0100 Subject: release.sh: simplify nuke() EVEN MORE Signed-off-by: Leah Rowe --- include/release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/release.sh') diff --git a/include/release.sh b/include/release.sh index 1eec8fa9..729ae4e6 100644 --- a/include/release.sh +++ b/include/release.sh @@ -59,8 +59,8 @@ prep_release_src() nuke() { - r="${1#config/}" && r="$relsrc/src/${r%/*}" && [ -d "$r" ] && x_ cd \ - "$r" && dx_ "eval [ -L \"\$fx\" ] || x_ rm -Rf" "$relsrc/$1"; : + r="${1#config/}"; r="$relsrc/src/${r%/*}"; [ -d "$r" ] && x_ cd "$r" \ + && dx_ "eval [ -L \"\$fx\" ] || x_ rm -Rf" "$relsrc/$1"; : } prep_release_tarball() -- cgit v1.2.1 From 47a3982bbeabd46623e7874ab9e139eb59474388 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 17 May 2025 15:49:24 +0100 Subject: release.sh: use x_ on find command for nuke() Signed-off-by: Leah Rowe --- include/release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/release.sh') diff --git a/include/release.sh b/include/release.sh index 729ae4e6..528156b7 100644 --- a/include/release.sh +++ b/include/release.sh @@ -54,7 +54,7 @@ prep_release_src() x_ ./mk -f fx_ "x_ rm -Rf" x_ find . -name ".git" fx_ "x_ rm -Rf" x_ find . -name ".gitmodules" - ( fx_ nuke find config -type f -name "nuke.list" ) || err; : + ( fx_ nuke x_ find config -type f -name "nuke.list" ) || err; : } nuke() -- cgit v1.2.1 From 4ca57943d7031c4a38d9dbd565fd58adf2a7c2c2 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 17 May 2025 16:03:08 +0100 Subject: release.sh: simplify nuke() EVEN MORE, yet again Signed-off-by: Leah Rowe --- include/release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/release.sh') diff --git a/include/release.sh b/include/release.sh index 528156b7..de8551d6 100644 --- a/include/release.sh +++ b/include/release.sh @@ -59,8 +59,8 @@ prep_release_src() nuke() { - r="${1#config/}"; r="$relsrc/src/${r%/*}"; [ -d "$r" ] && x_ cd "$r" \ - && dx_ "eval [ -L \"\$fx\" ] || x_ rm -Rf" "$relsrc/$1"; : + r="$relsrc/src/${1#config/}"; [ -d "${r%/*}" ] && x_ cd "${r%/*}" && \ + dx_ "eval [ -L \"\$fx\" ] || x_ rm -Rf" "$relsrc/$1"; : } prep_release_tarball() -- cgit v1.2.1 From 44df3b2bff864e7eb42e370d7ac9182799a59fdf Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 18 May 2025 10:33:23 +0100 Subject: release.sh: tidy up nuke() i wasn't ok having that variable initialisation and then the commands on the same line. it looks messy. having the commands on a separate line makes the code nice to read, so let's separate them. Signed-off-by: Leah Rowe --- include/release.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include/release.sh') diff --git a/include/release.sh b/include/release.sh index de8551d6..77281009 100644 --- a/include/release.sh +++ b/include/release.sh @@ -59,8 +59,9 @@ prep_release_src() nuke() { - r="$relsrc/src/${1#config/}"; [ -d "${r%/*}" ] && x_ cd "${r%/*}" && \ - dx_ "eval [ -L \"\$fx\" ] || x_ rm -Rf" "$relsrc/$1"; : + r="$relsrc/src/${1#config/}" + [ -d "${r%/*}" ] && x_ cd "${r%/*}" && \ + dx_ "eval [ -L \"\$fx\" ] || x_ rm -Rf" "$relsrc/$1" } prep_release_tarball() -- cgit v1.2.1 From a3e1ed9823d4750d8e7c5610eecc811e841a35d4 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 18 May 2025 10:51:03 +0100 Subject: release.sh: rename relsrc to rsrc Signed-off-by: Leah Rowe --- include/release.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'include/release.sh') diff --git a/include/release.sh b/include/release.sh index 77281009..5d6da466 100644 --- a/include/release.sh +++ b/include/release.sh @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Copyright (c) 2023-2025 Leah Rowe -eval "`setvars "" reldir reldest vdir relsrc relmode`" +eval "`setvars "" reldir reldest vdir rsrc relmode`" release() { @@ -23,15 +23,15 @@ release() err "already exists: \"$reldest\"" vdir="$XBMK_CACHE/relpwd/${xbmktmp##*/}/$version" - relsrc="$vdir/${relname}_src" + rsrc="$vdir/${relname}_src" remkdir "$vdir" - x_ git clone . "$relsrc" + x_ git clone . "$rsrc" prep_release src prep_release tarball [ "$relmode" = "src" ] || prep_release bin - x_ rm -Rf "$relsrc" + x_ rm -Rf "$rsrc" x_ mkdir -p "$reldir" x_ mv "$vdir" "$reldir" @@ -42,9 +42,9 @@ release() prep_release() { - x_ touch "$relsrc/lock" + x_ touch "$rsrc/lock" ( - [ "$1" = "tarball" ] || x_ cd "$relsrc" + [ "$1" = "tarball" ] || x_ cd "$rsrc" prep_release_$1 ) || err "can't prep release $1" } @@ -59,20 +59,20 @@ prep_release_src() nuke() { - r="$relsrc/src/${1#config/}" + r="$rsrc/src/${1#config/}" [ -d "${r%/*}" ] && x_ cd "${r%/*}" && \ - dx_ "eval [ -L \"\$fx\" ] || x_ rm -Rf" "$relsrc/$1" + dx_ "eval [ -L \"\$fx\" ] || x_ rm -Rf" "$rsrc/$1"; : } prep_release_tarball() { git log --graph --pretty=format:'%Cred%h%Creset %s %Creset' \ - --abbrev-commit > "$relsrc/CHANGELOG" || err "!log $relsrc" - x_ rm -f "$relsrc/lock" - x_ rm -Rf "$relsrc/cache" "$relsrc/tmp" + --abbrev-commit > "$rsrc/CHANGELOG" || err "!log $rsrc" + x_ rm -f "$rsrc/lock" + x_ rm -Rf "$rsrc/cache" "$rsrc/tmp" ( - x_ cd "${relsrc%/*}" - x_ mktarball "${relsrc##*/}" "${relsrc##*/}.tar.xz" + x_ cd "${rsrc%/*}" + x_ mktarball "${rsrc##*/}" "${rsrc##*/}.tar.xz" ) || err "can't create src tarball"; : } -- cgit v1.2.1