From 7563b0a378c7f26fbcffe839758449fa8d88045c Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 4 Jan 2013 06:32:56 +0800 Subject: [PATCH 01/29] smalltalk: Introduce the code from an internal git repository --- .../smalltalk/osmo-st-asn1_git.bb | 11 +++ .../smalltalk/osmo-st-core_git.bb | 13 +++ .../smalltalk/osmo-st-gsm_git.bb | 13 +++ .../smalltalk/osmo-st-logging_git.bb | 11 +++ .../smalltalk/osmo-st-mgcp_git.bb | 13 +++ .../smalltalk/osmo-st-msc_git.bb | 13 +++ .../smalltalk/osmo-st-network_git.bb | 13 +++ .../smalltalk/osmo-st-sip_git.bb | 11 +++ .../smalltalk/osmo-st-testphone_git.bb | 13 +++ .../smalltalk/petitparser-tests_git.bb | 13 +++ .../smalltalk/petitparser_git.bb | 11 +++ .../smalltalk/smalltalk-package.inc | 17 ++++ .../fix_clock_behavior_across_image.patch | 91 +++++++++++++++++++ .../smalltalk/smalltalk/fix_fd_resume.patch | 17 ++++ .../smalltalk/gst-remote-hostname.patch | 37 ++++++++ .../smalltalk/gst-remote-resume.patch | 78 ++++++++++++++++ .../smalltalk/smalltalk/gst-remote-typo.patch | 46 ++++++++++ .../smalltalk/smalltalk_3.2.4.bb | 51 +++++++++++ recipes-smalltalk/smalltalk/soapopera_git.bb | 11 +++ 19 files changed, 483 insertions(+) create mode 100644 recipes-smalltalk/smalltalk/osmo-st-asn1_git.bb create mode 100644 recipes-smalltalk/smalltalk/osmo-st-core_git.bb create mode 100644 recipes-smalltalk/smalltalk/osmo-st-gsm_git.bb create mode 100644 recipes-smalltalk/smalltalk/osmo-st-logging_git.bb create mode 100644 recipes-smalltalk/smalltalk/osmo-st-mgcp_git.bb create mode 100644 recipes-smalltalk/smalltalk/osmo-st-msc_git.bb create mode 100644 recipes-smalltalk/smalltalk/osmo-st-network_git.bb create mode 100644 recipes-smalltalk/smalltalk/osmo-st-sip_git.bb create mode 100644 recipes-smalltalk/smalltalk/osmo-st-testphone_git.bb create mode 100644 recipes-smalltalk/smalltalk/petitparser-tests_git.bb create mode 100644 recipes-smalltalk/smalltalk/petitparser_git.bb create mode 100644 recipes-smalltalk/smalltalk/smalltalk-package.inc create mode 100644 recipes-smalltalk/smalltalk/smalltalk/fix_clock_behavior_across_image.patch create mode 100644 recipes-smalltalk/smalltalk/smalltalk/fix_fd_resume.patch create mode 100644 recipes-smalltalk/smalltalk/smalltalk/gst-remote-hostname.patch create mode 100644 recipes-smalltalk/smalltalk/smalltalk/gst-remote-resume.patch create mode 100644 recipes-smalltalk/smalltalk/smalltalk/gst-remote-typo.patch create mode 100644 recipes-smalltalk/smalltalk/smalltalk_3.2.4.bb create mode 100644 recipes-smalltalk/smalltalk/soapopera_git.bb diff --git a/recipes-smalltalk/smalltalk/osmo-st-asn1_git.bb b/recipes-smalltalk/smalltalk/osmo-st-asn1_git.bb new file mode 100644 index 0000000000..d15a72a75c --- /dev/null +++ b/recipes-smalltalk/smalltalk/osmo-st-asn1_git.bb @@ -0,0 +1,11 @@ +DESCRITOPN = "ASN1 Code to work on TCAP/MAP/Camel..." +HOMEPAGE = "http://osmocom.org" + +require smalltalk-package.inc + +S = "${WORKDIR}/git" +SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-asn1;protocol=git;branch=master" +SRCREV = "b77da9be3fd1bc1e2327a3941b47dee69660da56" +PV = "0.0.1+gitr${SRCREV}" +PR = "${INC_PR}.0" + diff --git a/recipes-smalltalk/smalltalk/osmo-st-core_git.bb b/recipes-smalltalk/smalltalk/osmo-st-core_git.bb new file mode 100644 index 0000000000..efe0f1be1e --- /dev/null +++ b/recipes-smalltalk/smalltalk/osmo-st-core_git.bb @@ -0,0 +1,13 @@ +DESCRITOPN = "" +HOMEPAGE = "http://osmocom.org" + +require smalltalk-package.inc + +RDEPENDS += "osmo-st-logging" + +S = "${WORKDIR}/git" +SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-core;protocol=git;branch=master" +SRCREV = "22f6836925cb1c682045497d214773a3d04e60b2" +PV = "0.0.1+gitr${SRCREV}" +PR = "${INC_PR}.0" + diff --git a/recipes-smalltalk/smalltalk/osmo-st-gsm_git.bb b/recipes-smalltalk/smalltalk/osmo-st-gsm_git.bb new file mode 100644 index 0000000000..e1ddb1080b --- /dev/null +++ b/recipes-smalltalk/smalltalk/osmo-st-gsm_git.bb @@ -0,0 +1,13 @@ +DESCRITOPN = "GSM utilities based on osmo-network for SCCP,BSSAP,BSSMAP,GSM48" +HOMEPAGE = "http://osmocom.org" + +require smalltalk-package.inc + +RDEPENDS += "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 = "66bbafcf373af876eb6b590603e9485094ecebc1" +PV = "0.0.1+gitr${SRCREV}" +PR = "${INC_PR}.0" + diff --git a/recipes-smalltalk/smalltalk/osmo-st-logging_git.bb b/recipes-smalltalk/smalltalk/osmo-st-logging_git.bb new file mode 100644 index 0000000000..5f9b2cf90b --- /dev/null +++ b/recipes-smalltalk/smalltalk/osmo-st-logging_git.bb @@ -0,0 +1,11 @@ +DESCRITOPN = "A Smalltalk logging framework inspired by libosmocore's logging facilities" +HOMEPAGE = "http://osmocom.org" + +require smalltalk-package.inc + +S = "${WORKDIR}/git" +SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-logging;protocol=git;branch=master" +SRCREV = "39eeb846821a2b1e6b0eb1c932eb4c1326db8a28" +PV = "0.0.2+gitr${SRCREV}" +PR = "${INC_PR}.0" + diff --git a/recipes-smalltalk/smalltalk/osmo-st-mgcp_git.bb b/recipes-smalltalk/smalltalk/osmo-st-mgcp_git.bb new file mode 100644 index 0000000000..0141a04a55 --- /dev/null +++ b/recipes-smalltalk/smalltalk/osmo-st-mgcp_git.bb @@ -0,0 +1,13 @@ +DESCRITOPN = "This is a MGCP CallAgent written in Smalltalk" +HOMEPAGE = "http://osmocom.org" + +require smalltalk-package.inc + +RDEPENDS += "osmo-st-logging osmo-st-core" + +S = "${WORKDIR}/git" +SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-mgcp;protocol=git;branch=master" +SRCREV = "e84e9ce915d91030cf97fd9d23c42d4d92729f67" +PV = "0.0.1+gitr${SRCREV}" +PR = "${INC_PR}.0" + diff --git a/recipes-smalltalk/smalltalk/osmo-st-msc_git.bb b/recipes-smalltalk/smalltalk/osmo-st-msc_git.bb new file mode 100644 index 0000000000..fafd53531a --- /dev/null +++ b/recipes-smalltalk/smalltalk/osmo-st-msc_git.bb @@ -0,0 +1,13 @@ +DESCRITOPN = "This is a simple MSC done in Smalltalk" +HOMEPAGE = "http://osmocom.org" + +require smalltalk-package.inc + +RDEPENDS += "osmo-st-logging osmo-st-network osmo-st-gsm" + +S = "${WORKDIR}/git" +SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-msc;protocol=git;branch=master" +SRCREV = "acef6cb076874ec187fbc4757201bc9e825f8856" +PV = "0.0.1+gitr${SRCREV}" +PR = "${INC_PR}.0" + diff --git a/recipes-smalltalk/smalltalk/osmo-st-network_git.bb b/recipes-smalltalk/smalltalk/osmo-st-network_git.bb new file mode 100644 index 0000000000..aa37cba248 --- /dev/null +++ b/recipes-smalltalk/smalltalk/osmo-st-network_git.bb @@ -0,0 +1,13 @@ +DESCRITOPN = "osmo-network a module for networking (SCCP, M3UA, IPA) protocol handling" +HOMEPAGE = "http://osmocom.org" + +require smalltalk-package.inc + +RDEPENDS += "osmo-st-logging" + +S = "${WORKDIR}/git" +SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-network;protocol=git;branch=master" +SRCREV = "d7b2323602771681119bdb0507de3fc58f519aae" +PV = "0.0.2+gitr${SRCREV}" +PR = "${INC_PR}.0" + diff --git a/recipes-smalltalk/smalltalk/osmo-st-sip_git.bb b/recipes-smalltalk/smalltalk/osmo-st-sip_git.bb new file mode 100644 index 0000000000..f92cefd405 --- /dev/null +++ b/recipes-smalltalk/smalltalk/osmo-st-sip_git.bb @@ -0,0 +1,11 @@ +DESCRITOPN = "" +HOMEPAGE = "http://osmocom.org" + +require smalltalk-package.inc + +S = "${WORKDIR}/git" +SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-sip;protocol=git;branch=master" +SRCREV = "e134b1e825206b6cc08ab5a24c3f82e40e0f65ac" +PV = "0.0.1+gitr${SRCREV}" +PR = "${INC_PR}.0" + diff --git a/recipes-smalltalk/smalltalk/osmo-st-testphone_git.bb b/recipes-smalltalk/smalltalk/osmo-st-testphone_git.bb new file mode 100644 index 0000000000..efe846730c --- /dev/null +++ b/recipes-smalltalk/smalltalk/osmo-st-testphone_git.bb @@ -0,0 +1,13 @@ +DESCRITOPN = "A simple test phone to do a LU and place a call" +HOMEPAGE = "http://osmocom.org" + +require smalltalk-package.inc + +RDEPENDS += "osmo-st-network osmo-st-logging osmo-st-gsm" + +S = "${WORKDIR}/git" +SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-testphone;protocol=git;branch=master" +SRCREV = "99841c28a6d3a50cf40fa019e8a9fd0c51f3da94" +PV = "0.0.1+gitr${SRCREV}" +PR = "${INC_PR}.0" + diff --git a/recipes-smalltalk/smalltalk/petitparser-tests_git.bb b/recipes-smalltalk/smalltalk/petitparser-tests_git.bb new file mode 100644 index 0000000000..9442b8a8eb --- /dev/null +++ b/recipes-smalltalk/smalltalk/petitparser-tests_git.bb @@ -0,0 +1,13 @@ +DESCRITOPN = "" +HOMEPAGE = "https://gitorious.org/gnu-smalltalk-ports/petitparser" + +require smalltalk-package.inc + +RDEPENDS += "petitparser" + +S = "${WORKDIR}/git" +SRC_URI = "git://gitorious.org/gnu-smalltalk-ports/petitparser-tests.git;protocol=git;branch=master" +SRCREV = "4b112d1f1af9692807bd28ae192b1fdc69f8c564" +PV = "0.0.1+gitr${SRCREV}" +PR = "${INC_PR}.0" + diff --git a/recipes-smalltalk/smalltalk/petitparser_git.bb b/recipes-smalltalk/smalltalk/petitparser_git.bb new file mode 100644 index 0000000000..ae8c027d87 --- /dev/null +++ b/recipes-smalltalk/smalltalk/petitparser_git.bb @@ -0,0 +1,11 @@ +DESCRITOPN = "" +HOMEPAGE = "https://gitorious.org/gnu-smalltalk-ports/petitparser" + +require smalltalk-package.inc + +S = "${WORKDIR}/git" +SRC_URI = "git://gitorious.org/gnu-smalltalk-ports/petitparser.git;protocol=git;branch=master" +SRCREV = "9b76e8cf054cb6bdbc7bc5635c3126a2fefd1a85" +PV = "0.0.1+gitr${SRCREV}" +PR = "${INC_PR}.0" + diff --git a/recipes-smalltalk/smalltalk/smalltalk-package.inc b/recipes-smalltalk/smalltalk/smalltalk-package.inc new file mode 100644 index 0000000000..8e1dc0e805 --- /dev/null +++ b/recipes-smalltalk/smalltalk/smalltalk-package.inc @@ -0,0 +1,17 @@ +DEPENDS = "smalltalk" + +INC_PR="r4" + +do_compile() { + gst < /dev/null + gst-package --target-directory=. package.xml +} + +do_install () { + install -d ${D}${datadir}/smalltalk + + install -m 0644 ${S}/*.star ${D}${datadir}/smalltalk +} + +FILES_${PN} += "${datadir}/smalltalk" + diff --git a/recipes-smalltalk/smalltalk/smalltalk/fix_clock_behavior_across_image.patch b/recipes-smalltalk/smalltalk/smalltalk/fix_clock_behavior_across_image.patch new file mode 100644 index 0000000000..19286f7a20 --- /dev/null +++ b/recipes-smalltalk/smalltalk/smalltalk/fix_clock_behavior_across_image.patch @@ -0,0 +1,91 @@ +>From f711b657b29bf94792da89612328b5d32a5ebf70 Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Thu, 22 Sep 2011 10:33:36 +0200 +Subject: [PATCH] improve Delay and millisecondClock behavior across image + save + +2011-09-22 Paolo Bonzini + + * kernel/Delay.st: Restart pending delays when the image restarts. + * kernel/Time.st: Make the millisecondClockValue monotonic across + image save. + +libgst: +2011-09-22 Paolo Bonzini + + * libgst/dict.c: Add the ClockOnImageSave class variable to time. +--- + kernel/Delay.st | 8 +++++++- + kernel/Time.st | 9 +++++++-- + libgst/dict.c | 2 +- + 5 files changed, 25 insertions(+), 4 deletions(-) + +diff --git a/kernel/Delay.st b/kernel/Delay.st +index fbb46ec..65f21e9 100644 +--- a/kernel/Delay.st ++++ b/kernel/Delay.st +@@ -166,7 +166,13 @@ created.'> + sortBlock: [:d1 :d2 | d1 resumptionTime >= d2 resumptionTime]. + TimeoutSem := Semaphore new. + DelayProcess := [self runDelayProcess] forkAt: Processor timingPriority. +- TimeoutSem signal "get going" ++ ObjectMemory addDependent: self. ++ self update: #returnFromSnapshot ++ ] ++ ++ Delay class >> update: aspect [ ++ "Prime the timer event loop when the image starts running." ++ aspect == #returnFromSnapshot ifTrue: [TimeoutSem signal] + ] + + Delay class >> initialize [ +diff --git a/kernel/Time.st b/kernel/Time.st +index 71926d9..d3810e7 100644 +--- a/kernel/Time.st ++++ b/kernel/Time.st +@@ -42,6 +42,7 @@ time value, and a block execution timing facility.'> + + SecondClockAdjustment := nil. + ClockOnStartup := nil. ++ ClockOnImageSave := nil. + + Time class >> utcSecondClock [ + "Answer the number of seconds since the midnight of 1/1/1901 (unlike +@@ -143,6 +144,7 @@ time value, and a block execution timing facility.'> + + + SecondClockAdjustment := 86400 * 36159. ++ ClockOnImageSave := 0. + ObjectMemory addDependent: self + ] + +@@ -150,8 +152,11 @@ time value, and a block execution timing facility.'> + "Private - Initialize the receiver's instance variables" + + +- aspect == #returnFromSnapshot +- ifTrue: [ClockOnStartup := Time primMillisecondClock] ++ | time | ++ aspect == #returnFromSnapshot ifTrue: [ ++ ClockOnStartup := Time primMillisecondClock - ClockOnImageSave]. ++ aspect == #aboutToSnapshot ifTrue: [ ++ ClockOnImageSave := Time millisecondClock]. + ] + + Time class >> now [ +diff --git a/libgst/dict.c b/libgst/dict.c +index 806aabe..42b5b6e 100644 +--- a/libgst/dict.c ++++ b/libgst/dict.c +@@ -337,7 +337,7 @@ static const class_definition class_info[] = { + {&_gst_time_class, &_gst_magnitude_class, + GST_ISP_FIXED, false, 1, + "Time", "seconds", +- "SecondClockAdjustment ClockOnStartup", NULL }, ++ "SecondClockAdjustment ClockOnStartup ClockOnImageSave", NULL }, + + {&_gst_date_class, &_gst_magnitude_class, + GST_ISP_FIXED, false, 4, +-- +1.7.6 + diff --git a/recipes-smalltalk/smalltalk/smalltalk/fix_fd_resume.patch b/recipes-smalltalk/smalltalk/smalltalk/fix_fd_resume.patch new file mode 100644 index 0000000000..c2372be300 --- /dev/null +++ b/recipes-smalltalk/smalltalk/smalltalk/fix_fd_resume.patch @@ -0,0 +1,17 @@ +--- a/libgst/save.c ++++ b/libgst/save.c +@@ -765,6 +765,13 @@ fixup_object (OOP oop, gst_object dest, gst_object src, int numBytes) + } + } + ++ /* File descriptors are invalidated on resume. */ ++ else if (is_a_kind_of (class_oop, _gst_file_descriptor_class)) ++ { ++ gst_file_stream file = (gst_file_stream) dest; ++ file->fd = _gst_nil_oop; ++ } ++ + /* The other case is to reset CFunctionDescriptor objects, so that we'll + relink the external functions when we reload the image. */ + else if (is_a_kind_of (class_oop, _gst_c_callable_class)) +-- diff --git a/recipes-smalltalk/smalltalk/smalltalk/gst-remote-hostname.patch b/recipes-smalltalk/smalltalk/smalltalk/gst-remote-hostname.patch new file mode 100644 index 0000000000..289fe1fd65 --- /dev/null +++ b/recipes-smalltalk/smalltalk/smalltalk/gst-remote-hostname.patch @@ -0,0 +1,37 @@ +From 2fc74b9ec068a8a594bf507c5c48d61bcb63591f Mon Sep 17 00:00:00 2001 +From: Holger Hans Peter Freyther +Date: Mon, 30 May 2011 00:09:00 +0200 +Subject: [PATCH] scripts/Remote.st: Allow to specify the hostname for the bind + +Allow to bind the server to a specific address. The ServerSocket +will not attempt to resolve the string to an address. Do this before. + +2011-05-30 Holger Hans Peter Freyther + + * scripts/Remote.st: Resolve the hostname to an address to be + used by Sockets.ServerSocket>>#port:bindTo:. +--- + ChangeLog | 5 +++++ + scripts/Remote.st | 4 ++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/scripts/Remote.st b/scripts/Remote.st +index 10f228d..ec65de4 100644 +--- a/scripts/Remote.st ++++ b/scripts/Remote.st +@@ -182,10 +182,10 @@ available in the PATH of the remote machine. + opt isNil ifTrue: [ + host isNil ifFalse: [ self error: 'multiple hosts are invalid' ]. + (arg includes: $@) +- ifFalse: [ host := arg ] ++ ifFalse: [ host := TCP.SocketAddress byName: arg ] + ifTrue: [ + login isNil ifFalse: [ self error: 'multiple logins are invalid' ]. +- login := arg copyUpTo: $@. ++ login := TCP.SocketAddress byName: (arg copyUpTo: $@). + host := arg copyAfter: $@ ] ]. + ] + +-- +1.7.2.5 + diff --git a/recipes-smalltalk/smalltalk/smalltalk/gst-remote-resume.patch b/recipes-smalltalk/smalltalk/smalltalk/gst-remote-resume.patch new file mode 100644 index 0000000000..5ecb77dcd2 --- /dev/null +++ b/recipes-smalltalk/smalltalk/smalltalk/gst-remote-resume.patch @@ -0,0 +1,78 @@ +From c4915d9232edb576dfb9697501370877032288dc Mon Sep 17 00:00:00 2001 +From: Gwenael Casaccio +Date: Tue, 5 Jul 2011 10:34:48 +0200 +Subject: [PATCH 1/1] fix resumption of an image that had been created via gst-remote + +2011-08-13 Gwenael Casaccio + + * scripts/Remote.st: Suspend/resume server process across snapshots. +--- + ChangeLog | 4 ++++ + scripts/Remote.st | 37 +++++++++++++++++++++++++++++++++++-- + 2 files changed, 39 insertions(+), 2 deletions(-) + +diff --git a/scripts/Remote.st b/scripts/Remote.st +index cf383bd..39f2407 100644 +--- a/scripts/Remote.st ++++ b/scripts/Remote.st +@@ -39,6 +39,38 @@ DLD addLibrary: 'libc'. + SystemDictionary compile: ' + getpid [ ^''--pid not available'' ]' ]. + ++Object subclass: RemoteServer [ ++ ++ RemoteServer class >> new [ ++ ++ ^ super new ++ initialize; ++ yourself ++ ] ++ ++ | remoteProcess | ++ ++ initialize [ ++ ++ ++ ObjectMemory addDependent: self ++ ] ++ ++ update: aSymbol [ ++ ++ ++ aSymbol == #aboutToSnapshot ifTrue: [ ^ remoteProcess suspend ]. ++ aSymbol == #finishedSnapshot ifTrue: [ ^ remoteProcess resume ]. ++ aSymbol == #returnFromSnapshot ifTrue: [ ObjectMemory removeDependent: self ]. ++ ] ++ ++ process: aProcess [ ++ ++ ++ remoteProcess := aProcess ++ ] ++] ++ + TextCollector subclass: MultiplexingTextCollector [ + | default outputs | + initialize [ +@@ -69,7 +101,7 @@ TextCollector subclass: MultiplexingTextCollector [ + ] + ] + +-| helpString commands server port host login | ++| helpString commands server port host login remoteServer | + commands := OrderedCollection new. + server := false. + port := 12345. +@@ -207,7 +239,8 @@ available in the PATH of the remote machine. + server ifTrue: [ + PackageLoader fileInPackage: 'Compiler'. + Transcript := MultiplexingTextCollector message: Transcript message. +- [ ++ remoteServer := RemoteServer new. ++ remoteServer process: [ + | queue | + queue := TCP.ServerSocket port: port bindTo: host. + [ +-- +1.7.2.5 + diff --git a/recipes-smalltalk/smalltalk/smalltalk/gst-remote-typo.patch b/recipes-smalltalk/smalltalk/smalltalk/gst-remote-typo.patch new file mode 100644 index 0000000000..628a931003 --- /dev/null +++ b/recipes-smalltalk/smalltalk/smalltalk/gst-remote-typo.patch @@ -0,0 +1,46 @@ +From c6e5359374ee9b46777be790da9d64d7c408a5c1 Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 5 Jul 2011 10:50:58 +0200 +Subject: [PATCH 1/1] fix typo in 2fc74b9 + +2011-08-13 Paolo Bonzini + + * scripts/Remote.st: Fix typo in 2fc74b9. +--- + ChangeLog | 4 ++++ + scripts/Remote.st | 10 +++++++--- + 2 files changed, 11 insertions(+), 3 deletions(-) + +diff --git a/scripts/Remote.st b/scripts/Remote.st +index ec65de4..cf383bd 100644 +--- a/scripts/Remote.st ++++ b/scripts/Remote.st +@@ -182,11 +182,14 @@ available in the PATH of the remote machine. + opt isNil ifTrue: [ + host isNil ifFalse: [ self error: 'multiple hosts are invalid' ]. + (arg includes: $@) +- ifFalse: [ host := TCP.SocketAddress byName: arg ] ++ ifFalse: [ host := arg ] + ifTrue: [ + login isNil ifFalse: [ self error: 'multiple logins are invalid' ]. +- login := TCP.SocketAddress byName: (arg copyUpTo: $@). +- host := arg copyAfter: $@ ] ]. ++ login := arg copyUpTo: $@. ++ host := arg copyAfter: $@ ]. ++ (TCP.SocketAddress byName: host) ++ ifNil: [ self error: 'invalid host %1' %{host} ] ++ ifNotNil: [ :addr | host := addr ] ]. + ] + + ifError: [ +@@ -197,6 +200,7 @@ available in the PATH of the remote machine. + ('gst-remote: ', ex messageText, ' + ') displayOn: stderr. + stderr flush. ++ "ex pass." + helpString displayOn: stderr. + ObjectMemory quit: 1 ]. + +-- +1.7.2.5 + diff --git a/recipes-smalltalk/smalltalk/smalltalk_3.2.4.bb b/recipes-smalltalk/smalltalk/smalltalk_3.2.4.bb new file mode 100644 index 0000000000..dada7763f0 --- /dev/null +++ b/recipes-smalltalk/smalltalk/smalltalk_3.2.4.bb @@ -0,0 +1,51 @@ +DESCRIPTION = "GNU Smalltalk." +HOMEPAGE = "http://people.freedesktop.org/~whot/evtest/" +LICENSE = "GPLv2" +PR = "r9" + +DEPENDS = "smalltalk-native" +DEPENDS_virtclass-native = "" + +SRC_URI = " \ + ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-3.2.4.tar.gz \ + file://gst-remote-hostname.patch \ + file://gst-remote-typo.patch \ + file://gst-remote-resume.patch \ + file://fix_clock_behavior_across_image.patch \ + file://fix_fd_resume.patch \ +" +SRC_URI[md5sum] = "a36a7c9beddca08dc492b500738efc82" +SRC_URI[sha256sum] = "901cc7090a1fa44bc60900a970d207de4aa3bdfdce72bea55114e243bc1eb1b3" + +EXTRA_OECONF = "--disable-static --disable-gtk --without-x" + +PACKAGES =+ "${PN}-digest ${PN}-expat ${PN}-gdbm ${PN}-opengl ${PN}-sdl ${PN}-sqlite" + +FILES_${PN}-digest = "${libdir}/smalltalk/digest*.so" +FILES_${PN}-expat = "${libdir}/smalltalk/expat*.so" +FILES_${PN}-gdbm = "${libdir}/smalltalk/gdbm*.so" +FILES_${PN}-opengl = "${libdir}/smalltalk/gstopengl*.so" +FILES_${PN}-sdl = "${libdir}/smalltalk/sdl*.so" +FILES_${PN}-sqlite = "${libdir}/smalltalk/dbd-sqlite*.so" +FILES_${PN}-dbg += "${libdir}/smalltalk/.debug ${libexecdir}/smalltalk/.debug" +#FILES_${PN}-dev += "${libdir}/smalltalk/*.so ${libdir}/smalltalk/*.la" +FILES_${PN}-dev += "${libdir}/smalltalk/*.la" +FILES_${PN}-static += "${libdir}/smalltalk/lib*.a" + +inherit autotools + +do_configure() { + sed -i -e 's/^GST = .*$/GST = gst --no-user-files $(GST_OPTS)/' ${S}/Makefile.am + sed -i -e 's/^GST_PACKAGE = .*$/GST_PACKAGE = XZIP="$(XZIP)" gst-package $(GST_OPTS)/' ${S}/Makefile.am + sed -i -e 's/"$(abs_top_builddir)\/gst$(EXEEXT)"/gst/' ${S}/Makefile.am + autotools_do_configure +} + +do_configure_virtclass-native() { + autotools_do_configure + sed -i -e 's/^module_DATA.*$//' ${S}/Makefile + rm -f ${S}/libc.la +} + +BBCLASSEXTEND = "native" + diff --git a/recipes-smalltalk/smalltalk/soapopera_git.bb b/recipes-smalltalk/smalltalk/soapopera_git.bb new file mode 100644 index 0000000000..49f406812c --- /dev/null +++ b/recipes-smalltalk/smalltalk/soapopera_git.bb @@ -0,0 +1,11 @@ +DESCRITOPN = "" +HOMEPAGE = "https://gitorious.org/gnu-smalltalk-ports/soapopera" + +require smalltalk-package.inc + +S = "${WORKDIR}/git" +SRC_URI = "git://gitorious.org/gnu-smalltalk-ports/soapopera.git;protocol=git;branch=master" +SRCREV = "21132f02889ef82e368144dbf8892d321d27661c" +PV = "0.0.1+gitr${SRCREV}" +PR = "${INC_PR}.0" + From b8018837e34078ea2e092743a426393f3ddb96fa Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 4 Jan 2013 20:30:00 +0800 Subject: [PATCH 02/29] gnu-smalltalk: Make it compile --- .../smalltalk/smalltalk/no-doc.patch | 16 ++++++++++++++++ .../smalltalk/smalltalk_3.2.4.bb | 19 ++++++++++--------- 2 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 recipes-smalltalk/smalltalk/smalltalk/no-doc.patch diff --git a/recipes-smalltalk/smalltalk/smalltalk/no-doc.patch b/recipes-smalltalk/smalltalk/smalltalk/no-doc.patch new file mode 100644 index 0000000000..bc69ad8516 --- /dev/null +++ b/recipes-smalltalk/smalltalk/smalltalk/no-doc.patch @@ -0,0 +1,16 @@ +The build system tries to execute the gst-tool gst-doc and gst-tool is +not installed and the easiest right now is to not build the docs + +Index: smalltalk-3.2.4/Makefile.am +=================================================================== +--- smalltalk-3.2.4.orig/Makefile.am 2013-01-04 18:56:47.000000000 +0800 ++++ smalltalk-3.2.4/Makefile.am 2013-01-04 18:59:51.715391338 +0800 +@@ -30,7 +30,7 @@ + if ENABLE_DISASSEMBLER + SUBDIRS += opcode + endif +-SUBDIRS += libgst . $(BUILT_PACKAGES) doc tests ++SUBDIRS += libgst . $(BUILT_PACKAGES) tests + + # Running gst inside the build directory... + diff --git a/recipes-smalltalk/smalltalk/smalltalk_3.2.4.bb b/recipes-smalltalk/smalltalk/smalltalk_3.2.4.bb index dada7763f0..e925904168 100644 --- a/recipes-smalltalk/smalltalk/smalltalk_3.2.4.bb +++ b/recipes-smalltalk/smalltalk/smalltalk_3.2.4.bb @@ -1,10 +1,10 @@ DESCRIPTION = "GNU Smalltalk." -HOMEPAGE = "http://people.freedesktop.org/~whot/evtest/" -LICENSE = "GPLv2" -PR = "r9" +HOMEPAGE = "http://smalltalk.gnu.org/" +LICENSE = "GPLv2+" +PR = "r10" -DEPENDS = "smalltalk-native" -DEPENDS_virtclass-native = "" +DEPENDS = "smalltalk-native gnutls" +DEPENDS_virtclass-native = "gnutls-native" SRC_URI = " \ ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-3.2.4.tar.gz \ @@ -13,22 +13,22 @@ SRC_URI = " \ file://gst-remote-resume.patch \ file://fix_clock_behavior_across_image.patch \ file://fix_fd_resume.patch \ + file://no-doc.patch \ " SRC_URI[md5sum] = "a36a7c9beddca08dc492b500738efc82" SRC_URI[sha256sum] = "901cc7090a1fa44bc60900a970d207de4aa3bdfdce72bea55114e243bc1eb1b3" -EXTRA_OECONF = "--disable-static --disable-gtk --without-x" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -PACKAGES =+ "${PN}-digest ${PN}-expat ${PN}-gdbm ${PN}-opengl ${PN}-sdl ${PN}-sqlite" +EXTRA_OECONF = "--disable-static --disable-gtk --without-x --without-opengl" +PACKAGES =+ "${PN}-digest ${PN}-expat ${PN}-gdbm ${PN}-sdl ${PN}-sqlite" FILES_${PN}-digest = "${libdir}/smalltalk/digest*.so" FILES_${PN}-expat = "${libdir}/smalltalk/expat*.so" FILES_${PN}-gdbm = "${libdir}/smalltalk/gdbm*.so" -FILES_${PN}-opengl = "${libdir}/smalltalk/gstopengl*.so" FILES_${PN}-sdl = "${libdir}/smalltalk/sdl*.so" FILES_${PN}-sqlite = "${libdir}/smalltalk/dbd-sqlite*.so" FILES_${PN}-dbg += "${libdir}/smalltalk/.debug ${libexecdir}/smalltalk/.debug" -#FILES_${PN}-dev += "${libdir}/smalltalk/*.so ${libdir}/smalltalk/*.la" FILES_${PN}-dev += "${libdir}/smalltalk/*.la" FILES_${PN}-static += "${libdir}/smalltalk/lib*.a" @@ -39,6 +39,7 @@ do_configure() { sed -i -e 's/^GST_PACKAGE = .*$/GST_PACKAGE = XZIP="$(XZIP)" gst-package $(GST_OPTS)/' ${S}/Makefile.am sed -i -e 's/"$(abs_top_builddir)\/gst$(EXEEXT)"/gst/' ${S}/Makefile.am autotools_do_configure + rm -f ${S}/libc.la } do_configure_virtclass-native() { From c5ddf5162c7b0c4bf6aade5be88721bce95743ab Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 4 Jan 2013 20:38:25 +0800 Subject: [PATCH 03/29] misc: Add LICENSE and LIC_FILE_CHKSUM for all smalltalk recipes --- recipes-smalltalk/smalltalk/osmo-st-asn1_git.bb | 3 +++ recipes-smalltalk/smalltalk/osmo-st-core_git.bb | 3 +++ recipes-smalltalk/smalltalk/osmo-st-gsm_git.bb | 3 +++ recipes-smalltalk/smalltalk/osmo-st-logging_git.bb | 3 +++ recipes-smalltalk/smalltalk/osmo-st-mgcp_git.bb | 3 +++ recipes-smalltalk/smalltalk/osmo-st-msc_git.bb | 3 +++ recipes-smalltalk/smalltalk/osmo-st-network_git.bb | 3 +++ recipes-smalltalk/smalltalk/osmo-st-sip_git.bb | 3 +++ recipes-smalltalk/smalltalk/osmo-st-testphone_git.bb | 3 +++ recipes-smalltalk/smalltalk/petitparser-tests_git.bb | 4 ++++ recipes-smalltalk/smalltalk/petitparser_git.bb | 3 +++ recipes-smalltalk/smalltalk/soapopera_git.bb | 3 +++ 12 files changed, 37 insertions(+) diff --git a/recipes-smalltalk/smalltalk/osmo-st-asn1_git.bb b/recipes-smalltalk/smalltalk/osmo-st-asn1_git.bb index d15a72a75c..e9968fde37 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-asn1_git.bb +++ b/recipes-smalltalk/smalltalk/osmo-st-asn1_git.bb @@ -1,5 +1,8 @@ DESCRITOPN = "ASN1 Code to work on TCAP/MAP/Camel..." HOMEPAGE = "http://osmocom.org" +LICENSE = "AGPLv3+" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" require smalltalk-package.inc diff --git a/recipes-smalltalk/smalltalk/osmo-st-core_git.bb b/recipes-smalltalk/smalltalk/osmo-st-core_git.bb index efe0f1be1e..10be405bec 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-core_git.bb +++ b/recipes-smalltalk/smalltalk/osmo-st-core_git.bb @@ -1,5 +1,8 @@ DESCRITOPN = "" HOMEPAGE = "http://osmocom.org" +LICENSE = "AGPLv3+" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" require smalltalk-package.inc diff --git a/recipes-smalltalk/smalltalk/osmo-st-gsm_git.bb b/recipes-smalltalk/smalltalk/osmo-st-gsm_git.bb index e1ddb1080b..1e63f95358 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-gsm_git.bb +++ b/recipes-smalltalk/smalltalk/osmo-st-gsm_git.bb @@ -1,5 +1,8 @@ DESCRITOPN = "GSM utilities based on osmo-network for SCCP,BSSAP,BSSMAP,GSM48" HOMEPAGE = "http://osmocom.org" +LICENSE = "AGPLv3+" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" require smalltalk-package.inc diff --git a/recipes-smalltalk/smalltalk/osmo-st-logging_git.bb b/recipes-smalltalk/smalltalk/osmo-st-logging_git.bb index 5f9b2cf90b..21ae8b0622 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-logging_git.bb +++ b/recipes-smalltalk/smalltalk/osmo-st-logging_git.bb @@ -1,5 +1,8 @@ DESCRITOPN = "A Smalltalk logging framework inspired by libosmocore's logging facilities" HOMEPAGE = "http://osmocom.org" +LICENSE = "AGPLv3+" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" require smalltalk-package.inc diff --git a/recipes-smalltalk/smalltalk/osmo-st-mgcp_git.bb b/recipes-smalltalk/smalltalk/osmo-st-mgcp_git.bb index 0141a04a55..be19b71c91 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-mgcp_git.bb +++ b/recipes-smalltalk/smalltalk/osmo-st-mgcp_git.bb @@ -1,5 +1,8 @@ DESCRITOPN = "This is a MGCP CallAgent written in Smalltalk" HOMEPAGE = "http://osmocom.org" +LICENSE = "AGPLv3+" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" require smalltalk-package.inc diff --git a/recipes-smalltalk/smalltalk/osmo-st-msc_git.bb b/recipes-smalltalk/smalltalk/osmo-st-msc_git.bb index fafd53531a..048b7ba0c6 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-msc_git.bb +++ b/recipes-smalltalk/smalltalk/osmo-st-msc_git.bb @@ -1,5 +1,8 @@ DESCRITOPN = "This is a simple MSC done in Smalltalk" HOMEPAGE = "http://osmocom.org" +LICENSE = "AGPLv3+" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" require smalltalk-package.inc diff --git a/recipes-smalltalk/smalltalk/osmo-st-network_git.bb b/recipes-smalltalk/smalltalk/osmo-st-network_git.bb index aa37cba248..394e73136a 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-network_git.bb +++ b/recipes-smalltalk/smalltalk/osmo-st-network_git.bb @@ -1,4 +1,7 @@ DESCRITOPN = "osmo-network a module for networking (SCCP, M3UA, IPA) protocol handling" +LICENSE = "AGPLv3+" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" HOMEPAGE = "http://osmocom.org" require smalltalk-package.inc diff --git a/recipes-smalltalk/smalltalk/osmo-st-sip_git.bb b/recipes-smalltalk/smalltalk/osmo-st-sip_git.bb index f92cefd405..7994592364 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-sip_git.bb +++ b/recipes-smalltalk/smalltalk/osmo-st-sip_git.bb @@ -1,5 +1,8 @@ DESCRITOPN = "" HOMEPAGE = "http://osmocom.org" +LICENSE = "AGPLv3+" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" require smalltalk-package.inc diff --git a/recipes-smalltalk/smalltalk/osmo-st-testphone_git.bb b/recipes-smalltalk/smalltalk/osmo-st-testphone_git.bb index efe846730c..b9fc5c995a 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-testphone_git.bb +++ b/recipes-smalltalk/smalltalk/osmo-st-testphone_git.bb @@ -1,5 +1,8 @@ DESCRITOPN = "A simple test phone to do a LU and place a call" HOMEPAGE = "http://osmocom.org" +LICENSE = "AGPLv3+" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" require smalltalk-package.inc diff --git a/recipes-smalltalk/smalltalk/petitparser-tests_git.bb b/recipes-smalltalk/smalltalk/petitparser-tests_git.bb index 9442b8a8eb..83321cabe5 100644 --- a/recipes-smalltalk/smalltalk/petitparser-tests_git.bb +++ b/recipes-smalltalk/smalltalk/petitparser-tests_git.bb @@ -1,5 +1,9 @@ DESCRITOPN = "" HOMEPAGE = "https://gitorious.org/gnu-smalltalk-ports/petitparser" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + require smalltalk-package.inc diff --git a/recipes-smalltalk/smalltalk/petitparser_git.bb b/recipes-smalltalk/smalltalk/petitparser_git.bb index ae8c027d87..2c94d48dc8 100644 --- a/recipes-smalltalk/smalltalk/petitparser_git.bb +++ b/recipes-smalltalk/smalltalk/petitparser_git.bb @@ -1,5 +1,8 @@ DESCRITOPN = "" HOMEPAGE = "https://gitorious.org/gnu-smalltalk-ports/petitparser" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" require smalltalk-package.inc diff --git a/recipes-smalltalk/smalltalk/soapopera_git.bb b/recipes-smalltalk/smalltalk/soapopera_git.bb index 49f406812c..a3503084a0 100644 --- a/recipes-smalltalk/smalltalk/soapopera_git.bb +++ b/recipes-smalltalk/smalltalk/soapopera_git.bb @@ -1,5 +1,8 @@ DESCRITOPN = "" HOMEPAGE = "https://gitorious.org/gnu-smalltalk-ports/soapopera" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" require smalltalk-package.inc From 3e60b7a4d2f1fe285db819d05bf5a6c2972fa4d2 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 5 Jan 2013 18:14:29 +0800 Subject: [PATCH 04/29] smalltalk: Build an unreleases git version as 3.2.4.99 We build a tarball as this avoids us having to deal with cross-compiling the genvm, genprim, genbc application. --- recipes-smalltalk/smalltalk/smalltalk.inc | 54 +++++++++++++++++++ .../smalltalk/smalltalk_3.2.4.99.bb | 16 ++++++ .../smalltalk/smalltalk_3.2.4.bb | 38 +------------ 3 files changed, 72 insertions(+), 36 deletions(-) create mode 100644 recipes-smalltalk/smalltalk/smalltalk.inc create mode 100644 recipes-smalltalk/smalltalk/smalltalk_3.2.4.99.bb diff --git a/recipes-smalltalk/smalltalk/smalltalk.inc b/recipes-smalltalk/smalltalk/smalltalk.inc new file mode 100644 index 0000000000..1cfca43e02 --- /dev/null +++ b/recipes-smalltalk/smalltalk/smalltalk.inc @@ -0,0 +1,54 @@ +DESCRIPTION = "GNU Smalltalk." +HOMEPAGE = "http://smalltalk.gnu.org/" +LICENSE = "GPLv2+" + +INC_PR = "2" + +DEPENDS = "smalltalk-native gnutls readline" +DEPENDS_virtclass-native = "gnutls-native" + +EXTRA_OECONF = "--disable-static --disable-gtk --without-x --without-opengl" +PACKAGES =+ "${PN}-digest ${PN}-expat ${PN}-gdbm ${PN}-sdl ${PN}-sqlite \ + ${PN}-seaside ${PN}-magritte ${PN}-magritte-seaside ${PN}-examples " + +FILES_${PN}-digest = "${libdir}/smalltalk/digest*.so \ + ${datadir}/smalltalk/Digest.star" +FILES_${PN}-expat = "${libdir}/smalltalk/expat*.so \ + ${datadir}/smalltalk/XML-Expat.star" +FILES_${PN}-gdbm = "${libdir}/smalltalk/gdbm*.so" +FILES_${PN}-sdl = "${libdir}/smalltalk/sdl*.so" +FILES_${PN}-sqlite = "${libdir}/smalltalk/dbd-sqlite*.so \ + ${datadir}/smalltalk/DBD-SQLite.star" +FILES_${PN}-dbg += "${libdir}/smalltalk/.debug ${libexecdir}/smalltalk/.debug" +FILES_${PN}-dev += "${libdir}/smalltalk/*.la" +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}-examples = "${datadir}/smalltalk/examples/* ${datadir}/smalltalk/unsupported/*" + + +inherit autotools + +do_configure() { + sed -i -e 's/^GST = .*$/GST = gst --no-user-files $(GST_OPTS)/' ${S}/Makefile.am + sed -i -e 's/^GST_PACKAGE = .*$/GST_PACKAGE = XZIP="$(XZIP)" gst-package $(GST_OPTS)/' ${S}/Makefile.am + sed -i -e 's/"$(abs_top_builddir)\/gst$(EXEEXT)"/gst/' ${S}/Makefile.am + autotools_do_configure + rm -f ${S}/libc.la +} + +do_configure_virtclass-native() { + autotools_do_configure + sed -i -e 's/^module_DATA.*$//' ${S}/Makefile + rm -f ${S}/libc.la +} + +do_install_append() { + find ${D}${libdir}/smalltalk -name "*.la" -delete +} + +BBCLASSEXTEND = "native" + diff --git a/recipes-smalltalk/smalltalk/smalltalk_3.2.4.99.bb b/recipes-smalltalk/smalltalk/smalltalk_3.2.4.99.bb new file mode 100644 index 0000000000..ba0b53d8f4 --- /dev/null +++ b/recipes-smalltalk/smalltalk/smalltalk_3.2.4.99.bb @@ -0,0 +1,16 @@ +require ${PN}.inc +PR = "r11.${INC_PR}" + +# TODO: Upgrade, package the docs, split the packages, create gst class + +SRC_URI = " \ + http://www.secretlabs.de/gnu-smalltalk/smalltalk-3.2.4.99.tar.gz \ + file://no-doc.patch \ +" + +SRC_URI[md5sum] = "ab76000aeb212fa556937f45c2315c3f" +SRC_URI[sha256sum] = "4fe3163ac5530272644c16ae8e8e7822cf7712981e5916e24fec871f380f0191" + +SRCREV = "c17f4a0f757f398dad3bd90edbf8afdb96c0e995" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + diff --git a/recipes-smalltalk/smalltalk/smalltalk_3.2.4.bb b/recipes-smalltalk/smalltalk/smalltalk_3.2.4.bb index e925904168..17d82656a6 100644 --- a/recipes-smalltalk/smalltalk/smalltalk_3.2.4.bb +++ b/recipes-smalltalk/smalltalk/smalltalk_3.2.4.bb @@ -1,10 +1,5 @@ -DESCRIPTION = "GNU Smalltalk." -HOMEPAGE = "http://smalltalk.gnu.org/" -LICENSE = "GPLv2+" -PR = "r10" - -DEPENDS = "smalltalk-native gnutls" -DEPENDS_virtclass-native = "gnutls-native" +require ${PN}.inc +PR = "r11.${INC_PR}" SRC_URI = " \ ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-3.2.4.tar.gz \ @@ -20,33 +15,4 @@ SRC_URI[sha256sum] = "901cc7090a1fa44bc60900a970d207de4aa3bdfdce72bea55114e243bc LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -EXTRA_OECONF = "--disable-static --disable-gtk --without-x --without-opengl" -PACKAGES =+ "${PN}-digest ${PN}-expat ${PN}-gdbm ${PN}-sdl ${PN}-sqlite" - -FILES_${PN}-digest = "${libdir}/smalltalk/digest*.so" -FILES_${PN}-expat = "${libdir}/smalltalk/expat*.so" -FILES_${PN}-gdbm = "${libdir}/smalltalk/gdbm*.so" -FILES_${PN}-sdl = "${libdir}/smalltalk/sdl*.so" -FILES_${PN}-sqlite = "${libdir}/smalltalk/dbd-sqlite*.so" -FILES_${PN}-dbg += "${libdir}/smalltalk/.debug ${libexecdir}/smalltalk/.debug" -FILES_${PN}-dev += "${libdir}/smalltalk/*.la" -FILES_${PN}-static += "${libdir}/smalltalk/lib*.a" - -inherit autotools - -do_configure() { - sed -i -e 's/^GST = .*$/GST = gst --no-user-files $(GST_OPTS)/' ${S}/Makefile.am - sed -i -e 's/^GST_PACKAGE = .*$/GST_PACKAGE = XZIP="$(XZIP)" gst-package $(GST_OPTS)/' ${S}/Makefile.am - sed -i -e 's/"$(abs_top_builddir)\/gst$(EXEEXT)"/gst/' ${S}/Makefile.am - autotools_do_configure - rm -f ${S}/libc.la -} - -do_configure_virtclass-native() { - autotools_do_configure - sed -i -e 's/^module_DATA.*$//' ${S}/Makefile - rm -f ${S}/libc.la -} - -BBCLASSEXTEND = "native" From a57be384e10ab37da0abd6a5d0f6d581a110ae26 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 5 Jan 2013 19:38:50 +0800 Subject: [PATCH 05/29] osmo-st: Upgrade all osmo smalltalk recipes to the latest version --- recipes-smalltalk/smalltalk/osmo-st-asn1_git.bb | 2 +- recipes-smalltalk/smalltalk/osmo-st-core_git.bb | 2 +- recipes-smalltalk/smalltalk/osmo-st-gsm_git.bb | 2 +- recipes-smalltalk/smalltalk/osmo-st-mgcp_git.bb | 2 +- recipes-smalltalk/smalltalk/osmo-st-msc_git.bb | 2 +- recipes-smalltalk/smalltalk/osmo-st-network_git.bb | 2 +- recipes-smalltalk/smalltalk/osmo-st-sip_git.bb | 2 +- recipes-smalltalk/smalltalk/osmo-st-testphone_git.bb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/recipes-smalltalk/smalltalk/osmo-st-asn1_git.bb b/recipes-smalltalk/smalltalk/osmo-st-asn1_git.bb index e9968fde37..caf11063c0 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-asn1_git.bb +++ b/recipes-smalltalk/smalltalk/osmo-st-asn1_git.bb @@ -8,7 +8,7 @@ require smalltalk-package.inc S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-asn1;protocol=git;branch=master" -SRCREV = "b77da9be3fd1bc1e2327a3941b47dee69660da56" +SRCREV = "59f3d7ac47c39eef88fa186531d706e844e19bb5" PV = "0.0.1+gitr${SRCREV}" PR = "${INC_PR}.0" diff --git a/recipes-smalltalk/smalltalk/osmo-st-core_git.bb b/recipes-smalltalk/smalltalk/osmo-st-core_git.bb index 10be405bec..b51fc20bd0 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-core_git.bb +++ b/recipes-smalltalk/smalltalk/osmo-st-core_git.bb @@ -10,7 +10,7 @@ RDEPENDS += "osmo-st-logging" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-core;protocol=git;branch=master" -SRCREV = "22f6836925cb1c682045497d214773a3d04e60b2" +SRCREV = "2b81cc18c6cd29c8d944a3d8c152c4a19ff882c0" PV = "0.0.1+gitr${SRCREV}" PR = "${INC_PR}.0" diff --git a/recipes-smalltalk/smalltalk/osmo-st-gsm_git.bb b/recipes-smalltalk/smalltalk/osmo-st-gsm_git.bb index 1e63f95358..28a7aa58e5 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-gsm_git.bb +++ b/recipes-smalltalk/smalltalk/osmo-st-gsm_git.bb @@ -10,7 +10,7 @@ RDEPENDS += "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 = "66bbafcf373af876eb6b590603e9485094ecebc1" +SRCREV = "0c196f0c55ff1f6cdeb390e11a302a3e44e278b4" PV = "0.0.1+gitr${SRCREV}" PR = "${INC_PR}.0" diff --git a/recipes-smalltalk/smalltalk/osmo-st-mgcp_git.bb b/recipes-smalltalk/smalltalk/osmo-st-mgcp_git.bb index be19b71c91..30d1ed7968 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-mgcp_git.bb +++ b/recipes-smalltalk/smalltalk/osmo-st-mgcp_git.bb @@ -10,7 +10,7 @@ RDEPENDS += "osmo-st-logging osmo-st-core" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-mgcp;protocol=git;branch=master" -SRCREV = "e84e9ce915d91030cf97fd9d23c42d4d92729f67" +SRCREV = "ca0d7624a8320a452e7071c99063d319aa34aed1" PV = "0.0.1+gitr${SRCREV}" PR = "${INC_PR}.0" diff --git a/recipes-smalltalk/smalltalk/osmo-st-msc_git.bb b/recipes-smalltalk/smalltalk/osmo-st-msc_git.bb index 048b7ba0c6..6d7b1020ee 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-msc_git.bb +++ b/recipes-smalltalk/smalltalk/osmo-st-msc_git.bb @@ -10,7 +10,7 @@ RDEPENDS += "osmo-st-logging osmo-st-network osmo-st-gsm" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-msc;protocol=git;branch=master" -SRCREV = "acef6cb076874ec187fbc4757201bc9e825f8856" +SRCREV = "37c768d3cb650fec0b004d163ec2ac3763dc583e" PV = "0.0.1+gitr${SRCREV}" PR = "${INC_PR}.0" diff --git a/recipes-smalltalk/smalltalk/osmo-st-network_git.bb b/recipes-smalltalk/smalltalk/osmo-st-network_git.bb index 394e73136a..e480febc0b 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-network_git.bb +++ b/recipes-smalltalk/smalltalk/osmo-st-network_git.bb @@ -10,7 +10,7 @@ RDEPENDS += "osmo-st-logging" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-network;protocol=git;branch=master" -SRCREV = "d7b2323602771681119bdb0507de3fc58f519aae" +SRCREV = "17ee24015f152322b73bdb769a5ce35152f71044" PV = "0.0.2+gitr${SRCREV}" PR = "${INC_PR}.0" diff --git a/recipes-smalltalk/smalltalk/osmo-st-sip_git.bb b/recipes-smalltalk/smalltalk/osmo-st-sip_git.bb index 7994592364..85a8dba469 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-sip_git.bb +++ b/recipes-smalltalk/smalltalk/osmo-st-sip_git.bb @@ -8,7 +8,7 @@ require smalltalk-package.inc S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-sip;protocol=git;branch=master" -SRCREV = "e134b1e825206b6cc08ab5a24c3f82e40e0f65ac" +SRCREV = "c9bed5b2353518d4d73272006511f4bfecab01ae" PV = "0.0.1+gitr${SRCREV}" PR = "${INC_PR}.0" diff --git a/recipes-smalltalk/smalltalk/osmo-st-testphone_git.bb b/recipes-smalltalk/smalltalk/osmo-st-testphone_git.bb index b9fc5c995a..b55d6578fc 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-testphone_git.bb +++ b/recipes-smalltalk/smalltalk/osmo-st-testphone_git.bb @@ -10,7 +10,7 @@ RDEPENDS += "osmo-st-network osmo-st-logging osmo-st-gsm" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-testphone;protocol=git;branch=master" -SRCREV = "99841c28a6d3a50cf40fa019e8a9fd0c51f3da94" +SRCREV = "41fcc5d89938a1b2f246c8ff67f3d8482bcd1529" PV = "0.0.1+gitr${SRCREV}" PR = "${INC_PR}.0" From 478015016493ccfc1527abc1224083621e2f78d4 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 5 Jan 2013 19:48:04 +0800 Subject: [PATCH 06/29] osmo-st: Move all osmosocom smalltalk packages to a new directory --- classes/smalltalk_package.bbclass | 17 +++++++++++++++++ .../{smalltalk => osmocom}/osmo-st-asn1_git.bb | 1 - .../{smalltalk => osmocom}/osmo-st-core_git.bb | 1 - .../{smalltalk => osmocom}/osmo-st-gsm_git.bb | 1 - .../osmo-st-logging_git.bb | 1 - .../{smalltalk => osmocom}/osmo-st-mgcp_git.bb | 1 - .../{smalltalk => osmocom}/osmo-st-msc_git.bb | 1 - .../osmo-st-network_git.bb | 1 - .../{smalltalk => osmocom}/osmo-st-sip_git.bb | 1 - .../osmo-st-testphone_git.bb | 1 - recipes-smalltalk/osmocom/smalltalk-package.inc | 2 ++ 11 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 classes/smalltalk_package.bbclass rename recipes-smalltalk/{smalltalk => osmocom}/osmo-st-asn1_git.bb (99%) rename recipes-smalltalk/{smalltalk => osmocom}/osmo-st-core_git.bb (99%) rename recipes-smalltalk/{smalltalk => osmocom}/osmo-st-gsm_git.bb (99%) rename recipes-smalltalk/{smalltalk => osmocom}/osmo-st-logging_git.bb (99%) rename recipes-smalltalk/{smalltalk => osmocom}/osmo-st-mgcp_git.bb (99%) rename recipes-smalltalk/{smalltalk => osmocom}/osmo-st-msc_git.bb (99%) rename recipes-smalltalk/{smalltalk => osmocom}/osmo-st-network_git.bb (99%) rename recipes-smalltalk/{smalltalk => osmocom}/osmo-st-sip_git.bb (99%) rename recipes-smalltalk/{smalltalk => osmocom}/osmo-st-testphone_git.bb (99%) create mode 100644 recipes-smalltalk/osmocom/smalltalk-package.inc diff --git a/classes/smalltalk_package.bbclass b/classes/smalltalk_package.bbclass new file mode 100644 index 0000000000..0e6b1e6830 --- /dev/null +++ b/classes/smalltalk_package.bbclass @@ -0,0 +1,17 @@ +DEPENDS = "smalltalk-native" +RDEPENDS = "smalltalk" + +smalltalk_package_do_compile() { + gst < /dev/null + gst-package --target-directory=. package.xml +} + +smalltalk_package_do_install () { + install -d ${D}${datadir}/smalltalk + + install -m 0644 ${S}/*.star ${D}${datadir}/smalltalk +} + +FILES_${PN} += "${datadir}/smalltalk" + +EXPORT_FUNCTIONS do_compile do_install diff --git a/recipes-smalltalk/smalltalk/osmo-st-asn1_git.bb b/recipes-smalltalk/osmocom/osmo-st-asn1_git.bb similarity index 99% rename from recipes-smalltalk/smalltalk/osmo-st-asn1_git.bb rename to recipes-smalltalk/osmocom/osmo-st-asn1_git.bb index caf11063c0..920bc112bd 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-asn1_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-asn1_git.bb @@ -11,4 +11,3 @@ SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-asn1;protocol=git;branch=mast SRCREV = "59f3d7ac47c39eef88fa186531d706e844e19bb5" PV = "0.0.1+gitr${SRCREV}" PR = "${INC_PR}.0" - diff --git a/recipes-smalltalk/smalltalk/osmo-st-core_git.bb b/recipes-smalltalk/osmocom/osmo-st-core_git.bb similarity index 99% rename from recipes-smalltalk/smalltalk/osmo-st-core_git.bb rename to recipes-smalltalk/osmocom/osmo-st-core_git.bb index b51fc20bd0..05994602e2 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-core_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-core_git.bb @@ -13,4 +13,3 @@ SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-core;protocol=git;branch=mast SRCREV = "2b81cc18c6cd29c8d944a3d8c152c4a19ff882c0" PV = "0.0.1+gitr${SRCREV}" PR = "${INC_PR}.0" - diff --git a/recipes-smalltalk/smalltalk/osmo-st-gsm_git.bb b/recipes-smalltalk/osmocom/osmo-st-gsm_git.bb similarity index 99% rename from recipes-smalltalk/smalltalk/osmo-st-gsm_git.bb rename to recipes-smalltalk/osmocom/osmo-st-gsm_git.bb index 28a7aa58e5..f4167c39f1 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-gsm_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-gsm_git.bb @@ -13,4 +13,3 @@ SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-gsm;protocol=git;branch=maste SRCREV = "0c196f0c55ff1f6cdeb390e11a302a3e44e278b4" PV = "0.0.1+gitr${SRCREV}" PR = "${INC_PR}.0" - diff --git a/recipes-smalltalk/smalltalk/osmo-st-logging_git.bb b/recipes-smalltalk/osmocom/osmo-st-logging_git.bb similarity index 99% rename from recipes-smalltalk/smalltalk/osmo-st-logging_git.bb rename to recipes-smalltalk/osmocom/osmo-st-logging_git.bb index 21ae8b0622..6e27bc3a87 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-logging_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-logging_git.bb @@ -11,4 +11,3 @@ SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-logging;protocol=git;branch=m SRCREV = "39eeb846821a2b1e6b0eb1c932eb4c1326db8a28" PV = "0.0.2+gitr${SRCREV}" PR = "${INC_PR}.0" - diff --git a/recipes-smalltalk/smalltalk/osmo-st-mgcp_git.bb b/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb similarity index 99% rename from recipes-smalltalk/smalltalk/osmo-st-mgcp_git.bb rename to recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb index 30d1ed7968..6e10cbb16b 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-mgcp_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb @@ -13,4 +13,3 @@ SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-mgcp;protocol=git;branch=mast SRCREV = "ca0d7624a8320a452e7071c99063d319aa34aed1" PV = "0.0.1+gitr${SRCREV}" PR = "${INC_PR}.0" - diff --git a/recipes-smalltalk/smalltalk/osmo-st-msc_git.bb b/recipes-smalltalk/osmocom/osmo-st-msc_git.bb similarity index 99% rename from recipes-smalltalk/smalltalk/osmo-st-msc_git.bb rename to recipes-smalltalk/osmocom/osmo-st-msc_git.bb index 6d7b1020ee..68169f5aea 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-msc_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-msc_git.bb @@ -13,4 +13,3 @@ SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-msc;protocol=git;branch=maste SRCREV = "37c768d3cb650fec0b004d163ec2ac3763dc583e" PV = "0.0.1+gitr${SRCREV}" PR = "${INC_PR}.0" - diff --git a/recipes-smalltalk/smalltalk/osmo-st-network_git.bb b/recipes-smalltalk/osmocom/osmo-st-network_git.bb similarity index 99% rename from recipes-smalltalk/smalltalk/osmo-st-network_git.bb rename to recipes-smalltalk/osmocom/osmo-st-network_git.bb index e480febc0b..815315657c 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-network_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-network_git.bb @@ -13,4 +13,3 @@ SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-network;protocol=git;branch=m SRCREV = "17ee24015f152322b73bdb769a5ce35152f71044" PV = "0.0.2+gitr${SRCREV}" PR = "${INC_PR}.0" - diff --git a/recipes-smalltalk/smalltalk/osmo-st-sip_git.bb b/recipes-smalltalk/osmocom/osmo-st-sip_git.bb similarity index 99% rename from recipes-smalltalk/smalltalk/osmo-st-sip_git.bb rename to recipes-smalltalk/osmocom/osmo-st-sip_git.bb index 85a8dba469..ae20af2cf2 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-sip_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-sip_git.bb @@ -11,4 +11,3 @@ SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-sip;protocol=git;branch=maste SRCREV = "c9bed5b2353518d4d73272006511f4bfecab01ae" PV = "0.0.1+gitr${SRCREV}" PR = "${INC_PR}.0" - diff --git a/recipes-smalltalk/smalltalk/osmo-st-testphone_git.bb b/recipes-smalltalk/osmocom/osmo-st-testphone_git.bb similarity index 99% rename from recipes-smalltalk/smalltalk/osmo-st-testphone_git.bb rename to recipes-smalltalk/osmocom/osmo-st-testphone_git.bb index b55d6578fc..17b3893c80 100644 --- a/recipes-smalltalk/smalltalk/osmo-st-testphone_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-testphone_git.bb @@ -13,4 +13,3 @@ SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-testphone;protocol=git;branch SRCREV = "41fcc5d89938a1b2f246c8ff67f3d8482bcd1529" PV = "0.0.1+gitr${SRCREV}" PR = "${INC_PR}.0" - diff --git a/recipes-smalltalk/osmocom/smalltalk-package.inc b/recipes-smalltalk/osmocom/smalltalk-package.inc new file mode 100644 index 0000000000..2ed8221ef1 --- /dev/null +++ b/recipes-smalltalk/osmocom/smalltalk-package.inc @@ -0,0 +1,2 @@ +inherit smalltalk_package +INC_PR = "r6" From 081e7870aeff9dbf7564e2c7e51daa63b4e4a3cb Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 5 Jan 2013 19:48:58 +0800 Subject: [PATCH 07/29] meta-smalltalk: Make this a proper overlay --- conf/layer.conf | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 conf/layer.conf diff --git a/conf/layer.conf b/conf/layer.conf new file mode 100644 index 0000000000..d902696c71 --- /dev/null +++ b/conf/layer.conf @@ -0,0 +1,10 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH := "${BBPATH}:${LAYERDIR}" + +# We have a packages directory, add to BBFILES +BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "smalltalk" +BBFILE_PATTERN_smalltalk := "^${LAYERDIR}/" +BBFILE_PRIORITY_smalltalk = "1" + From 9028fc799bbeb506186cfe3ae63f983fad5d4652 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 5 Jan 2013 20:03:30 +0800 Subject: [PATCH 08/29] iliad: Package the iliad stable release This is not the offifical iliad but with some updates to jquery and the addition of jqueryui. --- recipes-smalltalk/iliad/iliad_git.bb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 recipes-smalltalk/iliad/iliad_git.bb diff --git a/recipes-smalltalk/iliad/iliad_git.bb b/recipes-smalltalk/iliad/iliad_git.bb new file mode 100644 index 0000000000..f365a5c640 --- /dev/null +++ b/recipes-smalltalk/iliad/iliad_git.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Iliad webframework" +HOMEPAGE = "http://www.iliadproject.org/" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/zecke/iliad-stable.git;protocol=git;branch=master" +SRCREV = "3469a322b9cae17d452fae1b38d661e14e4ae902" +PV = "0.9.1+gitr${SRCPV}" +PR = "r1" + +inherit smalltalk_package + +do_compile() { + gst < /dev/null + find ${S} -name package.xml -execdir gst-package --target-directory="${S}" {} \; +} From cfeca91906fbae78265c0c4e6acede7f25f34e96 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 5 Jan 2013 20:13:57 +0800 Subject: [PATCH 09/29] misc: At least use the right key for the description of the package --- 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 +- recipes-smalltalk/smalltalk/petitparser-tests_git.bb | 2 +- recipes-smalltalk/smalltalk/petitparser_git.bb | 2 +- recipes-smalltalk/smalltalk/soapopera_git.bb | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/recipes-smalltalk/osmocom/osmo-st-asn1_git.bb b/recipes-smalltalk/osmocom/osmo-st-asn1_git.bb index 920bc112bd..0517b5f68b 100644 --- a/recipes-smalltalk/osmocom/osmo-st-asn1_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-asn1_git.bb @@ -1,4 +1,4 @@ -DESCRITOPN = "ASN1 Code to work on TCAP/MAP/Camel..." +DESCRIPTION = "ASN1 Code to work on TCAP/MAP/Camel..." HOMEPAGE = "http://osmocom.org" LICENSE = "AGPLv3+" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ diff --git a/recipes-smalltalk/osmocom/osmo-st-core_git.bb b/recipes-smalltalk/osmocom/osmo-st-core_git.bb index 05994602e2..d4a3ef9f0a 100644 --- a/recipes-smalltalk/osmocom/osmo-st-core_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-core_git.bb @@ -1,4 +1,4 @@ -DESCRITOPN = "" +DESCRIPTION = "" HOMEPAGE = "http://osmocom.org" LICENSE = "AGPLv3+" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ diff --git a/recipes-smalltalk/osmocom/osmo-st-gsm_git.bb b/recipes-smalltalk/osmocom/osmo-st-gsm_git.bb index f4167c39f1..640bf9bb1b 100644 --- a/recipes-smalltalk/osmocom/osmo-st-gsm_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-gsm_git.bb @@ -1,4 +1,4 @@ -DESCRITOPN = "GSM utilities based on osmo-network for SCCP,BSSAP,BSSMAP,GSM48" +DESCRIPTION = "GSM utilities based on osmo-network for SCCP,BSSAP,BSSMAP,GSM48" HOMEPAGE = "http://osmocom.org" LICENSE = "AGPLv3+" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ diff --git a/recipes-smalltalk/osmocom/osmo-st-logging_git.bb b/recipes-smalltalk/osmocom/osmo-st-logging_git.bb index 6e27bc3a87..67e5d481b6 100644 --- a/recipes-smalltalk/osmocom/osmo-st-logging_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-logging_git.bb @@ -1,4 +1,4 @@ -DESCRITOPN = "A Smalltalk logging framework inspired by libosmocore's logging facilities" +DESCRIPTION = "A Smalltalk logging framework inspired by libosmocore's logging facilities" HOMEPAGE = "http://osmocom.org" LICENSE = "AGPLv3+" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ diff --git a/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb b/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb index 6e10cbb16b..7f0903a8f3 100644 --- a/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb @@ -1,4 +1,4 @@ -DESCRITOPN = "This is a MGCP CallAgent written in Smalltalk" +DESCRIPTION = "This is a MGCP CallAgent written in Smalltalk" HOMEPAGE = "http://osmocom.org" LICENSE = "AGPLv3+" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ diff --git a/recipes-smalltalk/osmocom/osmo-st-msc_git.bb b/recipes-smalltalk/osmocom/osmo-st-msc_git.bb index 68169f5aea..efd8d02fb2 100644 --- a/recipes-smalltalk/osmocom/osmo-st-msc_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-msc_git.bb @@ -1,4 +1,4 @@ -DESCRITOPN = "This is a simple MSC done in Smalltalk" +DESCRIPTION = "This is a simple MSC done in Smalltalk" HOMEPAGE = "http://osmocom.org" LICENSE = "AGPLv3+" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ diff --git a/recipes-smalltalk/osmocom/osmo-st-network_git.bb b/recipes-smalltalk/osmocom/osmo-st-network_git.bb index 815315657c..18e5b0f3b5 100644 --- a/recipes-smalltalk/osmocom/osmo-st-network_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-network_git.bb @@ -1,4 +1,4 @@ -DESCRITOPN = "osmo-network a module for networking (SCCP, M3UA, IPA) protocol handling" +DESCRIPTION = "osmo-network a module for networking (SCCP, M3UA, IPA) protocol handling" LICENSE = "AGPLv3+" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" diff --git a/recipes-smalltalk/osmocom/osmo-st-sip_git.bb b/recipes-smalltalk/osmocom/osmo-st-sip_git.bb index ae20af2cf2..a68eeb5388 100644 --- a/recipes-smalltalk/osmocom/osmo-st-sip_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-sip_git.bb @@ -1,4 +1,4 @@ -DESCRITOPN = "" +DESCRIPTION = "" HOMEPAGE = "http://osmocom.org" LICENSE = "AGPLv3+" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ diff --git a/recipes-smalltalk/osmocom/osmo-st-testphone_git.bb b/recipes-smalltalk/osmocom/osmo-st-testphone_git.bb index 17b3893c80..0a58271aaa 100644 --- a/recipes-smalltalk/osmocom/osmo-st-testphone_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-testphone_git.bb @@ -1,4 +1,4 @@ -DESCRITOPN = "A simple test phone to do a LU and place a call" +DESCRIPTION = "A simple test phone to do a LU and place a call" HOMEPAGE = "http://osmocom.org" LICENSE = "AGPLv3+" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ diff --git a/recipes-smalltalk/smalltalk/petitparser-tests_git.bb b/recipes-smalltalk/smalltalk/petitparser-tests_git.bb index 83321cabe5..30a5764eac 100644 --- a/recipes-smalltalk/smalltalk/petitparser-tests_git.bb +++ b/recipes-smalltalk/smalltalk/petitparser-tests_git.bb @@ -1,4 +1,4 @@ -DESCRITOPN = "" +DESCRIPTION = "" HOMEPAGE = "https://gitorious.org/gnu-smalltalk-ports/petitparser" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ diff --git a/recipes-smalltalk/smalltalk/petitparser_git.bb b/recipes-smalltalk/smalltalk/petitparser_git.bb index 2c94d48dc8..119cd14441 100644 --- a/recipes-smalltalk/smalltalk/petitparser_git.bb +++ b/recipes-smalltalk/smalltalk/petitparser_git.bb @@ -1,4 +1,4 @@ -DESCRITOPN = "" +DESCRIPTION = "" HOMEPAGE = "https://gitorious.org/gnu-smalltalk-ports/petitparser" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ diff --git a/recipes-smalltalk/smalltalk/soapopera_git.bb b/recipes-smalltalk/smalltalk/soapopera_git.bb index a3503084a0..a6ca6f1428 100644 --- a/recipes-smalltalk/smalltalk/soapopera_git.bb +++ b/recipes-smalltalk/smalltalk/soapopera_git.bb @@ -1,4 +1,4 @@ -DESCRITOPN = "" +DESCRIPTION = "" HOMEPAGE = "https://gitorious.org/gnu-smalltalk-ports/soapopera" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ From 056de69a162c26551a5317967d96dc5df2ea255b Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 5 Jan 2013 20:17:17 +0800 Subject: [PATCH 10/29] misc: Use SRCPV inside the PV instead of the SRCREV --- 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 +- recipes-smalltalk/smalltalk/petitparser-tests_git.bb | 2 +- recipes-smalltalk/smalltalk/petitparser_git.bb | 2 +- recipes-smalltalk/smalltalk/soapopera_git.bb | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/recipes-smalltalk/osmocom/osmo-st-asn1_git.bb b/recipes-smalltalk/osmocom/osmo-st-asn1_git.bb index 0517b5f68b..bccc6791df 100644 --- a/recipes-smalltalk/osmocom/osmo-st-asn1_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-asn1_git.bb @@ -9,5 +9,5 @@ require smalltalk-package.inc S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-asn1;protocol=git;branch=master" SRCREV = "59f3d7ac47c39eef88fa186531d706e844e19bb5" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-smalltalk/osmocom/osmo-st-core_git.bb b/recipes-smalltalk/osmocom/osmo-st-core_git.bb index d4a3ef9f0a..02912dc00b 100644 --- a/recipes-smalltalk/osmocom/osmo-st-core_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-core_git.bb @@ -11,5 +11,5 @@ RDEPENDS += "osmo-st-logging" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-core;protocol=git;branch=master" SRCREV = "2b81cc18c6cd29c8d944a3d8c152c4a19ff882c0" -PV = "0.0.1+gitr${SRCREV}" +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 640bf9bb1b..38b707cba3 100644 --- a/recipes-smalltalk/osmocom/osmo-st-gsm_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-gsm_git.bb @@ -11,5 +11,5 @@ RDEPENDS += "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" -PV = "0.0.1+gitr${SRCREV}" +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 67e5d481b6..1c58a83507 100644 --- a/recipes-smalltalk/osmocom/osmo-st-logging_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-logging_git.bb @@ -9,5 +9,5 @@ require smalltalk-package.inc S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-logging;protocol=git;branch=master" SRCREV = "39eeb846821a2b1e6b0eb1c932eb4c1326db8a28" -PV = "0.0.2+gitr${SRCREV}" +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 7f0903a8f3..28a0fb4f03 100644 --- a/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb @@ -11,5 +11,5 @@ RDEPENDS += "osmo-st-logging osmo-st-core" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-mgcp;protocol=git;branch=master" SRCREV = "ca0d7624a8320a452e7071c99063d319aa34aed1" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-smalltalk/osmocom/osmo-st-msc_git.bb b/recipes-smalltalk/osmocom/osmo-st-msc_git.bb index efd8d02fb2..be865fd81c 100644 --- a/recipes-smalltalk/osmocom/osmo-st-msc_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-msc_git.bb @@ -11,5 +11,5 @@ RDEPENDS += "osmo-st-logging osmo-st-network osmo-st-gsm" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-msc;protocol=git;branch=master" SRCREV = "37c768d3cb650fec0b004d163ec2ac3763dc583e" -PV = "0.0.1+gitr${SRCREV}" +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 18e5b0f3b5..6518450ac5 100644 --- a/recipes-smalltalk/osmocom/osmo-st-network_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-network_git.bb @@ -11,5 +11,5 @@ RDEPENDS += "osmo-st-logging" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-network;protocol=git;branch=master" SRCREV = "17ee24015f152322b73bdb769a5ce35152f71044" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.2+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-smalltalk/osmocom/osmo-st-sip_git.bb b/recipes-smalltalk/osmocom/osmo-st-sip_git.bb index a68eeb5388..01708e6e36 100644 --- a/recipes-smalltalk/osmocom/osmo-st-sip_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-sip_git.bb @@ -9,5 +9,5 @@ require smalltalk-package.inc S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-sip;protocol=git;branch=master" SRCREV = "c9bed5b2353518d4d73272006511f4bfecab01ae" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-smalltalk/osmocom/osmo-st-testphone_git.bb b/recipes-smalltalk/osmocom/osmo-st-testphone_git.bb index 0a58271aaa..0a6e27c400 100644 --- a/recipes-smalltalk/osmocom/osmo-st-testphone_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-testphone_git.bb @@ -11,5 +11,5 @@ RDEPENDS += "osmo-st-network osmo-st-logging osmo-st-gsm" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-testphone;protocol=git;branch=master" SRCREV = "41fcc5d89938a1b2f246c8ff67f3d8482bcd1529" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-smalltalk/smalltalk/petitparser-tests_git.bb b/recipes-smalltalk/smalltalk/petitparser-tests_git.bb index 30a5764eac..4d55fe0829 100644 --- a/recipes-smalltalk/smalltalk/petitparser-tests_git.bb +++ b/recipes-smalltalk/smalltalk/petitparser-tests_git.bb @@ -12,6 +12,6 @@ RDEPENDS += "petitparser" S = "${WORKDIR}/git" SRC_URI = "git://gitorious.org/gnu-smalltalk-ports/petitparser-tests.git;protocol=git;branch=master" SRCREV = "4b112d1f1af9692807bd28ae192b1fdc69f8c564" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-smalltalk/smalltalk/petitparser_git.bb b/recipes-smalltalk/smalltalk/petitparser_git.bb index 119cd14441..c96ba5a340 100644 --- a/recipes-smalltalk/smalltalk/petitparser_git.bb +++ b/recipes-smalltalk/smalltalk/petitparser_git.bb @@ -9,6 +9,6 @@ require smalltalk-package.inc S = "${WORKDIR}/git" SRC_URI = "git://gitorious.org/gnu-smalltalk-ports/petitparser.git;protocol=git;branch=master" SRCREV = "9b76e8cf054cb6bdbc7bc5635c3126a2fefd1a85" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-smalltalk/smalltalk/soapopera_git.bb b/recipes-smalltalk/smalltalk/soapopera_git.bb index a6ca6f1428..07310d4c9e 100644 --- a/recipes-smalltalk/smalltalk/soapopera_git.bb +++ b/recipes-smalltalk/smalltalk/soapopera_git.bb @@ -9,6 +9,6 @@ require smalltalk-package.inc S = "${WORKDIR}/git" SRC_URI = "git://gitorious.org/gnu-smalltalk-ports/soapopera.git;protocol=git;branch=master" SRCREV = "21132f02889ef82e368144dbf8892d321d27661c" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" PR = "${INC_PR}.0" From c155d94108d1e27120527638d328d4d9a355c9d5 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 5 Jan 2013 20:19:35 +0800 Subject: [PATCH 11/29] misc: Ignore the usual files in this repository --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..45d62d8696 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.sw? From 343068cf9236f5a8f46a863cfbe2511238d0cadc Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 5 Jan 2013 23:20:57 +0800 Subject: [PATCH 12/29] shampoo: Add the shampoo remote development package --- recipes-smalltalk/shampoo/shampoo_git.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 recipes-smalltalk/shampoo/shampoo_git.bb diff --git a/recipes-smalltalk/shampoo/shampoo_git.bb b/recipes-smalltalk/shampoo/shampoo_git.bb new file mode 100644 index 0000000000..d2155f685d --- /dev/null +++ b/recipes-smalltalk/shampoo/shampoo_git.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Iliad webframework" +HOMEPAGE = "http://dmitrymatveev.co.uk/shampoo/contribution.html" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=d4a50099a9054443aacf3bb25a2d3b0e" + +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/dmatveev/shampoo.git;protocol=git;branch=master" +SRCREV = "8815d3c61dfc04d539c8bcc676d35fb1d568698c" +PV = "0.0.1+gitr${SRCPV}" +PR = "r1" + +RDEPENDS = "smalltalk-digest" + +inherit smalltalk_package From 66dbe39b2b89ce8382ffb1a47e18c6726962b575 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Mon, 18 Mar 2013 19:14:46 -0700 Subject: [PATCH 13/29] layer.conf: avoid unnecessary early expansion with := bitbake handles immediate expansions of LAYERDIR for us automatically. Signed-off-by: Christopher Larson --- conf/layer.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index d902696c71..6885b04e8d 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -1,10 +1,10 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have a packages directory, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend" +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "smalltalk" -BBFILE_PATTERN_smalltalk := "^${LAYERDIR}/" +BBFILE_PATTERN_smalltalk = "^${LAYERDIR}/" BBFILE_PRIORITY_smalltalk = "1" From dd26be3587b312ea246b16f39b2b877f1a6c7445 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 24 Apr 2013 16:02:24 +0200 Subject: [PATCH 14/29] smalltalk: Make sure that TCL/TK is disabled when building it --- recipes-smalltalk/smalltalk/smalltalk.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-smalltalk/smalltalk/smalltalk.inc b/recipes-smalltalk/smalltalk/smalltalk.inc index 1cfca43e02..de3cfd1309 100644 --- a/recipes-smalltalk/smalltalk/smalltalk.inc +++ b/recipes-smalltalk/smalltalk/smalltalk.inc @@ -7,7 +7,7 @@ INC_PR = "2" DEPENDS = "smalltalk-native gnutls readline" DEPENDS_virtclass-native = "gnutls-native" -EXTRA_OECONF = "--disable-static --disable-gtk --without-x --without-opengl" +EXTRA_OECONF = "--disable-static --disable-gtk --without-x --without-opengl --with-tcl=/bin/false --with-tk=/bin/false" PACKAGES =+ "${PN}-digest ${PN}-expat ${PN}-gdbm ${PN}-sdl ${PN}-sqlite \ ${PN}-seaside ${PN}-magritte ${PN}-magritte-seaside ${PN}-examples " From 582607011a2b50ead6b49f880caee40cd038791f Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 24 Apr 2013 17:28:47 +0200 Subject: [PATCH 15/29] smalltalk: Make it work with the latest Poky version * disable dev-so for the plugin libraries * split into more packages --- recipes-smalltalk/smalltalk/smalltalk.inc | 30 ++++++++++++++++++----- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/recipes-smalltalk/smalltalk/smalltalk.inc b/recipes-smalltalk/smalltalk/smalltalk.inc index de3cfd1309..37e791e4bb 100644 --- a/recipes-smalltalk/smalltalk/smalltalk.inc +++ b/recipes-smalltalk/smalltalk/smalltalk.inc @@ -2,19 +2,37 @@ DESCRIPTION = "GNU Smalltalk." HOMEPAGE = "http://smalltalk.gnu.org/" LICENSE = "GPLv2+" -INC_PR = "2" +INC_PR = "7" DEPENDS = "smalltalk-native gnutls readline" DEPENDS_virtclass-native = "gnutls-native" -EXTRA_OECONF = "--disable-static --disable-gtk --without-x --without-opengl --with-tcl=/bin/false --with-tk=/bin/false" -PACKAGES =+ "${PN}-digest ${PN}-expat ${PN}-gdbm ${PN}-sdl ${PN}-sqlite \ - ${PN}-seaside ${PN}-magritte ${PN}-magritte-seaside ${PN}-examples " +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" +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" + +# skip dev-so for plugins +INSANE_SKIP_${PN}-digest = "dev-so" +INSANE_SKIP_${PN}-expat = "dev-so" +INSANE_SKIP_${PN}-iconv = "dev-so" +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}-zlib = "dev-so" + +# gst-tool and such +INSANE_SKIP_${PN} = "useless-rpaths" FILES_${PN}-digest = "${libdir}/smalltalk/digest*.so \ ${datadir}/smalltalk/Digest.star" FILES_${PN}-expat = "${libdir}/smalltalk/expat*.so \ ${datadir}/smalltalk/XML-Expat.star" +FILES_${PN}-iconv = "${libdir}/smalltalk/iconv*.so \ + ${datadir}/smalltalk/I18N.star ${datadir}/smalltalk/Iconv.star" +FILES_${PN}-i18n = "${libdir}/smalltalk/i18n*.so \ + ${datadir}/smalltalk/I18N.star ${datadir}/smalltalk/I18N.star" FILES_${PN}-gdbm = "${libdir}/smalltalk/gdbm*.so" FILES_${PN}-sdl = "${libdir}/smalltalk/sdl*.so" FILES_${PN}-sqlite = "${libdir}/smalltalk/dbd-sqlite*.so \ @@ -26,6 +44,8 @@ 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}-zlib = "${libdir}/smalltalk/zlib*.so \ + ${datadir}/smalltalk/ZLib.star" FILES_${PN}-examples = "${datadir}/smalltalk/examples/* ${datadir}/smalltalk/unsupported/*" @@ -37,13 +57,11 @@ do_configure() { sed -i -e 's/^GST_PACKAGE = .*$/GST_PACKAGE = XZIP="$(XZIP)" gst-package $(GST_OPTS)/' ${S}/Makefile.am sed -i -e 's/"$(abs_top_builddir)\/gst$(EXEEXT)"/gst/' ${S}/Makefile.am autotools_do_configure - rm -f ${S}/libc.la } do_configure_virtclass-native() { autotools_do_configure sed -i -e 's/^module_DATA.*$//' ${S}/Makefile - rm -f ${S}/libc.la } do_install_append() { From 6c8ddf8d6d231e9472d46d56f32ec983cc420d7a Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 24 Apr 2013 17:29:40 +0200 Subject: [PATCH 16/29] misc: Use RDEPENDS_${PN} to avoid warnings on new poky --- classes/smalltalk_package.bbclass | 2 +- recipes-smalltalk/osmocom/osmo-st-core_git.bb | 2 +- recipes-smalltalk/osmocom/osmo-st-gsm_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-testphone_git.bb | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/classes/smalltalk_package.bbclass b/classes/smalltalk_package.bbclass index 0e6b1e6830..2333ec1fbe 100644 --- a/classes/smalltalk_package.bbclass +++ b/classes/smalltalk_package.bbclass @@ -1,5 +1,5 @@ DEPENDS = "smalltalk-native" -RDEPENDS = "smalltalk" +RDEPENDS_${PN} = "smalltalk" smalltalk_package_do_compile() { gst < /dev/null diff --git a/recipes-smalltalk/osmocom/osmo-st-core_git.bb b/recipes-smalltalk/osmocom/osmo-st-core_git.bb index 02912dc00b..46253502d3 100644 --- a/recipes-smalltalk/osmocom/osmo-st-core_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-core_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 require smalltalk-package.inc -RDEPENDS += "osmo-st-logging" +RDEPENDS_${PN} += "osmo-st-logging" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-core;protocol=git;branch=master" diff --git a/recipes-smalltalk/osmocom/osmo-st-gsm_git.bb b/recipes-smalltalk/osmocom/osmo-st-gsm_git.bb index 38b707cba3..c8dc75354b 100644 --- a/recipes-smalltalk/osmocom/osmo-st-gsm_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-gsm_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 require smalltalk-package.inc -RDEPENDS += "osmo-st-core osmo-st-network osmo-st-logging" +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" diff --git a/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb b/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb index 28a0fb4f03..af07425e01 100644 --- a/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 require smalltalk-package.inc -RDEPENDS += "osmo-st-logging osmo-st-core" +RDEPENDS_${PN} += "osmo-st-logging osmo-st-core" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-mgcp;protocol=git;branch=master" diff --git a/recipes-smalltalk/osmocom/osmo-st-msc_git.bb b/recipes-smalltalk/osmocom/osmo-st-msc_git.bb index be865fd81c..15e6b72dbb 100644 --- a/recipes-smalltalk/osmocom/osmo-st-msc_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-msc_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 require smalltalk-package.inc -RDEPENDS += "osmo-st-logging osmo-st-network osmo-st-gsm" +RDEPENDS_${PN} += "osmo-st-logging osmo-st-network osmo-st-gsm" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-msc;protocol=git;branch=master" diff --git a/recipes-smalltalk/osmocom/osmo-st-network_git.bb b/recipes-smalltalk/osmocom/osmo-st-network_git.bb index 6518450ac5..eaac120150 100644 --- a/recipes-smalltalk/osmocom/osmo-st-network_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-network_git.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://osmocom.org" require smalltalk-package.inc -RDEPENDS += "osmo-st-logging" +RDEPENDS_${PN} += "osmo-st-logging" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-network;protocol=git;branch=master" diff --git a/recipes-smalltalk/osmocom/osmo-st-testphone_git.bb b/recipes-smalltalk/osmocom/osmo-st-testphone_git.bb index 0a6e27c400..f43bae2159 100644 --- a/recipes-smalltalk/osmocom/osmo-st-testphone_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-testphone_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 require smalltalk-package.inc -RDEPENDS += "osmo-st-network osmo-st-logging osmo-st-gsm" +RDEPENDS_${PN} += "osmo-st-network osmo-st-logging osmo-st-gsm" S = "${WORKDIR}/git" SRC_URI = "git://git.osmocom.org/smalltalk/osmo-st-testphone;protocol=git;branch=master" From c05c4ca9ef8d449678a98af0723c840d4229f5c6 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 24 Apr 2013 17:39:02 +0200 Subject: [PATCH 17/29] iliad: Add grease and add more dependencies to it --- recipes-smalltalk/grease/grease_git.bb | 17 +++++++++++++++++ recipes-smalltalk/iliad/iliad_git.bb | 4 +++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 recipes-smalltalk/grease/grease_git.bb diff --git a/recipes-smalltalk/grease/grease_git.bb b/recipes-smalltalk/grease/grease_git.bb new file mode 100644 index 0000000000..c9d9185da9 --- /dev/null +++ b/recipes-smalltalk/grease/grease_git.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Grease compability layer" +HOMEPAGE = "http://github.com/NicolasPetton/grease" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/NicolasPetton/Grease.git;protocol=git;branch=master" +SRCREV = "131f4216188310992db37836e0ea248a9a152406" +PV = "3.0+gitr${SRCPV}" +PR = "r2" + + +inherit smalltalk_package + +RDEPENDS_${PN} += "smalltalk-digest" diff --git a/recipes-smalltalk/iliad/iliad_git.bb b/recipes-smalltalk/iliad/iliad_git.bb index f365a5c640..4d10b4b869 100644 --- a/recipes-smalltalk/iliad/iliad_git.bb +++ b/recipes-smalltalk/iliad/iliad_git.bb @@ -9,10 +9,12 @@ S = "${WORKDIR}/git" SRC_URI = "git://github.com/zecke/iliad-stable.git;protocol=git;branch=master" SRCREV = "3469a322b9cae17d452fae1b38d661e14e4ae902" PV = "0.9.1+gitr${SRCPV}" -PR = "r1" +PR = "r3" inherit smalltalk_package +RDEPENDS_${PN} += "smalltalk-iconv grease" + do_compile() { gst < /dev/null find ${S} -name package.xml -execdir gst-package --target-directory="${S}" {} \; From 27391a18267b678b8ec9a68f0a9b9c8e89a6f81b Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 25 Apr 2013 10:45:11 +0200 Subject: [PATCH 18/29] smalltalk: Enable the readline support on the cli The detection code appears to distinguish between libedit (BSD re-implementation of readline) and GNU readline and it does that by executing the code. --- recipes-smalltalk/smalltalk/smalltalk.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-smalltalk/smalltalk/smalltalk.inc b/recipes-smalltalk/smalltalk/smalltalk.inc index 37e791e4bb..846bb5f73c 100644 --- a/recipes-smalltalk/smalltalk/smalltalk.inc +++ b/recipes-smalltalk/smalltalk/smalltalk.inc @@ -2,12 +2,12 @@ DESCRIPTION = "GNU Smalltalk." HOMEPAGE = "http://smalltalk.gnu.org/" LICENSE = "GPLv2+" -INC_PR = "7" +INC_PR = "8" DEPENDS = "smalltalk-native gnutls readline" DEPENDS_virtclass-native = "gnutls-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" +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" From 9be7273d0fccd4a45166bafb5fec41d2af5462b6 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 25 Apr 2013 10:47:59 +0200 Subject: [PATCH 19/29] iliad: Upgrade iliad to the master version with bug fixes * Upgrade to the master version for a newer (but older than from what I patched it) jquery * Queries to js and stylesheet do not appear to add the ?_=NR that allow caching of requests in chrome --- recipes-smalltalk/iliad/iliad_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-smalltalk/iliad/iliad_git.bb b/recipes-smalltalk/iliad/iliad_git.bb index 4d10b4b869..36df220faf 100644 --- a/recipes-smalltalk/iliad/iliad_git.bb +++ b/recipes-smalltalk/iliad/iliad_git.bb @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/zecke/iliad-stable.git;protocol=git;branch=master" -SRCREV = "3469a322b9cae17d452fae1b38d661e14e4ae902" +SRC_URI = "git://github.com/zecke/iliad.git;protocol=git;branch=master" +SRCREV = "9d660f6dedc4dc6418a7dff8a24f93bd351fa224" PV = "0.9.1+gitr${SRCPV}" -PR = "r3" +PR = "r4" inherit smalltalk_package From 6bec0faf4aaa68164382e2df9d57c30593e1eed4 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 25 Apr 2013 11:33:52 +0200 Subject: [PATCH 20/29] osmo-st-*: Add missing rdepends between the packages --- recipes-smalltalk/osmocom/osmo-st-asn1_git.bb | 4 +++- recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb | 4 ++-- recipes-smalltalk/osmocom/osmo-st-msc_git.bb | 2 +- recipes-smalltalk/osmocom/osmo-st-network_git.bb | 4 ++-- recipes-smalltalk/osmocom/osmo-st-sip_git.bb | 4 +++- recipes-smalltalk/osmocom/osmo-st-testphone_git.bb | 4 ++-- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/recipes-smalltalk/osmocom/osmo-st-asn1_git.bb b/recipes-smalltalk/osmocom/osmo-st-asn1_git.bb index bccc6791df..cf5a74ee44 100644 --- a/recipes-smalltalk/osmocom/osmo-st-asn1_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-asn1_git.bb @@ -6,8 +6,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 require smalltalk-package.inc +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" PV = "0.0.1+gitr${SRCPV}" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" diff --git a/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb b/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb index af07425e01..121b84d4d8 100644 --- a/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-mgcp_git.bb @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 require smalltalk-package.inc -RDEPENDS_${PN} += "osmo-st-logging osmo-st-core" +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" PV = "0.0.1+gitr${SRCPV}" -PR = "${INC_PR}.0" +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 15e6b72dbb..037ec337ea 100644 --- a/recipes-smalltalk/osmocom/osmo-st-msc_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-msc_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 require smalltalk-package.inc -RDEPENDS_${PN} += "osmo-st-logging osmo-st-network osmo-st-gsm" +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" diff --git a/recipes-smalltalk/osmocom/osmo-st-network_git.bb b/recipes-smalltalk/osmocom/osmo-st-network_git.bb index eaac120150..a2a7303aa8 100644 --- a/recipes-smalltalk/osmocom/osmo-st-network_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-network_git.bb @@ -6,10 +6,10 @@ HOMEPAGE = "http://osmocom.org" require smalltalk-package.inc -RDEPENDS_${PN} += "osmo-st-logging" +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" PV = "0.0.2+gitr${SRCPV}" -PR = "${INC_PR}.0" +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 01708e6e36..e26be4ef8e 100644 --- a/recipes-smalltalk/osmocom/osmo-st-sip_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-sip_git.bb @@ -6,8 +6,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 require smalltalk-package.inc +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" PV = "0.0.1+gitr${SRCPV}" -PR = "${INC_PR}.0" +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 f43bae2159..c1c85c1e0c 100644 --- a/recipes-smalltalk/osmocom/osmo-st-testphone_git.bb +++ b/recipes-smalltalk/osmocom/osmo-st-testphone_git.bb @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 require smalltalk-package.inc -RDEPENDS_${PN} += "osmo-st-network osmo-st-logging osmo-st-gsm" +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" PV = "0.0.1+gitr${SRCPV}" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" From 2dff10d3e12fe377fccda8bdf0cd1e084b5fb99c Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 25 Apr 2013 11:35:35 +0200 Subject: [PATCH 21/29] iliad: Fix the fix for the multiple select --- recipes-smalltalk/iliad/iliad_git.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes-smalltalk/iliad/iliad_git.bb b/recipes-smalltalk/iliad/iliad_git.bb index 36df220faf..dc3ef78d5b 100644 --- a/recipes-smalltalk/iliad/iliad_git.bb +++ b/recipes-smalltalk/iliad/iliad_git.bb @@ -7,12 +7,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 S = "${WORKDIR}/git" SRC_URI = "git://github.com/zecke/iliad.git;protocol=git;branch=master" -SRCREV = "9d660f6dedc4dc6418a7dff8a24f93bd351fa224" -PV = "0.9.1+gitr${SRCPV}" -PR = "r4" +SRCREV = "9cfd753a5ce7f811d87f28796d32f3fcaa1c878c" +PV = "0.9.1.1+gitr${SRCPV}" inherit smalltalk_package +PR = "r5" + RDEPENDS_${PN} += "smalltalk-iconv grease" do_compile() { From 0978b0e878223ac72d5b3b7c0fa49b5b355c5d24 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 25 Apr 2013 16:24:53 +0200 Subject: [PATCH 22/29] libsigsegv: Add the latest libsigsegv 2.10 release --- recipes-gnu/libsigsegv/libsigsegv_2.10.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 recipes-gnu/libsigsegv/libsigsegv_2.10.bb diff --git a/recipes-gnu/libsigsegv/libsigsegv_2.10.bb b/recipes-gnu/libsigsegv/libsigsegv_2.10.bb new file mode 100644 index 0000000000..8f81e92626 --- /dev/null +++ b/recipes-gnu/libsigsegv/libsigsegv_2.10.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Handling page faults in user mode" +HOMEPAGE = "http://www.gnu.org/software/libsigsegv/" + +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=a4e436f29b73fbaa5360691ba7fcbd8c" + +SRC_URI = "${GNU_MIRROR}/libsigsegv/libsigsegv-2.10.tar.gz" +SRC_URI[md5sum] = "7f96fb1f65b3b8cbc1582fb7be774f0f" +SRC_URI[sha256sum] = "8460a4a3dd4954c3d96d7a4f5dd5bc4d9b76f5754196aa245287553b26d2199a" + +PR = "r1" + +inherit autotools From 9c0bc73006f3e67e2a259fc1bbc0764aaa454eeb Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 25 Apr 2013 16:31:58 +0200 Subject: [PATCH 23/29] smalltalk: Depend on the external libsigsegv --- recipes-smalltalk/smalltalk/smalltalk.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-smalltalk/smalltalk/smalltalk.inc b/recipes-smalltalk/smalltalk/smalltalk.inc index 846bb5f73c..c33e85886d 100644 --- a/recipes-smalltalk/smalltalk/smalltalk.inc +++ b/recipes-smalltalk/smalltalk/smalltalk.inc @@ -2,9 +2,9 @@ DESCRIPTION = "GNU Smalltalk." HOMEPAGE = "http://smalltalk.gnu.org/" LICENSE = "GPLv2+" -INC_PR = "8" +INC_PR = "9" -DEPENDS = "smalltalk-native gnutls readline" +DEPENDS = "smalltalk-native gnutls readline libsigsegv" DEPENDS_virtclass-native = "gnutls-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'" From f2d9e2e9b0d25ab1d1249b8037b66669ad1a2db6 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 28 Apr 2013 16:09:51 +0200 Subject: [PATCH 24/29] smalltalk: Add an alpha version and provide a specific no-doc patch --- .../smalltalk/smalltalk-3.2.91/no-doc.patch | 16 +++++++++ .../smalltalk/smalltalk_3.2.91.bb | 33 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 recipes-smalltalk/smalltalk/smalltalk-3.2.91/no-doc.patch create mode 100644 recipes-smalltalk/smalltalk/smalltalk_3.2.91.bb diff --git a/recipes-smalltalk/smalltalk/smalltalk-3.2.91/no-doc.patch b/recipes-smalltalk/smalltalk/smalltalk-3.2.91/no-doc.patch new file mode 100644 index 0000000000..6c4e30657f --- /dev/null +++ b/recipes-smalltalk/smalltalk/smalltalk-3.2.91/no-doc.patch @@ -0,0 +1,16 @@ +The build system tries to execute the gst-tool gst-doc and gst-tool is +not installed and the easiest right now is to not build the docs + +Index: smalltalk-3.2.91/Makefile.am +=================================================================== +--- smalltalk-3.2.91.orig/Makefile.am 2013-04-28 16:07:14.018325529 +0200 ++++ smalltalk-3.2.91/Makefile.am 2013-04-28 16:08:10.426335670 +0200 +@@ -23,7 +23,7 @@ + gstdatadir=$(pkgdatadir) + + DIST_SUBDIRS = lib-src snprintfv lightning libgst \ +- . $(ALL_PACKAGES) tests doc ++ . $(ALL_PACKAGES) tests + + SUBDIRS = lib-src lightning $(subdirs) + SUBDIRS += libgst . $(BUILT_PACKAGES) doc tests diff --git a/recipes-smalltalk/smalltalk/smalltalk_3.2.91.bb b/recipes-smalltalk/smalltalk/smalltalk_3.2.91.bb new file mode 100644 index 0000000000..2d649f945c --- /dev/null +++ b/recipes-smalltalk/smalltalk/smalltalk_3.2.91.bb @@ -0,0 +1,33 @@ +require ${PN}.inc +PR = "r12.${INC_PR}" + +# TODO: Upgrade, package the docs, split the packages, create gst class + +EXTRA_OECONF_append_arm = " --disable-profiling --disable-prefetch" + +SRC_URI = " \ + http://www.secretlabs.de/gnu-smalltalk/smalltalk-${PV}.tar.gz \ + file://no-doc.patch \ +" + +SRC_URI[md5sum] = "aa092b507d93173177eecca63e3ddd6a" +SRC_URI[sha256sum] = "662ca7364c9248a95ec0ebbd56336062d1d72a1feb8c17560f4f7d3b7aea331f" + + +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + + +# glib is only in 3.2.90+ +PACKAGES =+ "${PN}-glib ${PN}-osprocess ${PN}-gtktools" + + +INSANE_SKIP_${PN}-glib = "dev-so useless-rpaths" +FILES_${PN}-glib = "${libdir}/smalltalk/gst-glib*.so \ + ${datadir}/smalltalk/GLib.star ${libdir}/libgst-gobject.so.*" + +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" From 709a5684c50b6f7d085330eae36b93679f79f622 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 10 May 2013 09:11:23 +0200 Subject: [PATCH 25/29] smalltalk: GNU Smalltalk requires libtool for the DLD feature --- recipes-smalltalk/smalltalk/smalltalk.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-smalltalk/smalltalk/smalltalk.inc b/recipes-smalltalk/smalltalk/smalltalk.inc index c33e85886d..124680e11b 100644 --- a/recipes-smalltalk/smalltalk/smalltalk.inc +++ b/recipes-smalltalk/smalltalk/smalltalk.inc @@ -2,9 +2,9 @@ DESCRIPTION = "GNU Smalltalk." HOMEPAGE = "http://smalltalk.gnu.org/" LICENSE = "GPLv2+" -INC_PR = "9" +INC_PR = "10" -DEPENDS = "smalltalk-native gnutls readline libsigsegv" +DEPENDS = "smalltalk-native gnutls readline libsigsegv libtool" DEPENDS_virtclass-native = "gnutls-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'" From 8b772e5edb036d80e8df66898615675136885e7a Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 10 May 2013 22:18:04 +0200 Subject: [PATCH 26/29] smalltalk: Depend on libffi/libffi-native as well --- recipes-smalltalk/smalltalk/smalltalk.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-smalltalk/smalltalk/smalltalk.inc b/recipes-smalltalk/smalltalk/smalltalk.inc index 124680e11b..f66043cb09 100644 --- a/recipes-smalltalk/smalltalk/smalltalk.inc +++ b/recipes-smalltalk/smalltalk/smalltalk.inc @@ -2,10 +2,10 @@ DESCRIPTION = "GNU Smalltalk." HOMEPAGE = "http://smalltalk.gnu.org/" LICENSE = "GPLv2+" -INC_PR = "10" +INC_PR = "11" -DEPENDS = "smalltalk-native gnutls readline libsigsegv libtool" -DEPENDS_virtclass-native = "gnutls-native" +DEPENDS = "smalltalk-native gnutls readline libsigsegv libtool libffi" +DEPENDS_virtclass-native = "gnutls-native libffi-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 \ From ca9db108e802097db80783606a23b6f5ab047646 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 15 May 2013 13:47:57 +0200 Subject: [PATCH 27/29] smalltalk_package: Append to the RDEPENDS instead of overwriting them --- classes/smalltalk_package.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/smalltalk_package.bbclass b/classes/smalltalk_package.bbclass index 2333ec1fbe..5eb9ca6248 100644 --- a/classes/smalltalk_package.bbclass +++ b/classes/smalltalk_package.bbclass @@ -1,5 +1,5 @@ DEPENDS = "smalltalk-native" -RDEPENDS_${PN} = "smalltalk" +RDEPENDS_${PN} += "smalltalk" smalltalk_package_do_compile() { gst < /dev/null From ebb83ef4e0b4433fda7967e35d599faff6419e61 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 2 Jun 2013 08:50:33 +0200 Subject: [PATCH 28/29] misc: Use RDEPENDS_${PN} instead of RDEPENDS to fix parsing issues --- recipes-smalltalk/shampoo/shampoo_git.bb | 4 ++-- recipes-smalltalk/smalltalk/petitparser-tests_git.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-smalltalk/shampoo/shampoo_git.bb b/recipes-smalltalk/shampoo/shampoo_git.bb index d2155f685d..741b97a6bf 100644 --- a/recipes-smalltalk/shampoo/shampoo_git.bb +++ b/recipes-smalltalk/shampoo/shampoo_git.bb @@ -8,8 +8,8 @@ S = "${WORKDIR}/git" SRC_URI = "git://github.com/dmatveev/shampoo.git;protocol=git;branch=master" SRCREV = "8815d3c61dfc04d539c8bcc676d35fb1d568698c" PV = "0.0.1+gitr${SRCPV}" -PR = "r1" +PR = "r2" -RDEPENDS = "smalltalk-digest" +RDEPENDS_${PN} = "smalltalk-digest" inherit smalltalk_package diff --git a/recipes-smalltalk/smalltalk/petitparser-tests_git.bb b/recipes-smalltalk/smalltalk/petitparser-tests_git.bb index 4d55fe0829..90593ecf7b 100644 --- a/recipes-smalltalk/smalltalk/petitparser-tests_git.bb +++ b/recipes-smalltalk/smalltalk/petitparser-tests_git.bb @@ -7,11 +7,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 require smalltalk-package.inc -RDEPENDS += "petitparser" +RDEPENDS_${PN} += "petitparser" S = "${WORKDIR}/git" SRC_URI = "git://gitorious.org/gnu-smalltalk-ports/petitparser-tests.git;protocol=git;branch=master" SRCREV = "4b112d1f1af9692807bd28ae192b1fdc69f8c564" PV = "0.0.1+gitr${SRCPV}" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" From 11897ce53087bcf8393c3f0a295a109809125420 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 30 Aug 2013 18:02:16 +0200 Subject: [PATCH 29/29] smalltalk: Build a native libsigsegv and depend on zip-native These two dependencies are required for building the native package of GNU Smalltalk on a clean system. --- recipes-gnu/libsigsegv/libsigsegv_2.10.bb | 3 +++ recipes-smalltalk/smalltalk/smalltalk.inc | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/recipes-gnu/libsigsegv/libsigsegv_2.10.bb b/recipes-gnu/libsigsegv/libsigsegv_2.10.bb index 8f81e92626..5ec9323fe8 100644 --- a/recipes-gnu/libsigsegv/libsigsegv_2.10.bb +++ b/recipes-gnu/libsigsegv/libsigsegv_2.10.bb @@ -11,3 +11,6 @@ SRC_URI[sha256sum] = "8460a4a3dd4954c3d96d7a4f5dd5bc4d9b76f5754196aa245287553b26 PR = "r1" inherit autotools + + +BBCLASSEXTEND = "native" diff --git a/recipes-smalltalk/smalltalk/smalltalk.inc b/recipes-smalltalk/smalltalk/smalltalk.inc index f66043cb09..d72d69702b 100644 --- a/recipes-smalltalk/smalltalk/smalltalk.inc +++ b/recipes-smalltalk/smalltalk/smalltalk.inc @@ -4,8 +4,8 @@ LICENSE = "GPLv2+" INC_PR = "11" -DEPENDS = "smalltalk-native gnutls readline libsigsegv libtool libffi" -DEPENDS_virtclass-native = "gnutls-native libffi-native" +DEPENDS = "smalltalk-native gnutls readline libsigsegv libtool libffi zip-native" +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 \