[PATCH 0/1] strongswan: fix building lib32-strongswan failed while systemd enabled

[PATCH 0/1] strongswan: fix building lib32-strongswan failed while systemd enabled

[Hongxu Jia]

The following changes since commit 8089aa451827cb791c7d795b9899dc152d1ceb66:

  vlc: Fix build with flac-1.3.0 (2014-02-24 10:10:25 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib hongxu/fix-strongswan
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-strongswan

Hongxu Jia (1):
  strongswan: fix building lib32-strongswan failed while systemd enabled

 meta-networking/recipes-support/strongswan/strongswan_5.0.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
1.8.1.2

[PATCH 1/1] strongswan: fix building lib32-strongswan failed while systemd enabled

[Hongxu Jia]

While systemd enabled, there was an error to build lib32-strongswan:
...
| ERROR: Function failed: SYSTEMD_SERVICE_lib32-strongswan value
lib32-strongswan.service does not exist
...

The name of the service file should be the hardcoded
'strongswan.service' rather than '${PN}.service', so
the 'strongswan.service' will be found while building
lib32-strongswan.

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta-networking/recipes-support/strongswan/strongswan_5.0.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.0.0.bb b/meta-networking/recipes-support/strongswan/strongswan_5.0.0.bb
index eb49494..e45e81a 100644
--- a/meta-networking/recipes-support/strongswan/strongswan_5.0.0.bb
+++ b/meta-networking/recipes-support/strongswan/strongswan_5.0.0.bb
@@ -33,4 +33,4 @@ INSANE_SKIP_${PN}-plugins = "staticdev"
 RPROVIDES_${PN} += "${PN}-systemd"
 RREPLACES_${PN} += "${PN}-systemd"
 RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "${PN}.service"
+SYSTEMD_SERVICE_${PN} = "strongswan.service"
-- 
1.8.1.2

Re: [PATCH 1/1] strongswan: fix building lib32-strongswan failed while systemd enabled

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1440 bytes --]

On Tue, Feb 25, 2014 at 06:54:16PM +0800, Hongxu Jia wrote:
> While systemd enabled, there was an error to build lib32-strongswan:
> ...
> | ERROR: Function failed: SYSTEMD_SERVICE_lib32-strongswan value
> lib32-strongswan.service does not exist
> ...

Please use [meta-networking] tag in subject so it's easier to filter 
them on patchwork to separate bundles.

> 
> The name of the service file should be the hardcoded
> 'strongswan.service' rather than '${PN}.service', so
> the 'strongswan.service' will be found while building
> lib32-strongswan.
> 
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
>  meta-networking/recipes-support/strongswan/strongswan_5.0.0.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.0.0.bb b/meta-networking/recipes-support/strongswan/strongswan_5.0.0.bb
> index eb49494..e45e81a 100644
> --- a/meta-networking/recipes-support/strongswan/strongswan_5.0.0.bb
> +++ b/meta-networking/recipes-support/strongswan/strongswan_5.0.0.bb
> @@ -33,4 +33,4 @@ INSANE_SKIP_${PN}-plugins = "staticdev"
>  RPROVIDES_${PN} += "${PN}-systemd"
>  RREPLACES_${PN} += "${PN}-systemd"
>  RCONFLICTS_${PN} += "${PN}-systemd"
> -SYSTEMD_SERVICE_${PN} = "${PN}.service"
> +SYSTEMD_SERVICE_${PN} = "strongswan.service"
> -- 
> 1.8.1.2
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 1/1] strongswan: fix building lib32-strongswan failed while systemd enabled

[Hongxu Jia]

On 02/27/2014 07:11 AM, Martin Jansa wrote:
> On Tue, Feb 25, 2014 at 06:54:16PM +0800, Hongxu Jia wrote:
>> While systemd enabled, there was an error to build lib32-strongswan:
>> ...
>> | ERROR: Function failed: SYSTEMD_SERVICE_lib32-strongswan value
>> lib32-strongswan.service does not exist
>> ...
> Please use [meta-networking] tag in subject so it's easier to filter
> them on patchwork to separate bundles.

Sorry for the missing, should I resend them?

//Hongxu

>> The name of the service file should be the hardcoded
>> 'strongswan.service' rather than '${PN}.service', so
>> the 'strongswan.service' will be found while building
>> lib32-strongswan.
>>
>> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
>> ---
>>   meta-networking/recipes-support/strongswan/strongswan_5.0.0.bb | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.0.0.bb b/meta-networking/recipes-support/strongswan/strongswan_5.0.0.bb
>> index eb49494..e45e81a 100644
>> --- a/meta-networking/recipes-support/strongswan/strongswan_5.0.0.bb
>> +++ b/meta-networking/recipes-support/strongswan/strongswan_5.0.0.bb
>> @@ -33,4 +33,4 @@ INSANE_SKIP_${PN}-plugins = "staticdev"
>>   RPROVIDES_${PN} += "${PN}-systemd"
>>   RREPLACES_${PN} += "${PN}-systemd"
>>   RCONFLICTS_${PN} += "${PN}-systemd"
>> -SYSTEMD_SERVICE_${PN} = "${PN}.service"
>> +SYSTEMD_SERVICE_${PN} = "strongswan.service"
>> -- 
>> 1.8.1.2
>>