Message ID | 6159471.3UQWOnjUZP@debian64 |
---|---|
State | RFC |
Headers | show |
On 2015-08-21 16:23, Rich Felker wrote: >> 2. patch patch-kernel.sh >> >> --- >> --- a/scripts/patch-kernel.sh >> +++ b/scripts/patch-kernel.sh >> @@ -37,7 +37,7 @@ for i in ${patchdir}/${patchpattern} ; do >> [ -d "${i}" ] && echo "Ignoring subdirectory ${i}" && continue >> echo "" >> echo "Applying ${i} using ${type}: " >> - ${uncomp} ${i} | ${PATCH:-patch} -f -p1 -E -d ${targetdir} >> + ${uncomp} ${i} | ${PATCH:-patch} -f -p1 -d ${targetdir} >> if [ $? != 0 ] ; then >> echo "Patch failed! Please fix $i!" >> exit 1 >> >> --- >> >> Does anyone have any preferences? I'm opting for "patch patch-kernel" >> (and I will send a proper patch next week to OpenWRT even if no one >> cares now :-D ) > > This seems like a better approach to me, but I don't know if it would > adversely affect the kernel or other components. Applied this change in r46723 - I don't expect any side effects in the kernel or other components, since this flag seems to be relevant for non-standard patch formats only, and we usually keep our patches consistent. - Felix
--- a/src/thread/sh/__set_thread_area.s +++ b/src/thread/sh/__set_thread_area.s @@ -0,0 +1,1 @@ +/* the patch utility might remove empty files */ --- 2. patch patch-kernel.sh --- --- a/scripts/patch-kernel.sh +++ b/scripts/patch-kernel.sh @@ -37,7 +37,7 @@ for i in ${patchdir}/${patchpattern} ; do [ -d "${i}" ] && echo "Ignoring subdirectory ${i}" && continue echo "" echo "Applying ${i} using ${type}: " - ${uncomp} ${i} | ${PATCH:-patch} -f -p1 -E -d ${targetdir} + ${uncomp} ${i} | ${PATCH:-patch} -f -p1 -d ${targetdir} if [ $? != 0 ] ; then echo "Patch failed! Please fix $i!" exit 1