Skip to contentSkip to conversation

strongswan: fix building lib32-strongswan failed while systemd enabled

PATCH In review Hongxu Jia 2 participants 4 messages Feb 25, 2014 – Feb 27, 2014

lore
Share & tools
lore

Hongxu Jia

author
#0 lore raw

cover strongswan: fix building lib32-strongswan failed while systemd enabled

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(-)
Signature · 1 line
1.8.1.2
author
#1 lore raw

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

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.

---
 meta-networking/recipes-support/strongswan/strongswan_5.0.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-support/strongswan/strongswan_5.0.0.bb +1 -1
index eb49494..e45e81a 100644
@@ -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"
Signature · 1 line
1.8.1.2
#2 lore raw
Quoted 5 lines · 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
...

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

Quoted 24 lines

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.

---
 meta-networking/recipes-support/strongswan/strongswan_5.0.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-support/strongswan/strongswan_5.0.0.bb +1 -1
index eb49494..e45e81a 100644
@@ -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"
Signature · 1 line
1.8.1.2
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
author
#3 lore raw
Quoted 8 lines · Martin Jansa
Quoted 5 lines · 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
...

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

Quoted 23 lines
Quoted 23 lines

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.

---
  meta-networking/recipes-support/strongswan/strongswan_5.0.0.bb | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-support/strongswan/strongswan_5.0.0.bb +1 -1
index eb49494..e45e81a 100644
@@ -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"
Signature · 1 line
1.8.1.2