diff options
| author | Leah Rowe <leah@libreboot.org> | 2025-05-15 02:47:00 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2025-05-15 02:47:00 +0100 |
| commit | 1b29ad275f1862527c0fcba22709133f16db3444 (patch) | |
| tree | 586c71c4316208b83e7ed359a6b9a185d508f3d8 | |
| parent | a8d0777da16cd45248473f5b00f4b8ec120fa4e9 (diff) | |
| parent | a191d22bd6dad8b5d9cb37e952904ff1a0030259 (diff) | |
Merge branch 'master' into 25.06_branch25.06_branch
| -rw-r--r-- | include/get.sh | 14 | ||||
| -rw-r--r-- | include/lib.sh | 4 | ||||
| -rw-r--r-- | include/tree.sh | 2 |
3 files changed, 8 insertions, 12 deletions
diff --git a/include/get.sh b/include/get.sh index 7d728796..74adb6be 100644 --- a/include/get.sh +++ b/include/get.sh @@ -15,7 +15,7 @@ fetch_targets() printf "Creating %s tree %s\n" "$project" "$tree" git_prep "$url" "$bkup_url" "$xbmkpwd/$configdir/$tree/patches" \ "src/$project/$tree" with_submodules - nuke "$project/$tree" "$project/$tree" + ( fx_ nuke find "$xbmkpwd/config" -type f -name "nuke.list" ) || exit 1 } fetch_project() @@ -31,10 +31,7 @@ fetch_project() x_ ./mk -f $d done clone_project - - for x in config/git/*; do - [ -d "$x" ] && nuke "${x##*/}" "src/${x##*/}" 2>/dev/null; : - done; : + ( fx_ nuke find "$xbmkpwd/config" -type f -name "nuke.list" ) || exit 1 } clone_project() @@ -166,8 +163,7 @@ tmpclone() nuke() { - e "config/${1%/}/nuke.list" f missing || while read -r nukefile; do - rmf="src/${2%/}/$nukefile" && [ -L "$rmf" ] && continue - e "$rmf" e missing || x_ rm -Rf "$rmf" - done < "config/${1%/}/nuke.list"; : + rdir="${1#"$xbmkpwd/config/"}" && [ -d "$xbmkpwd/src/${rdir%/*}" ] && \ + x_ cd "$xbmkpwd/src/${rdir%/*}" && \ + dx_ "eval [ -L \"\$fx\" ] || x_ rm -Rf" "$1"; : } diff --git a/include/lib.sh b/include/lib.sh index cf4305a1..75de7512 100644 --- a/include/lib.sh +++ b/include/lib.sh @@ -75,8 +75,8 @@ chkvars() # e.g. coreboot is multi-tree, so 1 singletree() { - ( fx_ "exit 1" find "config/$1/"*/ -type f -name "target.cfg" ) || \ - return 1 + ( fx_ "eval exit 1 && err" find "config/$1/"*/ -type f \ + -name "target.cfg" ) || return 1; : } findpath() diff --git a/include/tree.sh b/include/tree.sh index f44b39cc..25d4732c 100644 --- a/include/tree.sh +++ b/include/tree.sh @@ -270,7 +270,7 @@ check_defconfig() elfcheck() { # TODO: *STILL* very hacky check. do it properly (based on build.list) - ( fx_ "exit 1" find "$dest_dir" -type f ) || return 1; : + ( fx_ "eval exit 1 && err" find "$dest_dir" -type f ) || return 1; : } handle_makefile() |