From 76bc1af6c675d77984b7ef832d9ace20c8f92f23 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 24 Sep 2014 15:33:25 +0200 Subject: [PATCH 1/4] sofia-sip: Add missing checksums needed for dora and later --- recipes-misc/sofia-sip/sofia-sip_1.12.11.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes-misc/sofia-sip/sofia-sip_1.12.11.bb b/recipes-misc/sofia-sip/sofia-sip_1.12.11.bb index 4c3eff14df..7d8bb85ec4 100644 --- a/recipes-misc/sofia-sip/sofia-sip_1.12.11.bb +++ b/recipes-misc/sofia-sip/sofia-sip_1.12.11.bb @@ -1,3 +1,6 @@ require sofia-sip.inc PR = "r1" + +SRC_URI[md5sum] = "f3582c62080eeecd3fa4cd5d4ccb4225" +SRC_URI[sha256sum] = "2b01bc2e1826e00d1f7f57d29a2854b15fd5fe24695e47a14a735d195dd37c81" From c2f0b660efca0f13ba3d662efdd9303ad5bdb576 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 24 Sep 2014 15:34:38 +0200 Subject: [PATCH 2/4] libosmo-abis/libosmocore/libosmo-sccp: Kill old releases These are ancient versions and I don't think anybody is using them anymore. In general we are building the latest version from git. --- recipes-osmocom/libosmo-abis/libosmo-abis_0.0.6.bb | 11 ----------- recipes-osmocom/libosmo-abis/libosmo-abis_0.0.8.bb | 11 ----------- recipes-osmocom/libosmo-abis/libosmo-abis_0.1.0.bb | 11 ----------- recipes-osmocom/libosmo-abis/libosmo-abis_0.1.1.bb | 11 ----------- recipes-osmocom/libosmo-abis/libosmo-abis_0.1.3.bb | 11 ----------- recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.5.1.bb | 11 ----------- recipes-osmocom/libosmocore/libosmocore_0.3.1.bb | 11 ----------- recipes-osmocom/libosmocore/libosmocore_0.3.10.bb | 11 ----------- recipes-osmocom/libosmocore/libosmocore_0.3.4+35.bb | 11 ----------- recipes-osmocom/libosmocore/libosmocore_0.3.4.bb | 11 ----------- recipes-osmocom/libosmocore/libosmocore_0.3.8.bb | 11 ----------- recipes-osmocom/libosmocore/libosmocore_0.3.9.bb | 11 ----------- recipes-osmocom/libosmocore/libosmocore_0.4.1.bb | 11 ----------- recipes-osmocom/libosmocore/libosmocore_0.5.3.bb | 11 ----------- 14 files changed, 154 deletions(-) delete mode 100644 recipes-osmocom/libosmo-abis/libosmo-abis_0.0.6.bb delete mode 100644 recipes-osmocom/libosmo-abis/libosmo-abis_0.0.8.bb delete mode 100644 recipes-osmocom/libosmo-abis/libosmo-abis_0.1.0.bb delete mode 100644 recipes-osmocom/libosmo-abis/libosmo-abis_0.1.1.bb delete mode 100644 recipes-osmocom/libosmo-abis/libosmo-abis_0.1.3.bb delete mode 100644 recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.5.1.bb delete mode 100644 recipes-osmocom/libosmocore/libosmocore_0.3.1.bb delete mode 100644 recipes-osmocom/libosmocore/libosmocore_0.3.10.bb delete mode 100644 recipes-osmocom/libosmocore/libosmocore_0.3.4+35.bb delete mode 100644 recipes-osmocom/libosmocore/libosmocore_0.3.4.bb delete mode 100644 recipes-osmocom/libosmocore/libosmocore_0.3.8.bb delete mode 100644 recipes-osmocom/libosmocore/libosmocore_0.3.9.bb delete mode 100644 recipes-osmocom/libosmocore/libosmocore_0.4.1.bb delete mode 100644 recipes-osmocom/libosmocore/libosmocore_0.5.3.bb diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_0.0.6.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_0.0.6.bb deleted file mode 100644 index 362fc85281..0000000000 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_0.0.6.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "346374a001ba42e8d3612fefd76a061f4d494a34" -SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" -PR = "${INC_PR}.1" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_0.0.8.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_0.0.8.bb deleted file mode 100644 index d2a25b254b..0000000000 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_0.0.8.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "65a50893d5f9577c17dc4485d585c12d349c8e30" -SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" -PR = "${INC_PR}.1" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.0.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.0.bb deleted file mode 100644 index 74a8481da6..0000000000 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "fe05cf5b3980bf4778a21b3d311a835b7e19a704" -SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" -PR = "${INC_PR}.5" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.1.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.1.bb deleted file mode 100644 index 358f1fbfc4..0000000000 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "55467f0478e37b35cceec3051c645b8a407110bc" -SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" -PR = "${INC_PR}.0" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.3.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.3.bb deleted file mode 100644 index a83e502fea..0000000000 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.3.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "e5ae7f52175411a498ed30560624d0abed0feed7" -SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" -PR = "${INC_PR}.0" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.5.1.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.5.1.bb deleted file mode 100644 index 342c105342..0000000000 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.5.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "8be06bc2885460d6a6ed7c9daa7df8ab8f02a2dc" -SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git" -PR = "${INC_PR}.0" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmocore/libosmocore_0.3.1.bb b/recipes-osmocom/libosmocore/libosmocore_0.3.1.bb deleted file mode 100644 index 8c4dce261a..0000000000 --- a/recipes-osmocom/libosmocore/libosmocore_0.3.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "ee50081daa3a80586f3044056517337a8e8fac9f" -SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PR = "${INC_PR}.0" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmocore/libosmocore_0.3.10.bb b/recipes-osmocom/libosmocore/libosmocore_0.3.10.bb deleted file mode 100644 index bb16132bed..0000000000 --- a/recipes-osmocom/libosmocore/libosmocore_0.3.10.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "c7ddbe63da535e62f9a10444f8966bf0a6565a74" -SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PR = "${INC_PR}.2" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmocore/libosmocore_0.3.4+35.bb b/recipes-osmocom/libosmocore/libosmocore_0.3.4+35.bb deleted file mode 100644 index 55b8a1a4a0..0000000000 --- a/recipes-osmocom/libosmocore/libosmocore_0.3.4+35.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "7e1a622124a6ca6c98e1f3170bf65649ad4321d9" -SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PR = "${INC_PR}.0" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmocore/libosmocore_0.3.4.bb b/recipes-osmocom/libosmocore/libosmocore_0.3.4.bb deleted file mode 100644 index 0f145474ea..0000000000 --- a/recipes-osmocom/libosmocore/libosmocore_0.3.4.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "8264e09ca2f3bd93eba5eefa342267f303085629" -SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PR = "${INC_PR}.0" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmocore/libosmocore_0.3.8.bb b/recipes-osmocom/libosmocore/libosmocore_0.3.8.bb deleted file mode 100644 index 18eb80a52a..0000000000 --- a/recipes-osmocom/libosmocore/libosmocore_0.3.8.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "ee876c91723267d913a12e76f46bd537700ab9e9" -SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PR = "${INC_PR}.0" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmocore/libosmocore_0.3.9.bb b/recipes-osmocom/libosmocore/libosmocore_0.3.9.bb deleted file mode 100644 index 22aaba5fb1..0000000000 --- a/recipes-osmocom/libosmocore/libosmocore_0.3.9.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "d61d517a2e35f482519561bd325652ee7144679a" -SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PR = "${INC_PR}.0" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmocore/libosmocore_0.4.1.bb b/recipes-osmocom/libosmocore/libosmocore_0.4.1.bb deleted file mode 100644 index 2541c0d568..0000000000 --- a/recipes-osmocom/libosmocore/libosmocore_0.4.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "72bd4eb3b9e674d771d911e27cacb45468d51487" -SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PR = "${INC_PR}.0" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmocore/libosmocore_0.5.3.bb b/recipes-osmocom/libosmocore/libosmocore_0.5.3.bb deleted file mode 100644 index d7b84d8de2..0000000000 --- a/recipes-osmocom/libosmocore/libosmocore_0.5.3.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "335aedabf204ac025a79801c15c8488d35cc9981" -SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PR = "${INC_PR}.0" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} From 4539293919faa9e9fbbf0509198dcd59f1156c7a Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 24 Sep 2014 16:22:05 +0200 Subject: [PATCH 3/4] lcr: Remove directory as it ends in /run when being packaged ERROR: QA Issue: asterisk: Files/directories were installed but not shipped /run /run/asterisk --- recipes-isdn/asterisk/asterisk_1.8.8.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-isdn/asterisk/asterisk_1.8.8.1.bb b/recipes-isdn/asterisk/asterisk_1.8.8.1.bb index f31ae33f43..5162853881 100644 --- a/recipes-isdn/asterisk/asterisk_1.8.8.1.bb +++ b/recipes-isdn/asterisk/asterisk_1.8.8.1.bb @@ -84,4 +84,6 @@ do_install_append() { install -m 0775 ${WORKDIR}/asterisk.init ${D}${sysconfdir}/init.d/asterisk install -m 0660 ${WORKDIR}/modules.conf ${D}${sysconfdir}/asterisk/ + + rm -rf ${D}/var/run } From 84edb39d87f0b13ae27c92a3fe8635a3051d26a5 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 24 Sep 2014 17:25:56 +0200 Subject: [PATCH 4/4] lcr: Fix the packaging on dora The asterisk package should not include debug symbols --- recipes-isdn/lcr/lcr_git.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes-isdn/lcr/lcr_git.bb b/recipes-isdn/lcr/lcr_git.bb index ab0837563e..a5d71e42fb 100644 --- a/recipes-isdn/lcr/lcr_git.bb +++ b/recipes-isdn/lcr/lcr_git.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=de9327a12ae1ccc94dade892a360f996" PV = "1.14+gitr${SRCPV}" -PR = "r2" +PR = "r3" SRCREV = "38fce218f8897d120aeba56e811ef7dada898c2c" SRC_URI = "git://git.misdn.eu/lcr.git \ @@ -19,7 +19,7 @@ inherit autotools update-rc.d PACKAGES =+ "${PN}-tones-de ${PN}-vbox-de \ ${PN}-tones-en ${PN}-vbox-en \ - ${PN}-asterisk" + ${PN}-asterisk-dbg ${PN}-asterisk" CONFFILES_${PN} = "${sysconfdir}/lcr/options.conf" INITSCRIPT_PACKAGES = "${PN}" @@ -31,6 +31,7 @@ FILES_${PN}-tones-en = "/usr/share/lcr/tones_american" FILES_${PN}-vbox-de = "/usr/share/lcr/vbox_german" FILES_${PN}-vbox-en = "/usr/share/lcr/vbox_english" FILES_${PN}-asterisk = "/usr/lib/asterisk/modules/chan_lcr.so" +FILES_${PN}-asterisk-dbg = "/usr/lib/asterisk/modules/.debug/chan_lcr.so" do_install_append() {