[Commotion-admin] [commotion-router] Recent wpa_supplicant patch breaks build (#115)

[Dan Staples]

Offending patch is `640-store_freq_ibss.patch`.

Error log:

. /opt/build/commotion-router/openwrt/include/shell.sh; bzcat /opt/build/commotion-router/openwrt/dl/hostapd-20131120.tar.bz2 | /bin/tar -C /opt/build/commotion-router/openwrt/build_dir/target-mips_r2_uClibc-0.9.33.2/hostapd-wpad-mini/hostapd-20131120/.. -xf - 

Applying ./patches/100-madwifi_key_fixes.patch using plaintext: 
patching file src/drivers/driver_madwifi.c

Applying ./patches/110-bool_fix.patch using plaintext: 
patching file src/ap/ieee802_1x.c

Applying ./patches/120-daemonize_fix.patch using plaintext: 
patching file src/utils/os_unix.c

Applying ./patches/130-wds_sta_del_fix.patch using plaintext: 
patching file src/drivers/driver_nl80211.c

Applying ./patches/200-multicall.patch using plaintext: 
patching file hostapd/Makefile
patching file wpa_supplicant/Makefile
patching file src/drivers/driver.h
patching file src/ap/drv_callbacks.c
patching file wpa_supplicant/wpa_priv.c
patching file wpa_supplicant/events.c
patching file wpa_supplicant/wpa_supplicant.c
patching file hostapd/main.c
patching file src/drivers/drivers.c

Applying ./patches/300-noscan.patch using plaintext: 
patching file hostapd/config_file.c
patching file src/ap/ap_config.h
patching file src/ap/hw_features.c

Applying ./patches/310-rescan_immediately.patch using plaintext: 
patching file wpa_supplicant/wpa_supplicant.c

Applying ./patches/320-optional_rfkill.patch using plaintext: 
patching file src/drivers/driver_nl80211.c
patching file src/drivers/driver_wext.c
patching file src/drivers/drivers.mak
patching file src/drivers/driver_wext.h

Applying ./patches/330-nl80211_fix_set_freq.patch using plaintext: 
patching file src/drivers/driver_nl80211.c

Applying ./patches/340-reload_freq_change.patch using plaintext: 
patching file src/ap/hostapd.c

Applying ./patches/350-nl80211_del_beacon_bss.patch using plaintext: 
patching file src/drivers/driver_nl80211.c

Applying ./patches/360-ctrl_iface_reload.patch using plaintext: 
patching file hostapd/ctrl_iface.c

Applying ./patches/370-ap_sta_support.patch using plaintext: 
patching file wpa_supplicant/wpa_supplicant_i.h
patching file wpa_supplicant/Makefile
patching file wpa_supplicant/wpa_supplicant.c
patching file wpa_supplicant/bss.c
patching file wpa_supplicant/main.c
patching file wpa_supplicant/bss.h

Applying ./patches/380-disable_ctrl_iface_mib.patch using plaintext: 
patching file hostapd/Makefile
patching file hostapd/ctrl_iface.c
patching file wpa_supplicant/Makefile
patching file wpa_supplicant/ctrl_iface.c
patching file src/ap/ctrl_iface_ap.c
patching file src/ap/ieee802_1x.c
patching file src/ap/wpa_auth.c
patching file src/rsn_supp/wpa.c

Applying ./patches/390-wpa_ie_cap_workaround.patch using plaintext: 
patching file src/common/wpa_common.c

Applying ./patches/400-terminate_on_setup_failure.patch using plaintext: 
patching file src/ap/hostapd.c

Applying ./patches/410-bring_down_interface.patch using plaintext: 
patching file src/drivers/driver_nl80211.c

Applying ./patches/420-fix_wps_pin_crash.patch using plaintext: 
patching file hostapd/ctrl_iface.c

Applying ./patches/430-wps_single_auth_enc_type.patch using plaintext: 
patching file src/ap/wps_hostapd.c

Applying ./patches/440-dynamic_20_40_mhz.patch using plaintext: 
patching file hostapd/config_file.c
patching file src/ap/ap_config.h
patching file src/ap/hostapd.c
patching file src/ap/hostapd.h
patching file src/ap/ieee802_11.c
patching file src/ap/ieee802_11.h
patching file src/ap/ieee802_11_ht.c

Applying ./patches/450-limit_debug_messages.patch using plaintext: 
patching file src/utils/wpa_debug.c
patching file src/utils/wpa_debug.h

Applying ./patches/460-indicate-features.patch using plaintext: 
patching file hostapd/main.c
patching file wpa_supplicant/main.c
patching file src/utils/build_features.h

Applying ./patches/470-hostapd_cli_ifdef.patch using plaintext: 
patching file hostapd/hostapd_cli.c

Applying ./patches/471-wpa_cli_ifdef.patch using plaintext: 
patching file wpa_supplicant/wpa_cli.c

Applying ./patches/480-max_num_sta_probe.patch using plaintext: 
patching file src/ap/beacon.c

Applying ./patches/490-scan_wait.patch using plaintext: 
patching file hostapd/main.c

Applying ./patches/500-wpa_supplicant-add-new-config-params-to-be-used-with.patch using plaintext: 
patching file src/drivers/driver.h
patching file wpa_supplicant/config.c
patching file wpa_supplicant/config_ssid.h
patching file wpa_supplicant/wpa_supplicant.c

Applying ./patches/501-driver_nl80211-use-new-parameters-during-ibss-join.patch using plaintext: 
patching file src/drivers/driver_nl80211.c

Applying ./patches/502-wpa_s-support-htmode-param.patch using plaintext: 
patching file src/drivers/driver.h
patching file src/drivers/driver_nl80211.c
patching file wpa_supplicant/config.c
patching file wpa_supplicant/config_ssid.h
patching file wpa_supplicant/wpa_supplicant.c

Applying ./patches/510-wpa_supplicant_p2p_parse_ifcomb.patch using plaintext: 
patching file src/drivers/driver_nl80211.c

Applying ./patches/640-store_freq_ibss.patch using plaintext: 
patching file src/drivers/driver_nl80211.c
Hunk #1 FAILED at 1583.
Hunk #2 succeeded at 7941 (offset 865 lines).
1 out of 2 hunks FAILED -- saving rejects to file src/drivers/driver_nl80211.c.rej
Patch failed!  Please fix ./patches/640-store_freq_ibss.patch!
make[3]: *** [/opt/build/commotion-router/openwrt/build_dir/target-mips_r2_uClibc-0.9.33.2/hostapd-wpad-mini/hostapd-20131120/.prepared_ef29c0f295902832b7d851521555c208] Error 1
make[3]: Leaving directory `/opt/build/commotion-router/openwrt/package/hostapd'
make[2]: *** [package/hostapd/compile] Error 2
make[2]: Leaving directory `/opt/build/commotion-router/openwrt'
make[1]: *** [/opt/build/commotion-router/openwrt/staging_dir/target-mips_r2_uClibc-0.9.33.2/stamp/.package_compile] Error 2
make[1]: Leaving directory `/opt/build/commotion-router/openwrt'
make: *** [world] Error 2


---
Reply to this email directly or view it on GitHub:
https://github.com/opentechinstitute/commotion-router/issues/115
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.chambana.net/pipermail/commotion-admin/attachments/20140317/f4424adf/attachment-0001.html>