kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Unbreak make makepatch.

Browse source 
The glob in `find ./*` is handled by the shell and actually sorts the
files, so one needs to to ask find to sort the result, using `find -s`.

`find ./* -maxdepth 0` is not equivalent to `find . -maxdepth 0`, the
depth increases by one as `./x` is on level deeper than `.`.

Pointy hat:	bdrewery
This commit is contained in:
Mathieu Arnold 2020-01-23 08:55:25 +00:00
parent b442eb8da2
commit f5e4ea9e14
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=523912
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mk/Scripts/smart_makepatch.sh
View file

@ -69,7 +69,7 @@ std_patch_filename() {
patchdir_files_list() {
if [ -d "${PATCHDIR}" ]; then
(cd ${PATCHDIR} && \
find . -type f -name "patch-*" -maxdepth 0 \
find -s . -type f -name "patch-*" -maxdepth 1 \
2>/dev/null | sed -e 's,^\./,,; /\.orig$/d'
)
fi;
@ -216,7 +216,7 @@ stage_patches() {
local P
local name
local patch_list
patch_list=$(cd ${REGENNED} && find . -name "patch-*" 2>/dev/null)
patch_list=$(cd ${REGENNED} && find -s . -name "patch-*" 2>/dev/null)
for P in ${patch_list}; do
P=${P#./}
name=$(get_patch_name ${P})