Merge branch 'master' into 25.06_branch

This commit is contained in:
Leah Rowe
2025-05-15 02:47:00 +01:00
3 changed files with 8 additions and 12 deletions
+5 -9
View File
@@ -15,7 +15,7 @@ fetch_targets()
printf "Creating %s tree %s\n" "$project" "$tree" printf "Creating %s tree %s\n" "$project" "$tree"
git_prep "$url" "$bkup_url" "$xbmkpwd/$configdir/$tree/patches" \ git_prep "$url" "$bkup_url" "$xbmkpwd/$configdir/$tree/patches" \
"src/$project/$tree" with_submodules "src/$project/$tree" with_submodules
nuke "$project/$tree" "$project/$tree" ( fx_ nuke find "$xbmkpwd/config" -type f -name "nuke.list" ) || exit 1
} }
fetch_project() fetch_project()
@@ -31,10 +31,7 @@ fetch_project()
x_ ./mk -f $d x_ ./mk -f $d
done done
clone_project clone_project
( fx_ nuke find "$xbmkpwd/config" -type f -name "nuke.list" ) || exit 1
for x in config/git/*; do
[ -d "$x" ] && nuke "${x##*/}" "src/${x##*/}" 2>/dev/null; :
done; :
} }
clone_project() clone_project()
@@ -166,8 +163,7 @@ tmpclone()
nuke() nuke()
{ {
e "config/${1%/}/nuke.list" f missing || while read -r nukefile; do rdir="${1#"$xbmkpwd/config/"}" && [ -d "$xbmkpwd/src/${rdir%/*}" ] && \
rmf="src/${2%/}/$nukefile" && [ -L "$rmf" ] && continue x_ cd "$xbmkpwd/src/${rdir%/*}" && \
e "$rmf" e missing || x_ rm -Rf "$rmf" dx_ "eval [ -L \"\$fx\" ] || x_ rm -Rf" "$1"; :
done < "config/${1%/}/nuke.list"; :
} }
+2 -2
View File
@@ -75,8 +75,8 @@ chkvars()
# e.g. coreboot is multi-tree, so 1 # e.g. coreboot is multi-tree, so 1
singletree() singletree()
{ {
( fx_ "exit 1" find "config/$1/"*/ -type f -name "target.cfg" ) || \ ( fx_ "eval exit 1 && err" find "config/$1/"*/ -type f \
return 1 -name "target.cfg" ) || return 1; :
} }
findpath() findpath()
+1 -1
View File
@@ -270,7 +270,7 @@ check_defconfig()
elfcheck() elfcheck()
{ {
# TODO: *STILL* very hacky check. do it properly (based on build.list) # 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() handle_makefile()