From a434b449421ecffc6bd7bb292bbe21d013dbb69e Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 24 Apr 2014 19:41:28 +0200 Subject: [PATCH] fix bb files --- build/openembedded/antlr3/antlr3c.inc | 4 ++-- build/openembedded/libexosip2_3.6.0.bb | 18 --------------- build/openembedded/libosip2_3.6.0.bb | 12 ---------- .../linphone/linphone-common_git.inc | 22 +++++++++---------- .../polarssl/polarssl_linphone.bb | 4 ++-- 5 files changed, 15 insertions(+), 45 deletions(-) delete mode 100644 build/openembedded/libexosip2_3.6.0.bb delete mode 100644 build/openembedded/libosip2_3.6.0.bb diff --git a/build/openembedded/antlr3/antlr3c.inc b/build/openembedded/antlr3/antlr3c.inc index 99f0f0439..1f41f429d 100644 --- a/build/openembedded/antlr3/antlr3c.inc +++ b/build/openembedded/antlr3/antlr3c.inc @@ -9,7 +9,7 @@ S = "${WORKDIR}/git/runtime/C" inherit autotools pkgconfig lib_package do_fetch_append() { - import os - os.system("autogen.sh") + import os + os.system("autogen.sh") } diff --git a/build/openembedded/libexosip2_3.6.0.bb b/build/openembedded/libexosip2_3.6.0.bb deleted file mode 100644 index 3fec6c93e..000000000 --- a/build/openembedded/libexosip2_3.6.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "High level Session Initiation Protocol (SIP) library" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "libosip2" -SRCNAME = "libeXosip2" -LEAD_SONAME = "libeXosip2" - -PR = "r1" -SRC_URI = "http://download.savannah.nongnu.org/releases/exosip/${SRCNAME}-${PV}.tar.gz" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit autotools pkgconfig -EXTRA_OECONF = "--disable-josua" -DEFAULT_PREFERENCE = "3" -SRC_URI[md5sum] = "6fef4c110f1305048a8b307f440933d9" -SRC_URI[sha256sum] = "91da1a084c9ab663afe04b493342e075ad59ac54a1af011c7f2ba4543a923564" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" \ No newline at end of file diff --git a/build/openembedded/libosip2_3.6.0.bb b/build/openembedded/libosip2_3.6.0.bb deleted file mode 100644 index 5baa4092a..000000000 --- a/build/openembedded/libosip2_3.6.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -SECTION = "libs" -DESCRIPTION = "Session Initiation Protocol (SIP) library" -LEAD_SONAME = "libosip2\..*" -PR = "r0" -LICENSE = "LGPL" -SRC_URI = "${GNU_MIRROR}/osip/libosip2-${PV}.tar.gz" - -inherit autotools pkgconfig -DEFAULT_PREFERENCE = "3" -SRC_URI[md5sum] = "92fd1c1698235a798497887db159c9b3" -SRC_URI[sha256sum] = "c9a18b0c760506d150017cdb1fa5c1cefe12b8dcbbf9a7e784eb75af376e96cd" -LIC_FILES_CHKSUM = "file://COPYING;md5=e639b5c15b4bd709b52c4e7d4e2b09a4" \ No newline at end of file diff --git a/build/openembedded/linphone/linphone-common_git.inc b/build/openembedded/linphone/linphone-common_git.inc index 4e96312b8..3d92b7f46 100644 --- a/build/openembedded/linphone/linphone-common_git.inc +++ b/build/openembedded/linphone/linphone-common_git.inc @@ -12,20 +12,20 @@ S = "${WORKDIR}/linphone" # There is also a problem with autogen and AC_SUBST # note: don't use a ssh key with password, it does not work. do_fetch_prepend () { - import os,bb - bb.note("Hack preparing clone in %s" %"${LINPHONE_TMP_DIR}") - os.system("rm -rf ${LINPHONE_TMP_DIR}") - os.system("mkdir -p ${LINPHONE_TMP_DIR}") + import os,bb + bb.note("Hack preparing clone in %s" %"${LINPHONE_TMP_DIR}") + os.system("rm -rf ${LINPHONE_TMP_DIR}") + os.system("mkdir -p ${LINPHONE_TMP_DIR}") - bb.note("Hack cloning linphone !recursively") - os.system("cd ${LINPHONE_TMP_DIR}; git clone --recursive ${L_GIT_SRC_URI} linphone") + bb.note("Hack cloning linphone !recursively") + os.system("cd ${LINPHONE_TMP_DIR}; git clone --recursive ${L_GIT_SRC_URI} linphone") - bb.note("Hack launching autogen.sh manually") - os.system("cd ${LINPHONE_TMP_DIR}/linphone; ./autogen.sh") + bb.note("Hack launching autogen.sh manually") + os.system("cd ${LINPHONE_TMP_DIR}/linphone; ./autogen.sh") - bb.note("Hack preparing linphone.tar.gz") -# we need to keep the .git since the versioning in linphone is done through `git describe` - os.system("cd ${LINPHONE_TMP_DIR}; tar czf linphone.tar.gz linphone") + bb.note("Hack preparing linphone.tar.gz") + # we need to keep the .git since the versioning in linphone is done through `git describe` + os.system("cd ${LINPHONE_TMP_DIR}; tar czf linphone.tar.gz linphone") } require linphone-common.inc diff --git a/build/openembedded/polarssl/polarssl_linphone.bb b/build/openembedded/polarssl/polarssl_linphone.bb index 41ed5060e..5723c1a1e 100644 --- a/build/openembedded/polarssl/polarssl_linphone.bb +++ b/build/openembedded/polarssl/polarssl_linphone.bb @@ -5,8 +5,8 @@ SRCREV="cecb44e4f13f42f793dde34b42793e1ebcce91a5" S = "${WORKDIR}/git" do_fetch_prepend () { - import bb - bb.note("Will checkout in %s" % "${S}" ) + import bb + bb.note("Will checkout in %s" % "${S}" ) } SRC_URI = "git://git.linphone.org/polarssl.git"