Source Mage code commit list

[Juuso Alasuutari <iuso AT sourcemage.org>]

On Saturday 21 July 2007 08:35:54 Robin Cook wrote:
<...>
>     wpa_supplicant: corrected to build if using devel version
<...>
> --- a/net/wpa_supplicant/CONFIGURE
> +++ b/net/wpa_supplicant/CONFIGURE
> @@ -79,24 +79,13 @@ config_query  CONFIG_EAP_GTC  "EAP-GTC support?"  y    
>        && config_query  CONFIG_EAP_OTP  "EAP-OTC support?"  y            &&
> config_query  CONFIG_EAP_SIM  "EAP-SIM (GSM) support?"  n      &&
> config_query  CONFIG_EAP_AKA  "EAP-AKA (UMTS) support?"  n     && -if [[
> $WPA_RELEASE != old ]]
> -then
> -  message  "${MESSAGE_COLOR}Notice: EAP-PSK and EAP-SAKE"   \
> -           "options are mutually exclusive.$DEFAULT_COLOR"
> -fi  &&
> -config_query  CONFIG_EAP_PSK  "EAP-PSK support?"  n  &&
> -config_query  CONFIG_EAP_PAX  "EAP-PAX support?"  n  &&
> -config_query  CONFIG_EAP_LEAP  "LEAP support?"  y    &&
> +config_query  CONFIG_EAP_PSK  "EAP-PSK support?"  n            &&
> +config_query  CONFIG_EAP_PAX  "EAP-PAX support?"  n            &&
> +config_query  CONFIG_EAP_LEAP  "LEAP support?"  y              &&
>
>  if [[ $WPA_RELEASE != old ]]
>  then
> -  if [[ $CONFIG_EAP_PSK != y ]]
> -  then
> -    config_query  CONFIG_EAP_SAKE  "EAP-SAKE support?"  n
> -  else
> -    message "${MESSAGE_COLOR}EAP-PSK was selected, will"  \
> -            "not query about EAP-SAKE.$DEFAULT_COLOR"
> -  fi  &&
> +  config_query  CONFIG_EAP_SAKE  "EAP-SAKE support?"  n  &&
>    config_query  CONFIG_EAP_GPSK  "EAP-GPSK support?"  n  &&

How is removing the EAP-PSK/EAP-SAKE mutex code relevant to enabling the 
devel 
version to build? I'm just concerned because those options used to conflict. 
Are you sure that this has changed? Are you sure that they have stopped 
conflicting in both the devel _and_ stable versions?

> --- a/net/wpa_supplicant/PRE_BUILD
> +++ b/net/wpa_supplicant/PRE_BUILD
> @@ -1,5 +1,9 @@
>  default_pre_build        &&
> -cd  "$SOURCE_DIRECTORY"  &&
> +if [[ "${WPA_RELEASE}" == "devel" ]]; then
> +   cd  "$SOURCE_DIRECTORY/wpa_supplicant"
> +else
> +   cd  "$SOURCE_DIRECTORY"
> +fi  &&
<...>
> --- a/net/wpa_supplicant/BUILD
> +++ b/net/wpa_supplicant/BUILD
> @@ -1,3 +1,7 @@
> +if [[ "${WPA_RELEASE}" == "devel" ]]; then
> +   cd  "$SOURCE_DIRECTORY/wpa_supplicant"
> +fi  &&
> +

Isn't the cd command in BUILD redundant, or am I not getting something? 
Afaik, 
if you've changed to $SOURCE_DIRECTORY/wpa_supplicant in PRE_BUILD you will 
still be there when BUILD is run.

-- 
        Juuso Alasuutari
[[ Source Mage GNU/Linux ]]

Attachment: signature.asc
Description: This is a digitally signed message part.