From 4bbb8117ffddf33087ee5d774236d25389f2b2f9 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 1 Apr 2014 16:54:27 +0200 Subject: [PATCH 1/6] osmocom: Upgrade the GNU Smalltalk Osmocom sub projects to the latest version --- recipes-smalltalk/osmocom/osmo-st-asn1_git.bb | 2 +- recipes-smalltalk/osmocom/osmo-st-core_git.bb | 2 +- recipes-smalltalk/osmocom/osmo-st-gsm_git.bb | 2 +- recipes-smalltalk/osmocom/osmo-st-logging_git.bb | 2 +- recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb | 2 +- recipes-smalltalk/osmocom/osmo-st-msc_git.bb | 2 +- recipes-smalltalk/osmocom/osmo-st-network_git.bb | 2 +- recipes-smalltalk/osmocom/osmo-st-sip_git.bb | 2 +- recipes-smalltalk/osmocom/osmo-st-testphone_git.bb | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/recipes-smalltalk/osmocom/osmo-st-asn1_git.bb b/recipes-smalltalk/osmocom/osmo-st-asn1_git.bb index cf5a74ee44..4513e84f89 100644 --- a/recipes-smalltalk/osmocom/osmo-st-asn1_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-asn1_git.bb @@ -10,6 +10,6 @@ RDEPENDS_${PN} += "osmo-st-core osmo-st-logging" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-asn1;protocol=git;branch=master" -SRCREV = "59f3d7ac47c39eef88fa186531d706e844e19bb5" +SRCREV = "4e3227730b0f8e48fc4513d0d614d90f52531678" PV = "0.0.1+gitr${SRCPV}" PR = "${INC_PR}.1" diff --git a/recipes-smalltalk/osmocom/osmo-st-core_git.bb b/recipes-smalltalk/osmocom/osmo-st-core_git.bb index 46253502d3..f87203c028 100644 --- a/recipes-smalltalk/osmocom/osmo-st-core_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-core_git.bb @@ -10,6 +10,6 @@ RDEPENDS_${PN} += "osmo-st-logging" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-core;protocol=git;branch=master" -SRCREV = "2b81cc18c6cd29c8d944a3d8c152c4a19ff882c0" +SRCREV = "9e0df13ec7f54813129f5f9851cb233445455608" PV = "0.0.1+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-smalltalk/osmocom/osmo-st-gsm_git.bb b/recipes-smalltalk/osmocom/osmo-st-gsm_git.bb index c8dc75354b..b6d59f7947 100644 --- a/recipes-smalltalk/osmocom/osmo-st-gsm_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-gsm_git.bb @@ -10,6 +10,6 @@ RDEPENDS_${PN} += "osmo-st-core osmo-st-network osmo-st-logging" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-gsm;protocol=git;branch=master" -SRCREV = "0c196f0c55ff1f6cdeb390e11a302a3e44e278b4" +SRCREV = "15be4f4af2f935412305f9e2af0d6a142b2a2093" PV = "0.0.1+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-smalltalk/osmocom/osmo-st-logging_git.bb b/recipes-smalltalk/osmocom/osmo-st-logging_git.bb index 1c58a83507..db43efa016 100644 --- a/recipes-smalltalk/osmocom/osmo-st-logging_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-logging_git.bb @@ -8,6 +8,6 @@ require smalltalk-package.inc S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-logging;protocol=git;branch=master" -SRCREV = "39eeb846821a2b1e6b0eb1c932eb4c1326db8a28" +SRCREV = "f900c8fc6ef9b7ff54f0d57d092ac6b9d175460b" PV = "0.0.2+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb b/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb index 121b84d4d8..be8a9e53fa 100644 --- a/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb @@ -10,6 +10,6 @@ RDEPENDS_${PN} += "osmo-st-logging osmo-st-core petitparser" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-mgcp;protocol=git;branch=master" -SRCREV = "ca0d7624a8320a452e7071c99063d319aa34aed1" +SRCREV = "be46bf5b3592a58f5d9f3aa6946da9aca7c6544a" PV = "0.0.1+gitr${SRCPV}" PR = "${INC_PR}.1" diff --git a/recipes-smalltalk/osmocom/osmo-st-msc_git.bb b/recipes-smalltalk/osmocom/osmo-st-msc_git.bb index 037ec337ea..d3df5a3d30 100644 --- a/recipes-smalltalk/osmocom/osmo-st-msc_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-msc_git.bb @@ -10,6 +10,6 @@ RDEPENDS_${PN} += "osmo-st-logging osmo-st-network osmo-st-gsm osmo-st-core" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-msc;protocol=git;branch=master" -SRCREV = "37c768d3cb650fec0b004d163ec2ac3763dc583e" +SRCREV = "b880a9907011c4f1e37b7c3cc8e4549a6520f5a1" PV = "0.0.1+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-smalltalk/osmocom/osmo-st-network_git.bb b/recipes-smalltalk/osmocom/osmo-st-network_git.bb index a2a7303aa8..4fa285a734 100644 --- a/recipes-smalltalk/osmocom/osmo-st-network_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-network_git.bb @@ -10,6 +10,6 @@ RDEPENDS_${PN} += "osmo-st-logging osmo-st-core" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-network;protocol=git;branch=master" -SRCREV = "17ee24015f152322b73bdb769a5ce35152f71044" +SRCREV = "abbad4a7afb4ee93a559e7a89a82235c43378c71" PV = "0.0.2+gitr${SRCPV}" PR = "${INC_PR}.1" diff --git a/recipes-smalltalk/osmocom/osmo-st-sip_git.bb b/recipes-smalltalk/osmocom/osmo-st-sip_git.bb index e26be4ef8e..0d22dcde0e 100644 --- a/recipes-smalltalk/osmocom/osmo-st-sip_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-sip_git.bb @@ -10,6 +10,6 @@ RDEPENDS_${PN} += "osmo-st-core osmo-st-logging petitparser" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-sip;protocol=git;branch=master" -SRCREV = "c9bed5b2353518d4d73272006511f4bfecab01ae" +SRCREV = "2020d4cdf4363f176374efea370e0719839eb91d" PV = "0.0.1+gitr${SRCPV}" PR = "${INC_PR}.1" diff --git a/recipes-smalltalk/osmocom/osmo-st-testphone_git.bb b/recipes-smalltalk/osmocom/osmo-st-testphone_git.bb index c1c85c1e0c..6848b6bc33 100644 --- a/recipes-smalltalk/osmocom/osmo-st-testphone_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-testphone_git.bb @@ -10,6 +10,6 @@ RDEPENDS_${PN} += "osmo-st-network osmo-st-logging osmo-st-gsm osmo-st-core" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-testphone;protocol=git;branch=master" -SRCREV = "41fcc5d89938a1b2f246c8ff67f3d8482bcd1529" +SRCREV = "98a9d07856671daf934aa0029f3bebcc13a06f9d" PV = "0.0.1+gitr${SRCPV}" PR = "${INC_PR}.1" From a9f6d1eac6b6b9cc0e0ecab7592da8fa225f6bbb Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 21 Apr 2014 18:36:28 +0200 Subject: [PATCH 2/6] libsigsegv: Use a shared library for libsigsegv This helps with the -fPIC situation on AMD64. Simply build it as a shared library and the problems go away. --- recipes-gnu/libsigsegv/libsigsegv_2.10.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-gnu/libsigsegv/libsigsegv_2.10.bb b/recipes-gnu/libsigsegv/libsigsegv_2.10.bb index 5ec9323fe8..af2f64ab39 100644 --- a/recipes-gnu/libsigsegv/libsigsegv_2.10.bb +++ b/recipes-gnu/libsigsegv/libsigsegv_2.10.bb @@ -8,9 +8,11 @@ SRC_URI = "${GNU_MIRROR}/libsigsegv/libsigsegv-2.10.tar.gz" SRC_URI[md5sum] = "7f96fb1f65b3b8cbc1582fb7be774f0f" SRC_URI[sha256sum] = "8460a4a3dd4954c3d96d7a4f5dd5bc4d9b76f5754196aa245287553b26d2199a" -PR = "r1" +PR = "r2" inherit autotools BBCLASSEXTEND = "native" + +EXTRA_OECONF += " --enable-shared " From 3bf09d53b833374b0e0dc2fc7488849df27fc89a Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 21 Apr 2014 20:25:20 +0200 Subject: [PATCH 3/6] smalltalk: Package smalltalk-xml separately --- recipes-smalltalk/smalltalk/smalltalk.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/recipes-smalltalk/smalltalk/smalltalk.inc b/recipes-smalltalk/smalltalk/smalltalk.inc index d72d69702b..345a74b1e5 100644 --- a/recipes-smalltalk/smalltalk/smalltalk.inc +++ b/recipes-smalltalk/smalltalk/smalltalk.inc @@ -2,15 +2,15 @@ DESCRIPTION = "GNU Smalltalk." HOMEPAGE = "http://smalltalk.gnu.org/" LICENSE = "GPLv2+" -INC_PR = "11" +INC_PR = "12" -DEPENDS = "smalltalk-native gnutls readline libsigsegv libtool libffi zip-native" +DEPENDS = "smalltalk-native gnutls readline libsigsegv libtool libffi zip-native expat " DEPENDS_virtclass-native = "gnutls-native libffi-native libsigsegv-native" EXTRA_OECONF = "--disable-static --disable-gtk --without-x --without-opengl --with-tcl=/bin/false --with-tk=/bin/false --without-emacs gst_cv_libc_dlopen_works=hacked gst_cv_readline_libs='-lreadline'" PACKAGES =+ "${PN}-digest ${PN}-expat ${PN}-iconv ${PN}-i18n ${PN}-gdbm ${PN}-sdl \ ${PN}-sqlite ${PN}-seaside ${PN}-magritte ${PN}-magritte-seaside ${PN}-examples \ - ${PN}-zlib" + ${PN}-xml ${PN}-zlib" # skip dev-so for plugins INSANE_SKIP_${PN}-digest = "dev-so" @@ -20,6 +20,7 @@ INSANE_SKIP_${PN}-i18n = "dev-so" INSANE_SKIP_${PN}-gdbm = "dev-so" INSANE_SKIP_${PN}-sdl = "dev-so" INSANE_SKIP_${PN}-sqlite = "dev-so" +INSANE_SKIP_${PN}-xml = "dev-so" INSANE_SKIP_${PN}-zlib = "dev-so" # gst-tool and such @@ -44,6 +45,7 @@ FILES_${PN}-static += "${libdir}/smalltalk/lib*.a" FILES_${PN}-seaside = "${datadir}/smalltalk/Seaside*.star" FILES_${PN}-magritte = "${datadir}/smalltalk/Magritte.star" FILES_${PN}-magritte-seaside = "${datadir}/smalltalk/Magritte-Seaside.star" +FILES_${PN}-xml = "${datadir}/smalltalk/XML*.star ${datadir}/smalltalk/XPath.star ${datadir}/smalltalk/XSL.star ${libdir}/smalltalk/expat-*.so" FILES_${PN}-zlib = "${libdir}/smalltalk/zlib*.so \ ${datadir}/smalltalk/ZLib.star" From 93ab0e720adb7613a2c489f4657c8985d85e64ad Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 4 Jun 2014 16:03:07 +0200 Subject: [PATCH 4/6] recipes-osmo: Upgrade various components to the latest master version --- recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb | 2 +- recipes-smalltalk/osmocom/osmo-st-msc_git.bb | 2 +- recipes-smalltalk/osmocom/osmo-st-network_git.bb | 2 +- recipes-smalltalk/osmocom/osmo-st-sip_git.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb b/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb index be8a9e53fa..20342cf0ab 100644 --- a/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb @@ -10,6 +10,6 @@ RDEPENDS_${PN} += "osmo-st-logging osmo-st-core petitparser" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-mgcp;protocol=git;branch=master" -SRCREV = "be46bf5b3592a58f5d9f3aa6946da9aca7c6544a" +SRCREV = "afb53fc0d0e549ede7b3784c15bc207f59bee5f1" PV = "0.0.1+gitr${SRCPV}" PR = "${INC_PR}.1" diff --git a/recipes-smalltalk/osmocom/osmo-st-msc_git.bb b/recipes-smalltalk/osmocom/osmo-st-msc_git.bb index d3df5a3d30..50739919a6 100644 --- a/recipes-smalltalk/osmocom/osmo-st-msc_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-msc_git.bb @@ -10,6 +10,6 @@ RDEPENDS_${PN} += "osmo-st-logging osmo-st-network osmo-st-gsm osmo-st-core" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-msc;protocol=git;branch=master" -SRCREV = "b880a9907011c4f1e37b7c3cc8e4549a6520f5a1" +SRCREV = "befb7a50f7c032e5ca4d8a992d6176983b5177f7" PV = "0.0.1+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-smalltalk/osmocom/osmo-st-network_git.bb b/recipes-smalltalk/osmocom/osmo-st-network_git.bb index 4fa285a734..28d079614e 100644 --- a/recipes-smalltalk/osmocom/osmo-st-network_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-network_git.bb @@ -10,6 +10,6 @@ RDEPENDS_${PN} += "osmo-st-logging osmo-st-core" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-network;protocol=git;branch=master" -SRCREV = "abbad4a7afb4ee93a559e7a89a82235c43378c71" +SRCREV = "cb55eb5dcf67fbe1ca02e12cd3ccc25df4847ee2" PV = "0.0.2+gitr${SRCPV}" PR = "${INC_PR}.1" diff --git a/recipes-smalltalk/osmocom/osmo-st-sip_git.bb b/recipes-smalltalk/osmocom/osmo-st-sip_git.bb index 0d22dcde0e..c1b8289084 100644 --- a/recipes-smalltalk/osmocom/osmo-st-sip_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-sip_git.bb @@ -10,6 +10,6 @@ RDEPENDS_${PN} += "osmo-st-core osmo-st-logging petitparser" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-sip;protocol=git;branch=master" -SRCREV = "2020d4cdf4363f176374efea370e0719839eb91d" +SRCREV = "8b626c8a52cf5bf5d35f62cad75d701d67f345b9" PV = "0.0.1+gitr${SRCPV}" PR = "${INC_PR}.1" From 08767f0fa1d145a0c884453f8c1b683ceed7b3cd Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 4 Jun 2014 18:58:09 +0200 Subject: [PATCH 5/6] smalltalk: Build something more recent with the netlink package --- .../no-doc.patch | 0 .../{smalltalk_3.2.91.bb => smalltalk_3.2.91.1.bb} | 12 +++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) rename recipes-smalltalk/smalltalk/{smalltalk-3.2.91 => smalltalk-3.2.91.1}/no-doc.patch (100%) rename recipes-smalltalk/smalltalk/{smalltalk_3.2.91.bb => smalltalk_3.2.91.1.bb} (68%) diff --git a/recipes-smalltalk/smalltalk/smalltalk-3.2.91/no-doc.patch b/recipes-smalltalk/smalltalk/smalltalk-3.2.91.1/no-doc.patch similarity index 100% rename from recipes-smalltalk/smalltalk/smalltalk-3.2.91/no-doc.patch rename to recipes-smalltalk/smalltalk/smalltalk-3.2.91.1/no-doc.patch diff --git a/recipes-smalltalk/smalltalk/smalltalk_3.2.91.bb b/recipes-smalltalk/smalltalk/smalltalk_3.2.91.1.bb similarity index 68% rename from recipes-smalltalk/smalltalk/smalltalk_3.2.91.bb rename to recipes-smalltalk/smalltalk/smalltalk_3.2.91.1.bb index 2d649f945c..7c2fc0a6e7 100644 --- a/recipes-smalltalk/smalltalk/smalltalk_3.2.91.bb +++ b/recipes-smalltalk/smalltalk/smalltalk_3.2.91.1.bb @@ -10,15 +10,16 @@ SRC_URI = " \ file://no-doc.patch \ " -SRC_URI[md5sum] = "aa092b507d93173177eecca63e3ddd6a" -SRC_URI[sha256sum] = "662ca7364c9248a95ec0ebbd56336062d1d72a1feb8c17560f4f7d3b7aea331f" +SRC_URI[md5sum] = "d1a9b032f61bd72c4af049534b2575e4" +SRC_URI[sha256sum] = "ed56ddac79c3a10ec3cb45cf0a6377e09c1b2fb632ca49e32680d7180bc0ea3c" + LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" # glib is only in 3.2.90+ -PACKAGES =+ "${PN}-glib ${PN}-osprocess ${PN}-gtktools" +PACKAGES =+ "${PN}-glib ${PN}-osprocess ${PN}-netlink" INSANE_SKIP_${PN}-glib = "dev-so useless-rpaths" @@ -29,5 +30,6 @@ INSANE_SKIP_${PN}-osprocess = "dev-so" FILES_${PN}-osprocess = "${libdir}/smalltalk/gst-osprocess*.so \ ${datadir}/smalltalk/OSProcess.star" -INSANE_SKIP_${PN}-gtktools = "dev-so" -FILES_${PN}-gtktools = "${datadir}/smalltalk/GTKTools*.star" +INSANE_SKIP_${PN}-netlink = "dev-so" +FILES_${PN}-netlink = "${libdir}/smalltalk/netlink*.so \ + ${datadir}/smalltalk/Netlink*.star" From 063ce69bb6a9cebcf05efd64a4bc1564ec1a32a3 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 19 Jun 2014 12:54:06 +0200 Subject: [PATCH 6/6] osmocom: Update the GSM, MGCP and SIP repositories to the latest version --- recipes-smalltalk/osmocom/osmo-st-gsm_git.bb | 2 +- recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb | 2 +- recipes-smalltalk/osmocom/osmo-st-sip_git.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-smalltalk/osmocom/osmo-st-gsm_git.bb b/recipes-smalltalk/osmocom/osmo-st-gsm_git.bb index b6d59f7947..aa10ad7596 100644 --- a/recipes-smalltalk/osmocom/osmo-st-gsm_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-gsm_git.bb @@ -10,6 +10,6 @@ RDEPENDS_${PN} += "osmo-st-core osmo-st-network osmo-st-logging" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-gsm;protocol=git;branch=master" -SRCREV = "15be4f4af2f935412305f9e2af0d6a142b2a2093" +SRCREV = "00ee3d0ea0cda615ba58705d08380a116193743d" PV = "0.0.1+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb b/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb index 20342cf0ab..0f9f3f4288 100644 --- a/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb @@ -10,6 +10,6 @@ RDEPENDS_${PN} += "osmo-st-logging osmo-st-core petitparser" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-mgcp;protocol=git;branch=master" -SRCREV = "afb53fc0d0e549ede7b3784c15bc207f59bee5f1" +SRCREV = "08ebcfdab3cd161bb111851bbb5d74f80aff97d0" PV = "0.0.1+gitr${SRCPV}" PR = "${INC_PR}.1" diff --git a/recipes-smalltalk/osmocom/osmo-st-sip_git.bb b/recipes-smalltalk/osmocom/osmo-st-sip_git.bb index c1b8289084..548e2f3164 100644 --- a/recipes-smalltalk/osmocom/osmo-st-sip_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-sip_git.bb @@ -10,6 +10,6 @@ RDEPENDS_${PN} += "osmo-st-core osmo-st-logging petitparser" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-sip;protocol=git;branch=master" -SRCREV = "8b626c8a52cf5bf5d35f62cad75d701d67f345b9" +SRCREV = "eb578aa93e3bc6ddabac0c1a669eb4f700686e96" PV = "0.0.1+gitr${SRCPV}" PR = "${INC_PR}.1"