Compare commits

..

No commits in common. "a36504aa316d17fd8175a0795d15676f4d9f50c4" and "2c1f6f5e7a2134c7162f400bdf7c8940bb621571" have entirely different histories.

2 changed files with 5 additions and 4 deletions

1
build
View File

@ -134,6 +134,7 @@ fetch_trees()
[ ! -f "$x" ] || [ -L "$xp" ] || x_ rm -Rf "src/$xp/$xp" [ ! -f "$x" ] || [ -L "$xp" ] || x_ rm -Rf "src/$xp/$xp"
done done
rmgit . rmgit .
rm -Rf tmp .git src/u-boot/*/test/lib/strlcat.c || $err "$_xm !rm"
} }
fail() fail()

View File

@ -197,8 +197,8 @@ nuke()
pjsrcdir="${pjsrcdir#src/}" pjsrcdir="${pjsrcdir#src/}"
[ ! -f "config/$pjcfgdir/nuke.list" ] && return 0 [ ! -f "config/$pjcfgdir/nuke.list" ] && return 0
while read -r nukefile; do while read -r blobfile; do
rmf="$(realpath "src/$pjsrcdir/$nukefile" 2>/dev/null)" || \ rmf="$(realpath "src/$pjsrcdir/$blobfile" 2>/dev/null)" || \
continue continue
[ -L "$rmf" ] && continue # we will delete the actual file [ -L "$rmf" ] && continue # we will delete the actual file
[ "${rmf#"$PWD/src/$pjsrcdir"}" = "$rmf" ] && continue [ "${rmf#"$PWD/src/$pjsrcdir"}" = "$rmf" ] && continue
@ -206,12 +206,12 @@ nuke()
rmf="${rmf#"$PWD/"}" rmf="${rmf#"$PWD/"}"
[ -e "$rmf" ] || continue [ -e "$rmf" ] || continue
del="y" del="y"
rm -Rf "$rmf" || $err "$nuke pjcfgdir: can't rm \"$nukefile\"" rm -Rf "$rmf" || $err "$pjcfgdir/blobs: can't rm \"$blobfile\""
printf "nuke %s: deleted \"%s\"\n" "$pjcfgdir" "$rmf" printf "nuke %s: deleted \"%s\"\n" "$pjcfgdir" "$rmf"
done < "config/$pjcfgdir/nuke.list" done < "config/$pjcfgdir/nuke.list"
[ "${del}" = "y" ] && return 0 [ "${del}" = "y" ] && return 0
printf "nuke %s: no defined files exist in dir, src/%s\n" 1>&2 \ printf "nuke %s: no defined blobs exist in dir, src/%s\n" 1>&2 \
"$pjcfgdir" "$pjsrcdir" "$pjcfgdir" "$pjsrcdir"
printf "(this is not an error)\n" 1>&2 printf "(this is not an error)\n" 1>&2
} }