Module: sip-router
Branch: master
Commit: ca2454106d869dacccda6bd5564037a83edd89bc
URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ca24541…
Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com>
Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com>
Date: Tue Sep 18 11:53:02 2012 +0100
pkg/kamailio/(centos|fedora): Fixed some issues with boxgrinder builds
- Fixed typo in README
- New version of BoxGrinder limits appliance name to 35 characters
(so had to shorten these)
---
pkg/kamailio/centos/6/kamailio-build.appl | 4 ++--
pkg/kamailio/centos/6/kamailio.appl | 4 ++--
pkg/kamailio/fedora/16/README | 2 +-
pkg/kamailio/fedora/16/kamailio-build.appl | 4 ++--
pkg/kamailio/fedora/16/kamailio.appl | 4 ++--
pkg/kamailio/fedora/17/kamailio-build.appl | 4 ++--
pkg/kamailio/fedora/17/kamailio.appl | 4 ++--
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/pkg/kamailio/centos/6/kamailio-build.appl
b/pkg/kamailio/centos/6/kamailio-build.appl
index 7496687..ef21c53 100644
--- a/pkg/kamailio/centos/6/kamailio-build.appl
+++ b/pkg/kamailio/centos/6/kamailio-build.appl
@@ -1,5 +1,5 @@
-name: "kamailio-build-#OS_NAME#-#OS_VERSION#-#BASE_ARCH#"
-summary: "#OS_NAME# #OS_VERSION# for building Kamailio #BASE_ARCH# RPMs"
+name: "kamailio-build-c6-#BASE_ARCH#"
+summary: "CentOS 6 image for building Kamailio #BASE_ARCH# RPMs"
os:
name: centos
version: 6
diff --git a/pkg/kamailio/centos/6/kamailio.appl b/pkg/kamailio/centos/6/kamailio.appl
index 7dc0efd..b59ccfc 100644
--- a/pkg/kamailio/centos/6/kamailio.appl
+++ b/pkg/kamailio/centos/6/kamailio.appl
@@ -1,5 +1,5 @@
-name: "kamailio-#OS_NAME#-#OS_VERSION#-#BASE_ARCH#"
-summary: "#OS_NAME# #OS_VERSION# for installing Kamailio #BASE_ARCH# RPMs"
+name: "kamailio-c6-#BASE_ARCH#"
+summary: "CentOS 6 image for installing Kamailio #BASE_ARCH# RPMs"
os:
name: centos
version: 6
diff --git a/pkg/kamailio/fedora/16/README b/pkg/kamailio/fedora/16/README
index 95fed77..b3f5b2d 100644
--- a/pkg/kamailio/fedora/16/README
+++ b/pkg/kamailio/fedora/16/README
@@ -47,7 +47,7 @@ changes to the commands in this example.
# cd appliance
# [sudo] boxgrinder-build \
[path to]/pkg/kamailio/fedora/17/kamailio-build.appl -d libvirt \
- --delivery_config connection_uri:qemu:///system,\
+ --delivery-config connection_uri:qemu:///system,\
image_delivery_uri:/var/lib/libvirt/images,overwrite:true,\
domain_type:kvm
2) Start the appliance and log in:
diff --git a/pkg/kamailio/fedora/16/kamailio-build.appl
b/pkg/kamailio/fedora/16/kamailio-build.appl
index bbdc185..f39933b 100644
--- a/pkg/kamailio/fedora/16/kamailio-build.appl
+++ b/pkg/kamailio/fedora/16/kamailio-build.appl
@@ -1,5 +1,5 @@
-name: "kamailio-build-#OS_NAME#-#OS_VERSION#-#BASE_ARCH#"
-summary: "#OS_NAME# #OS_VERSION# for building Kamailio #BASE_ARCH# RPMs"
+name: "kamailio-build-fc16-#BASE_ARCH#"
+summary: "Fedora 16 image for building Kamailio #BASE_ARCH# RPMs"
os:
name: fedora
version: 16
diff --git a/pkg/kamailio/fedora/16/kamailio.appl b/pkg/kamailio/fedora/16/kamailio.appl
index e275735..09230f1 100644
--- a/pkg/kamailio/fedora/16/kamailio.appl
+++ b/pkg/kamailio/fedora/16/kamailio.appl
@@ -1,5 +1,5 @@
-name: "kamailio-#OS_NAME#-#OS_VERSION#-#BASE_ARCH#"
-summary: "#OS_NAME# #OS_VERSION# for installing Kamailio #BASE_ARCH# RPMs"
+name: "kamailio-fc16-#BASE_ARCH#"
+summary: "Fedora 16 image for installing Kamailio #BASE_ARCH# RPMs"
os:
name: fedora
version: 16
diff --git a/pkg/kamailio/fedora/17/kamailio-build.appl
b/pkg/kamailio/fedora/17/kamailio-build.appl
index ccb1257..a3833cd 100644
--- a/pkg/kamailio/fedora/17/kamailio-build.appl
+++ b/pkg/kamailio/fedora/17/kamailio-build.appl
@@ -1,5 +1,5 @@
-name: "kamailio-build-#OS_NAME#-#OS_VERSION#-#BASE_ARCH#"
-summary: "#OS_NAME# #OS_VERSION# for building Kamailio #BASE_ARCH# RPMs"
+name: "kamailio-build-fc17-#BASE_ARCH#"
+summary: "Fedora 17 image for building Kamailio #BASE_ARCH# RPMs"
os:
name: fedora
version: 17
diff --git a/pkg/kamailio/fedora/17/kamailio.appl b/pkg/kamailio/fedora/17/kamailio.appl
index 1b46a1d..dae1be7 100644
--- a/pkg/kamailio/fedora/17/kamailio.appl
+++ b/pkg/kamailio/fedora/17/kamailio.appl
@@ -1,5 +1,5 @@
-name: "kamailio-#OS_NAME#-#OS_VERSION#-#BASE_ARCH#"
-summary: "#OS_NAME# #OS_VERSION# for installing Kamailio #BASE_ARCH# RPMs"
+name: "kamailio-fc17-#BASE_ARCH#"
+summary: "Fedora 17 image for installing Kamailio #BASE_ARCH# RPMs"
os:
name: fedora
version: 17