mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-13 14:59:34 +02:00
Merge branch 'master' into 25.06_branch
This commit is contained in:
+5
-9
@@ -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"; :
|
||||
}
|
||||
|
||||
+2
-2
@@ -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()
|
||||
|
||||
+1
-1
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user