Thank you for the review. On 06/03/2011 11:07 AM, Jonas Gorski wrote: > Hi, > > On 2 June 2011 18:35, Hauke Mehrtens <hauke@xxxxxxxxxx> wrote: >> --- a/scripts/gen-compat-autoconf.sh >> +++ b/scripts/gen-compat-autoconf.sh >> @@ -155,6 +155,14 @@ for i in $(egrep '^CONFIG_|^ifdef CONFIG_|^ifndef CONFIG_|^endif #CONFIG_|^else >> echo "#$i" | sed -e 's/+/ /' -e 's/\(ifndef CONFIG_COMPAT_KERNEL_26\)\([0-9]*\)/if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,\2))/' -e 's/\(#ifndef \)\(CONFIG_[^:space:]*\)/#if !defined(\2) && !defined(\2_MODULE)/' >> continue >> ;; >> + 'ifdef+CONFIG_'* ) >> + echo "#$i" | sed -e 's/+/ /' -e 's/\(ifdef CONFIG_COMPAT_KERNEL_3\)\([0-9]*\)/if (LINUX_VERSION_CODE < KERNEL_VERSION(3,\2,0))/' -e 's/\(#ifdef \)\(CONFIG_[^:space:]*\)/#if defined(\2) || defined(\2_MODULE)/' >> + continue >> + ;; >> + 'ifndef+CONFIG_'* ) >> + echo "#$i" | sed -e 's/+/ /' -e 's/\(ifndef CONFIG_COMPAT_KERNEL_3\)\([0-9]*\)/if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,\2,0))/' -e 's/\(#ifndef \)\(CONFIG_[^:space:]*\)/#if !defined(\2) && !defined(\2_MODULE)/' >> + continue >> + ;; > > I admit, I don't have much shell script experience, but I'm surprised > that having the same case multiple times works. > I would probably just add the -e ' ... KERNEL_3\... ' part to the > original sed lines (they are already much too long anyway ;-). yes the patch is wrong, I will fix that. > >> 'else+#CONFIG_'* | 'endif+#CONFIG_'* ) >> echo "#$i */" |sed -e 's/+#/ \/* /g' >> continue >> @@ -184,7 +192,12 @@ done >> # Deal with special cases. CONFIG_MAC80211_QOS is such a case. >> # We handle this specially for different kernels we support. >> if [ -f $KLIB_BUILD/Makefile ]; then >> - SUBLEVEL=$(make -C $KLIB_BUILD kernelversion | sed -n 's/^2\.6\.\([0-9]\+\).*/\1/p') >> + MAJORLEVEL=$(make -C $KLIB_BUILD kernelversion | sed -n 's/^\([0-9]\)\..*/\1/p') >> + if [ $MAJORLEVEL -eq 2 ]; then >> + SUBLEVEL=$(make -C $KLIB_BUILD kernelversion | sed -n 's/^2\.6\.\([0-9]\+\).*/\1/p') >> + else >> + SUBLEVEL=99 >> + fi > > You could drop setting sublevel to 99 by changing > >> if [ $SUBLEVEL -le 22 ]; then > > to > > if [ $MAJORLEVEL -eq 2 -a $SUBLEVEL -le 22 ] > > this would be a bit cleaner IMHO. Yes that's better. > > > Jonas I will resend the patches with these fixes. Hauke -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
