Has source been updated with Hibbits' recent patches?

[Super Bisquit]

Here is the error with the null output.
Using locate /usr/src|grep opt_wlan.h resulted in no output.
What would be the current diff between the wi/Makefile in
/usr/src/sys/modules and the one presently patched on your system.

Reversing the patch and then reapplying results in the error- see attached
files, or in the patch not applying correctly.

Again, everything is being looked over to see if the fault is PEBKAC.


On Wed, Feb 1, 2012 at 12:04 PM, Super Bisquit <superbisquit at gmail.com>wrote:

> Reapplied wi_2.diff to an updated wi/Makefile. Following, the second patch
> was applied. Both patches were done as patch </$HOME/$DIFF#.
> Somewhere, I applied the patches incorrectly. Output asked if I wanted to
> reverse the previous patch  i.e wi_2 to be reversed; and, I complied.
> Attached is the error.
> Before reading it, was the error on my part for applying the second patch
> and then allowing a reversal during the process?
> Also, use MACHINE and not MACHINE_CPUARCH in the Makefile.
>
>
> On Wed, Feb 1, 2012 at 11:23 AM, Justin Hibbits <chmeeedalf at gmail.com>wrote:
>
>> 11:23 AM me: I just screwed up the wi/Makefile and updated the src
>> again. I'm reapplying all the patches now. Apologies for bothering yo.
>>
>
>
-------------- next part --------------
Warning: Object directory not changed from original /usr/src/sys/modules/wi
awk -f @/tools/makeobjops.awk @/dev/pccard/card_if.m -h
awk -f @/tools/makeobjops.awk @/kern/device_if.m -h
awk -f @/tools/makeobjops.awk @/kern/bus_if.m -h
awk -f @/tools/makeobjops.awk @/dev/pci/pci_if.m -h
awk -f @/tools/pccarddevs2h.awk @/dev/pccard/pccarddevs
awk -f @/tools/makeobjops.awk @/dev/ofw/ofw_bus_if.m -h
cc -O2 -pipe -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE -nostdinc   -I. -I@ -I@/contrib/altq -finline-limit=15000 --param inline-unit-growth=100 --param large-function-growth=1000 -fno-common  -mlongcall -fno-omit-frame-pointer  -msoft-float -mno-altivec -ffreestanding -fstack-protector -std=iso9899:1999 -fstack-protector -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -Wundef -Wno-pointer-sign -fformat-extensions  -Wmissing-include-dirs -fdiagnostics-show-option   -c /usr/src/sys/modules/wi/../../dev/wi/if_wi.c
/usr/src/sys/modules/wi/../../dev/wi/if_wi.c:65:22: error: opt_wlan.h: No such file or directory
*** Error code 1

Stop in /usr/src/sys/modules/wi.