diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2017-04-27 11:04:51 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-31 10:18:33 +0200 |
| commit | ec9e5ed06256ad92c818474cdb490dc0d3a0d0a3 (patch) | |
| tree | e16d2a838f4561d5538928a58f805e5f1373225a /meta-oe/recipes-devtools | |
| parent | 6775acb048dabd624c5c8197b683aba45ed91569 (diff) | |
| download | meta-openembedded-ec9e5ed06256ad92c818474cdb490dc0d3a0d0a3.tar.gz | |
recipes: remove blacklisted recipes
* as PNBLACKLIST message says, these recipes are blacklisted for long
time and nobody showed any interest to fix them
* remove all unused .patch and .inc files as well
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools')
17 files changed, 0 insertions, 1253 deletions
diff --git a/meta-oe/recipes-devtools/cloud9/cloud9/0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch b/meta-oe/recipes-devtools/cloud9/cloud9/0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch deleted file mode 100644 index b32311a82f..0000000000 --- a/meta-oe/recipes-devtools/cloud9/cloud9/0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | From ac1953d04f3f26d6aa5d8f53a9397d3ba0e96fa3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Koen Kooi <koen@circuitco.com> | ||
| 3 | Date: Fri, 11 May 2012 15:23:02 +0000 | ||
| 4 | Subject: [PATCH] ide: use 'node' as interpreter for sketches instead of | ||
| 5 | argv[0] | ||
| 6 | |||
| 7 | This enables running scripts with node 0.6.x instead of 0.4.x | ||
| 8 | |||
| 9 | Signed-off-by: root <root@beaglebone.(none)> | ||
| 10 | --- | ||
| 11 | server/cloud9/ide.js | 2 +- | ||
| 12 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/server/cloud9/ide.js b/server/cloud9/ide.js | ||
| 15 | index ce782f5..6c4e0f7 100644 | ||
| 16 | --- a/server/cloud9/ide.js | ||
| 17 | +++ b/server/cloud9/ide.js | ||
| 18 | @@ -53,7 +53,7 @@ var Ide = module.exports = function(options, httpServer, exts, socket) { | ||
| 19 | }; | ||
| 20 | |||
| 21 | this.$users = {}; | ||
| 22 | - this.nodeCmd = process.argv[0]; | ||
| 23 | + this.nodeCmd = "node"; | ||
| 24 | |||
| 25 | var davOptions = { | ||
| 26 | node: this.options.mountDir, | ||
| 27 | -- | ||
| 28 | 1.7.7 | ||
| 29 | |||
diff --git a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb deleted file mode 100644 index c6d78905d3..0000000000 --- a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb +++ /dev/null | |||
| @@ -1,118 +0,0 @@ | |||
| 1 | SUMMARY = "Meet Cloud9, development-as-a-service for Javascripters and other developers" | ||
| 2 | HOMEPAGE = "http://c9.io" | ||
| 3 | LICENSE = "GPLv3" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4784c3bcff601fd8f9515f52a11e7018" | ||
| 5 | |||
| 6 | PR = "r5" | ||
| 7 | |||
| 8 | # Nodejs-native for node-waf, nodejs4-native for the headers | ||
| 9 | DEPENDS = "libxml2 nodejs-native nodejs4-native" | ||
| 10 | |||
| 11 | PNBLACKLIST[cloud9] ?= "Not comatible with current nodejs 0.12, but upstream is working on it for v3 - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
| 12 | inherit systemd | ||
| 13 | |||
| 14 | SRC_URI = "git://github.com/ajaxorg/cloud9.git;name=cloud9ide \ | ||
| 15 | git://github.com/ajaxorg/o3;destsuffix=o3;name=o3 \ | ||
| 16 | git://github.com/ajaxorg/ace.git;destsuffix=git/support/ace;name=ace \ | ||
| 17 | git://github.com/ajaxorg/ace.wiki.git;destsuffix=git/support/ace/doc/wiki;name=acewiki \ | ||
| 18 | git://github.com/ajaxorg/apf.git;destsuffix=git/support/apf;name=apf \ | ||
| 19 | git://github.com/ajaxorg/async.js.git;destsuffix=git/support/asyncjs;name=asyncjs \ | ||
| 20 | git://github.com/ajaxorg/connect.git;destsuffix=git/support/connect;name=connect;branch=ajaxorg \ | ||
| 21 | git://github.com/jashkenas/coffee-script.git;destsuffix=git/support/connect/support/coffee-script;name=coffee-script \ | ||
| 22 | git://github.com/visionmedia/expresso.git;destsuffix=git/support/connect/support/expresso;name=expresso \ | ||
| 23 | git://github.com/visionmedia/node-jscoverage.git;destsuffix=git/support/connect/support/expresso/deps/jscoverage;name=jscoverage \ | ||
| 24 | git://github.com/cloudhead/less.js.git;destsuffix=git/support/connect/support/less;name=less \ | ||
| 25 | git://github.com/matehat/sass.js.git;destsuffix=git/support/connect/support/sass;name=sass \ | ||
| 26 | git://github.com/ajaxorg/jsDAV.git;destsuffix=git/support/jsdav;name=jsdav \ | ||
| 27 | git://github.com/fjakobs/async.js.git;destsuffix=git/support/jsdav/support/async.js;name=async-js \ | ||
| 28 | git://github.com/felixge/node-formidable.git;destsuffix=git/support/jsdav/support/formidable;name=formidable \ | ||
| 29 | git://github.com/ajaxorg/jsftp.git;destsuffix=git/support/jsdav/support/jsftp;name=jsftp \ | ||
| 30 | git://github.com/Gozala/streamer.git;destsuffix=git/support/jsdav/support/jsftp/support/streamer;name=streamer \ | ||
| 31 | git://github.com/ajaxorg/node-sftp.git;destsuffix=git/support/jsdav/support/node-sftp;name=sftp \ | ||
| 32 | git://github.com/ajaxorg/lib-v8debug.git;destsuffix=git/support/lib-v8debug;name=lib-v8debug \ | ||
| 33 | git://github.com/ajaxorg/socket.io.git;destsuffix=git/support/socket.io;name=socketio;branch=cadorn-upstream \ | ||
| 34 | git://github.com/LearnBoost/socket.io-client.git;destsuffix=git/support/socket.io-client;name=socketio-client \ | ||
| 35 | git://github.com/ajaxorg/treehugger.git;destsuffix=git/support/treehugger;name=treehugger \ | ||
| 36 | git://github.com/ajaxorg/UglifyJS.git;destsuffix=git/support/uglify-js;name=uglify-js \ | ||
| 37 | file://index.js \ | ||
| 38 | file://cloud9-avahi.service \ | ||
| 39 | file://cloud9.service \ | ||
| 40 | file://0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch \ | ||
| 41 | " | ||
| 42 | |||
| 43 | SRCREV_cloud9ide = "c4e2574896a22bb749f0500b25f41c888d346bed" | ||
| 44 | SRCREV_o3 = "d66d4e3252e505f44ada6804c8cab39915ce8afd" | ||
| 45 | SRCREV_ace = "0fc5392cbe46fb134052c3065a238ad8e3b31cfd" | ||
| 46 | SRCREV_acewiki = "d2a65d0addc2e5ab922bbff9cb6022a4652b4f13" | ||
| 47 | SRCREV_apf = "2560b762b2b0e5a8b46f8a4062f927a9a9d239f4" | ||
| 48 | SRCREV_asyncjs = "d36ead408e2959b1e99572114ef3a1b6a48c1072" | ||
| 49 | SRCREV_connect = "6bec95b51f2286b942bc7f340d62d816bcdc13d4" | ||
| 50 | SRCREV_coffee-script = "a53c104db16d3ac9d13cf9f16834edec250b9749" | ||
| 51 | SRCREV_expresso = "7f10ab7fa655299b4e2f519065b0495e6ac34ef2" | ||
| 52 | SRCREV_jscoverage = "0d4608a6b4275b020ba665389aa75897d5d4a584" | ||
| 53 | SRCREV_less = "a2807288008587b95c6c2f8ba5cac16f1bcab98f" | ||
| 54 | SRCREV_sass = "4dfd4c699e7a8baf226215ab044854c4507f4420" | ||
| 55 | SRCREV_jsdav = "f04ebf3d012cc8aeabfcfb2b8fab8966d52929e9" | ||
| 56 | SRCREV_async-js = "92fb710a70efd3cdc2376ebfba71a7fb3a4f1651" | ||
| 57 | SRCREV_formidable = "a37292d4b7d6d76a38909ed670334c9068d40871" | ||
| 58 | SRCREV_jsftp = "e3f10c8927347c170cdd0150ef38e18272acf942" | ||
| 59 | SRCREV_streamer = "1a7f75d4065819171ac91a09974199b932dbe17d" | ||
| 60 | SRCREV_sftp = "a0539345134970d7535a19cb2608e3d1bc119d71" | ||
| 61 | SRCREV_lib-v8debug = "7c11897f4bc77c7275c2b6dff5becc72ac018662" | ||
| 62 | SRCREV_socketio = "735d5239b325df2ba67d2b9bb4ec32442283bc06" | ||
| 63 | SRCREV_socketio-client = "4375ef1344ecb8ad75a3848a00af6b391822f86b" | ||
| 64 | SRCREV_treehugger = "436d0d6dd0ce43782e6be08ad12c356730626996" | ||
| 65 | SRCREV_uglify-js = "941c845c4a01e4e47a158458fe846eb36d0828ad" | ||
| 66 | |||
| 67 | SRCREV_FORMAT = "cloud9ide" | ||
| 68 | |||
| 69 | S = "${WORKDIR}/git" | ||
| 70 | |||
| 71 | do_configure () { | ||
| 72 | cd ${WORKDIR}/o3 | ||
| 73 | node-waf -vv configure | ||
| 74 | } | ||
| 75 | |||
| 76 | EXTRA_CXXFLAGS = "-Idefault/include -I../include -Idefault/hosts -I../hosts -Idefault/modules -I../modules -Idefault/deps -I../deps -I${STAGING_DIR_NATIVE}/usr/include/node4 -fPIC -DPIC" | ||
| 77 | |||
| 78 | do_compile () { | ||
| 79 | cd ${WORKDIR}/o3 | ||
| 80 | node4 tools/gluegen.js | ||
| 81 | cd hosts | ||
| 82 | ${CXX} ${TARGET_CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o sh_node.o node-o3/sh_node.cc | ||
| 83 | ${CXX} ${TARGET_CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o sh_node_libs.o node-o3/sh_node_libs.cc | ||
| 84 | cd .. | ||
| 85 | ${CXX} ${TARGET_LDFLAGS} hosts/sh_node.o hosts/sh_node_libs.o -o o3.node -shared -Wl,-Bdynamic -lxml2 | ||
| 86 | } | ||
| 87 | |||
| 88 | do_install () { | ||
| 89 | install -m 0755 -d ${D}${datadir}/cloud9 ${D}${bindir} ${D}/var/lib/cloud9 | ||
| 90 | rsync -r --exclude=".*" ${S}/* ${D}${datadir}/cloud9 | ||
| 91 | |||
| 92 | touch ${D}${bindir}/cloud9 | ||
| 93 | echo "#!/bin/sh" > ${D}${bindir}/cloud9 | ||
| 94 | echo "node4 ${datadir}/cloud9/bin/cloud9.js -l 0.0.0.0 -w /var/lib/cloud9 -p 3000" >> ${D}${bindir}/cloud9 | ||
| 95 | chmod 0755 ${D}${bindir}/cloud9 | ||
| 96 | |||
| 97 | install -m 0755 -d ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml | ||
| 98 | install -m 0644 ${WORKDIR}/index.js ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/index.js | ||
| 99 | install -m 0644 ${WORKDIR}/o3/modules/o3.js ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.js | ||
| 100 | install -m 0755 ${WORKDIR}/o3/o3.node ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.node | ||
| 101 | |||
| 102 | install -m 0755 -d ${D}${sysconfdir}/avahi/services/ | ||
| 103 | install -m 0644 ${WORKDIR}/cloud9-avahi.service ${D}${sysconfdir}/avahi/services/ | ||
| 104 | |||
| 105 | install -d ${D}${systemd_unitdir}/system | ||
| 106 | install -m 0644 ${WORKDIR}/cloud9.service ${D}${systemd_unitdir}/system | ||
| 107 | } | ||
| 108 | |||
| 109 | FILES_${PN}-dbg += "${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/.debug \ | ||
| 110 | ${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/.debug \ | ||
| 111 | " | ||
| 112 | |||
| 113 | RDEPENDS_${PN} = "nodejs4 nodejs gzip" | ||
| 114 | |||
| 115 | RPROVIDES_${PN} += "${PN}-systemd" | ||
| 116 | RREPLACES_${PN} += "${PN}-systemd" | ||
| 117 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
| 118 | SYSTEMD_SERVICE_${PN} = "cloud9.service" | ||
diff --git a/meta-oe/recipes-devtools/dt/dt/Stop-using-relative-path-for-scsilib.c-link.patch b/meta-oe/recipes-devtools/dt/dt/Stop-using-relative-path-for-scsilib.c-link.patch deleted file mode 100644 index ccb9a02da9..0000000000 --- a/meta-oe/recipes-devtools/dt/dt/Stop-using-relative-path-for-scsilib.c-link.patch +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | From 4cf7e16fe9b773e2e7763d4b773854eefe2aa9ab Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
| 3 | Date: Tue, 12 Jan 2016 09:59:55 -0200 | ||
| 4 | Subject: [PATCH] Stop using relative path for scsilib.c link | ||
| 5 | Organization: O.S. Systems Software LTDA. | ||
| 6 | |||
| 7 | Upstream-Status: Pending | ||
| 8 | |||
| 9 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
| 10 | --- | ||
| 11 | Makefile.linux | 2 +- | ||
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/Makefile.linux b/Makefile.linux | ||
| 15 | index 78333ff..e210564 100644 | ||
| 16 | --- a/Makefile.linux | ||
| 17 | +++ b/Makefile.linux | ||
| 18 | @@ -129,7 +129,7 @@ scsilib.c: | ||
| 19 | echo "Please specify OS={aix,linux,hpux,solaris,windows}"; \ | ||
| 20 | exit 1; \ | ||
| 21 | fi; \ | ||
| 22 | - ln -sf ../scsilib-$(OS).c scsilib.c | ||
| 23 | + ln -sf scsilib-$(OS).c scsilib.c | ||
| 24 | |||
| 25 | print:; | ||
| 26 | @$(PRINTER) $(PRINTFLAGS) $(ALL_CFILES) | ||
| 27 | -- | ||
| 28 | 2.1.4 | ||
| 29 | |||
diff --git a/meta-oe/recipes-devtools/dt/dt/Use-tcsh-shell.patch b/meta-oe/recipes-devtools/dt/dt/Use-tcsh-shell.patch deleted file mode 100644 index 0c00fdf41e..0000000000 --- a/meta-oe/recipes-devtools/dt/dt/Use-tcsh-shell.patch +++ /dev/null | |||
| @@ -1,92 +0,0 @@ | |||
| 1 | From e3c6eb8776f659eb9e6eeccf90d785eff18ecf74 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
| 3 | Date: Mon, 15 Feb 2016 18:00:05 -0200 | ||
| 4 | Subject: [PATCH] Use 'tcsh' shell | ||
| 5 | Organization: O.S. Systems Software LTDA. | ||
| 6 | |||
| 7 | Upstream-Status: Pending | ||
| 8 | |||
| 9 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
| 10 | --- | ||
| 11 | Scripts/dta | 2 +- | ||
| 12 | Scripts/dtc | 2 +- | ||
| 13 | Scripts/dtf | 2 +- | ||
| 14 | Scripts/dtr | 2 +- | ||
| 15 | Scripts/dts | 2 +- | ||
| 16 | Scripts/dtt | 2 +- | ||
| 17 | Scripts/dtw | 2 +- | ||
| 18 | 7 files changed, 7 insertions(+), 7 deletions(-) | ||
| 19 | |||
| 20 | diff --git a/Scripts/dta b/Scripts/dta | ||
| 21 | index ebc7072..4f90247 100755 | ||
| 22 | --- a/Scripts/dta | ||
| 23 | +++ b/Scripts/dta | ||
| 24 | @@ -1,4 +1,4 @@ | ||
| 25 | -#!/bin/csh | ||
| 26 | +#!/bin/tcsh | ||
| 27 | # | ||
| 28 | # Script file to test asynchronous communication lines. | ||
| 29 | # | ||
| 30 | diff --git a/Scripts/dtc b/Scripts/dtc | ||
| 31 | index da69c2e..89d48c2 100755 | ||
| 32 | --- a/Scripts/dtc | ||
| 33 | +++ b/Scripts/dtc | ||
| 34 | @@ -1,4 +1,4 @@ | ||
| 35 | -#!/bin/csh | ||
| 36 | +#!/bin/tcsh | ||
| 37 | # %Z%%M% %I% %E% | ||
| 38 | # | ||
| 39 | # Date: August 7, 1990 | ||
| 40 | diff --git a/Scripts/dtf b/Scripts/dtf | ||
| 41 | index 9f8cd87..321d261 100755 | ||
| 42 | --- a/Scripts/dtf | ||
| 43 | +++ b/Scripts/dtf | ||
| 44 | @@ -1,4 +1,4 @@ | ||
| 45 | -#! /bin/csh | ||
| 46 | +#! /bin/tcsh | ||
| 47 | # | ||
| 48 | # Script file to gather floppy disk performance data. | ||
| 49 | # | ||
| 50 | diff --git a/Scripts/dtr b/Scripts/dtr | ||
| 51 | index ddb7947..1ff5a0b 100755 | ||
| 52 | --- a/Scripts/dtr | ||
| 53 | +++ b/Scripts/dtr | ||
| 54 | @@ -1,4 +1,4 @@ | ||
| 55 | -#!/bin/csh | ||
| 56 | +#!/bin/tcsh | ||
| 57 | # %Z%%M% %I% %E% | ||
| 58 | # | ||
| 59 | # Date: August 21, 1990 | ||
| 60 | diff --git a/Scripts/dts b/Scripts/dts | ||
| 61 | index 6b8a167..42d2312 100755 | ||
| 62 | --- a/Scripts/dts | ||
| 63 | +++ b/Scripts/dts | ||
| 64 | @@ -1,4 +1,4 @@ | ||
| 65 | -#!/bin/csh | ||
| 66 | +#!/bin/tcsh | ||
| 67 | # %Z%%M% %I% %E% | ||
| 68 | # | ||
| 69 | # Date: August 7, 1990 | ||
| 70 | diff --git a/Scripts/dtt b/Scripts/dtt | ||
| 71 | index 36cc6bd..df19d2f 100755 | ||
| 72 | --- a/Scripts/dtt | ||
| 73 | +++ b/Scripts/dtt | ||
| 74 | @@ -1,4 +1,4 @@ | ||
| 75 | -#! /bin/csh | ||
| 76 | +#! /bin/tcsh | ||
| 77 | # %Z%%M% %I% %E% | ||
| 78 | # | ||
| 79 | # Date: August 7, 1990 | ||
| 80 | diff --git a/Scripts/dtw b/Scripts/dtw | ||
| 81 | index 8a4ac39..c58e304 100755 | ||
| 82 | --- a/Scripts/dtw | ||
| 83 | +++ b/Scripts/dtw | ||
| 84 | @@ -1,4 +1,4 @@ | ||
| 85 | -#!/bin/csh | ||
| 86 | +#!/bin/tcsh | ||
| 87 | # %Z%%M% %I% %E% | ||
| 88 | # | ||
| 89 | # Date: August 21, 1990 | ||
| 90 | -- | ||
| 91 | 2.1.4 | ||
| 92 | |||
diff --git a/meta-oe/recipes-devtools/dt/dt/dt-default-source-define.patch b/meta-oe/recipes-devtools/dt/dt/dt-default-source-define.patch deleted file mode 100644 index 87016edf03..0000000000 --- a/meta-oe/recipes-devtools/dt/dt/dt-default-source-define.patch +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | Patch from http://pkgs.fedoraproject.org/git/rpms/dt.git | ||
| 2 | |||
| 3 | Upstream-Status: Pending | ||
| 4 | |||
| 5 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
| 6 | |||
| 7 | diff -rupN dt.v18.32.old/common.h dt.v18.32/common.h | ||
| 8 | --- dt.v18.32.old/common.h 2013-03-01 23:52:30.000000000 +0100 | ||
| 9 | +++ dt.v18.32/common.h 2014-09-24 17:41:40.777604710 +0200 | ||
| 10 | @@ -127,7 +127,7 @@ typedef volatile slarge_t v_slarge; | ||
| 11 | |||
| 12 | #endif /* defined(_WIN64) */ | ||
| 13 | |||
| 14 | -#elif defined(__GNUC__) && defined(_BSD_SOURCE) || defined(SCO) || defined(__QNXNTO__) || defined(SOLARIS) || defined(HP_UX) || defined(AIX) || defined(_NT_SOURCE) | ||
| 15 | +#elif defined(__GNUC__) && defined(_BSD_SOURCE) || defined (_DEFAULT_SOURCE) || defined(SCO) || defined(__QNXNTO__) || defined(SOLARIS) || defined(HP_UX) || defined(AIX) || defined(_NT_SOURCE) | ||
| 16 | |||
| 17 | #define QuadIsLongLong | ||
| 18 | typedef unsigned long long int large_t; | ||
diff --git a/meta-oe/recipes-devtools/dt/dt/dt-wformat-security.patch b/meta-oe/recipes-devtools/dt/dt/dt-wformat-security.patch deleted file mode 100644 index b6780c1965..0000000000 --- a/meta-oe/recipes-devtools/dt/dt/dt-wformat-security.patch +++ /dev/null | |||
| @@ -1,48 +0,0 @@ | |||
| 1 | Patch from http://pkgs.fedoraproject.org/git/rpms/dt.git | ||
| 2 | |||
| 3 | Upstream-Status: Pending | ||
| 4 | |||
| 5 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
| 6 | |||
| 7 | diff -rupN dt.v18.32.old/dt.c dt.v18.32/dt.c | ||
| 8 | --- dt.v18.32.old/dt.c 2014-08-18 14:45:53.242351115 +0200 | ||
| 9 | +++ dt.v18.32/dt.c 2014-08-18 15:11:36.367719880 +0200 | ||
| 10 | @@ -4378,7 +4378,7 @@ report_error( | ||
| 11 | (void)sprintf(dip->di_msg_buffer, "(%d): '%s', errno = %d - %s\n", | ||
| 12 | dip->di_process_id, error_info, errno, emsg); | ||
| 13 | } | ||
| 14 | - syslog(LOG_ERR, dip->di_msg_buffer); | ||
| 15 | + syslog(LOG_ERR, "%s", dip->di_msg_buffer); | ||
| 16 | } | ||
| 17 | #endif /* defined(SYSLOG) */ | ||
| 18 | |||
| 19 | diff -rupN dt.v18.32.old/dtutil.c dt.v18.32/dtutil.c | ||
| 20 | --- dt.v18.32.old/dtutil.c 2014-08-18 14:45:53.354350779 +0200 | ||
| 21 | +++ dt.v18.32/dtutil.c 2014-08-18 15:13:53.835307311 +0200 | ||
| 22 | @@ -5180,7 +5180,7 @@ ReportDeviceInfo ( | ||
| 23 | bp += Sprintf(bp, | ||
| 24 | "(%d) Device name: %s\n", | ||
| 25 | dip->di_process_id, dip->di_dname); | ||
| 26 | - syslog(LOG_ERR, dip->di_msg_buffer); | ||
| 27 | + syslog(LOG_ERR, "%s", dip->di_msg_buffer); | ||
| 28 | bp = dip->di_msg_buffer; | ||
| 29 | # if defined(SCSI) | ||
| 30 | if (dip->di_serial_number) { | ||
| 31 | @@ -5193,7 +5193,7 @@ ReportDeviceInfo ( | ||
| 32 | dip->di_process_id, dip->di_device_id); | ||
| 33 | } | ||
| 34 | # endif /* defined(SCSI) */ | ||
| 35 | - syslog(LOG_ERR, dip->di_msg_buffer); | ||
| 36 | + syslog(LOG_ERR, "%s", dip->di_msg_buffer); | ||
| 37 | bp = dip->di_msg_buffer; | ||
| 38 | bp += Sprintf(bp, | ||
| 39 | "(%d) Relative block number where the error occurred is " LUF "," | ||
| 40 | @@ -5203,7 +5203,7 @@ ReportDeviceInfo ( | ||
| 41 | } else { | ||
| 42 | bp += Sprintf(bp, "\n"); | ||
| 43 | } | ||
| 44 | - syslog(LOG_ERR, dip->di_msg_buffer); | ||
| 45 | + syslog(LOG_ERR, "%s", dip->di_msg_buffer); | ||
| 46 | } | ||
| 47 | #endif /* defined(SYSLOG) */ | ||
| 48 | |||
diff --git a/meta-oe/recipes-devtools/dt/dt_18.32.bb b/meta-oe/recipes-devtools/dt/dt_18.32.bb deleted file mode 100644 index 0234f765ac..0000000000 --- a/meta-oe/recipes-devtools/dt/dt_18.32.bb +++ /dev/null | |||
| @@ -1,49 +0,0 @@ | |||
| 1 | SUMMARY = "Generic data test program" | ||
| 2 | DESCRIPTION = "The Data Test Program (dt) is a generic data test program used to verify proper \ | ||
| 3 | operation of peripherals, file systems, device drivers, or any data stream supported by the \ | ||
| 4 | operating system." | ||
| 5 | HOMEPAGE = "http://www.scsifaq.org/RMiller_Tools/dt.html" | ||
| 6 | |||
| 7 | SECTION = "console/tests" | ||
| 8 | |||
| 9 | LICENSE = "MIT" | ||
| 10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=be8bb25bbcfaa0725710d188e5152668" | ||
| 11 | |||
| 12 | # Source URI taken from Fedora RPM spec file at: | ||
| 13 | # http://pkgs.fedoraproject.org/git/rpms/dt.git | ||
| 14 | SRC_URI = "http://dl.dropboxusercontent.com/u/32363629/Datatest/dt-source-v${PV}.tar.gz \ | ||
| 15 | file://dt-default-source-define.patch \ | ||
| 16 | file://dt-wformat-security.patch \ | ||
| 17 | file://Stop-using-relative-path-for-scsilib.c-link.patch \ | ||
| 18 | file://Use-tcsh-shell.patch \ | ||
| 19 | " | ||
| 20 | |||
| 21 | SRC_URI[md5sum] = "3054aeaaba047a1dbe90c2132a382ee2" | ||
| 22 | SRC_URI[sha256sum] = "10d164676e918a4d07f233bcd11e4cb6bfd1052c996182cd1827ccd0c063fcc6" | ||
| 23 | |||
| 24 | S = "${WORKDIR}/dt.v${PV}" | ||
| 25 | |||
| 26 | TARGET_CC_ARCH += "${LDFLAGS}" | ||
| 27 | |||
| 28 | EXTRA_OEMAKE += "-f Makefile.linux \ | ||
| 29 | OS=linux \ | ||
| 30 | CFLAGS="-I.. -DAIO -DFIFO -DMMAP -D__linux__ -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DTHREADS -DSCSI"" | ||
| 31 | |||
| 32 | do_compile() { | ||
| 33 | oe_runmake | ||
| 34 | } | ||
| 35 | |||
| 36 | do_install() { | ||
| 37 | install -Dm755 dt ${D}${sbindir}/dt | ||
| 38 | install -Dm644 Documentation/dt.man ${D}${mandir}/man8/dt.8 | ||
| 39 | |||
| 40 | install -d ${D}${datadir}/dt/ | ||
| 41 | install -d ${D}${docdir}/dt/html/ | ||
| 42 | install -m755 Scripts/dt? ${D}${datadir}/dt/ | ||
| 43 | install -m644 data/pattern_* ${D}${datadir}/dt/ | ||
| 44 | install -m644 html/* ${D}${docdir}/dt/html/ | ||
| 45 | } | ||
| 46 | |||
| 47 | RDEPENDS_${PN} += "tcsh" | ||
| 48 | |||
| 49 | PNBLACKLIST[dt] ?= "Rdepends on blacklisted tcsh - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-devtools/ltp-ddt/ltp-ddt/ltp-Do-not-link-against-libfl.patch b/meta-oe/recipes-devtools/ltp-ddt/ltp-ddt/ltp-Do-not-link-against-libfl.patch deleted file mode 100644 index 3e4aa7308d..0000000000 --- a/meta-oe/recipes-devtools/ltp-ddt/ltp-ddt/ltp-Do-not-link-against-libfl.patch +++ /dev/null | |||
| @@ -1,31 +0,0 @@ | |||
| 1 | From 5bda9c0af56869c6ff2c25d38ea087179c946bc6 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Chong Lu <Chong.Lu@windriver.com> | ||
| 3 | Date: Tue, 11 Mar 2014 14:47:22 +0800 | ||
| 4 | Subject: [PATCH] ltp: Don't link against libfl | ||
| 5 | |||
| 6 | We have already defined yywrap function in scan.l file. After this, we no longer need to | ||
| 7 | link against libfl and so no longer get errors about undefined references to yylex. | ||
| 8 | |||
| 9 | Upstream-status: Pending | ||
| 10 | |||
| 11 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | ||
| 12 | --- | ||
| 13 | pan/Makefile | 2 +- | ||
| 14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 15 | |||
| 16 | diff --git a/pan/Makefile b/pan/Makefile | ||
| 17 | index 4cc6466..a4b575b 100644 | ||
| 18 | --- a/pan/Makefile | ||
| 19 | +++ b/pan/Makefile | ||
| 20 | @@ -31,7 +31,7 @@ CPPFLAGS += -Wno-error | ||
| 21 | |||
| 22 | CPPFLAGS += -I$(abs_srcdir) | ||
| 23 | |||
| 24 | -LDLIBS += -lm $(LEXLIB) | ||
| 25 | +LDLIBS += -lm | ||
| 26 | |||
| 27 | LFLAGS += -l | ||
| 28 | |||
| 29 | -- | ||
| 30 | 1.7.9.5 | ||
| 31 | |||
diff --git a/meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_1.0.0.bb b/meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_1.0.0.bb deleted file mode 100644 index b13bd7bcc3..0000000000 --- a/meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_1.0.0.bb +++ /dev/null | |||
| @@ -1,97 +0,0 @@ | |||
| 1 | SUMMARY = "Embedded Linux Device Driver Tests based on Linux Test Project" | ||
| 2 | HOMEPAGE = "http://arago-project.org/git/projects/test-automation/ltp-ddt.git" | ||
| 3 | SECTION = "console/utils" | ||
| 4 | LICENSE = "GPLv2" | ||
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" | ||
| 6 | |||
| 7 | PROVIDES += "ltp" | ||
| 8 | DEPENDS += "zip-native virtual/kernel alsa-lib" | ||
| 9 | |||
| 10 | RDEPENDS_${PN} += "pm-qa serialcheck" | ||
| 11 | |||
| 12 | inherit autotools module-base kernel-module-split | ||
| 13 | |||
| 14 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
| 15 | |||
| 16 | SRCREV = "f086bed6cc88bf102eaad0e96cb7ebe79944a8ad" | ||
| 17 | BRANCH ?= "master" | ||
| 18 | |||
| 19 | SRC_URI = "git://arago-project.org/git/projects/test-automation/ltp-ddt.git;branch=${BRANCH} \ | ||
| 20 | file://ltp-Do-not-link-against-libfl.patch \ | ||
| 21 | " | ||
| 22 | |||
| 23 | S = "${WORKDIR}/git" | ||
| 24 | |||
| 25 | LTPROOT = "/opt/ltp" | ||
| 26 | |||
| 27 | EXTRA_OEMAKE_append = " \ | ||
| 28 | prefix=${LTPROOT} \ | ||
| 29 | CROSS_COMPILE=${HOST_PREFIX} \ | ||
| 30 | SKIP_IDCHECK=1 \ | ||
| 31 | KERNEL_PATH=${STAGING_KERNEL_DIR} \ | ||
| 32 | KERNEL_INC=${STAGING_KERNEL_DIR} \ | ||
| 33 | KERNEL_USR_INC=${STAGING_INCDIR} \ | ||
| 34 | ALSA_INCPATH=${STAGING_INCDIR} \ | ||
| 35 | ALSA_LIBPATH=${STAGING_LIBDIR} \ | ||
| 36 | PLATFORM=${MACHINE} \ | ||
| 37 | RANLIB=${RANLIB} \ | ||
| 38 | DESTDIR=${D} \ | ||
| 39 | CC='${CC}' \ | ||
| 40 | KERNEL_CC='${KERNEL_CC}' \ | ||
| 41 | " | ||
| 42 | |||
| 43 | TARGET_CC_ARCH += "${LDFLAGS}" | ||
| 44 | |||
| 45 | FILES_${PN}-dbg += " \ | ||
| 46 | ${LTPROOT}/.debug \ | ||
| 47 | ${LTPROOT}/bin/.debug \ | ||
| 48 | ${LTPROOT}/runtest/.debug \ | ||
| 49 | ${LTPROOT}/testcases/bin/.debug \ | ||
| 50 | ${LTPROOT}/testcases/bin/*/bin/.debug \ | ||
| 51 | ${LTPROOT}/testcases/bin/*/test/.debug \ | ||
| 52 | ${LTPROOT}/testcases/bin/ddt/.debug \ | ||
| 53 | ${LTPROOT}/testcases/bin/ddt/*/bin/.debug \ | ||
| 54 | ${LTPROOT}/testcases/bin/ddt/*/test/.debug \ | ||
| 55 | ${LTPROOT}/testcases/realtime/*/*/.debug \ | ||
| 56 | " | ||
| 57 | |||
| 58 | FILES_${PN}-staticdev += "${LTPROOT}/lib" | ||
| 59 | FILES_${PN} += "${LTPROOT}/*" | ||
| 60 | |||
| 61 | KERNEL_MODULES_META_PACKAGE = "${PN}" | ||
| 62 | |||
| 63 | kmoddir = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/ddt" | ||
| 64 | |||
| 65 | # ltp doesn't regenerate ffsb-6.0-rc2 configure and hardcode configure call. | ||
| 66 | # we explicitly force regeneration of that directory and pass configure options. | ||
| 67 | do_configure_append() { | ||
| 68 | (cd utils/ffsb-6.0-rc2; autoreconf -fvi; ./configure ${CONFIGUREOPTS}) | ||
| 69 | } | ||
| 70 | |||
| 71 | # The makefiles make excessive use of make -C and several include testcases.mk | ||
| 72 | # which triggers a build of the syscall header. To reproduce, build ltp, | ||
| 73 | # then delete the header, then "make -j XX" and watch regen.sh run multiple | ||
| 74 | # times. Its easier to generate this once here instead. | ||
| 75 | do_compile_prepend () { | ||
| 76 | ( make -C ${B}/testcases/kernel include/linux_syscall_numbers.h ) | ||
| 77 | } | ||
| 78 | |||
| 79 | do_compile_append () { | ||
| 80 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS | ||
| 81 | oe_runmake modules | ||
| 82 | } | ||
| 83 | |||
| 84 | do_install() { | ||
| 85 | oe_runmake install | ||
| 86 | install -d ${D}${datadir} | ||
| 87 | install -d ${D}${kmoddir} | ||
| 88 | mv ${D}${LTPROOT}/testcases/bin/ddt/*.ko ${D}${kmoddir} | ||
| 89 | } | ||
| 90 | |||
| 91 | # do_make_scripts should be a separate task for the lock to work | ||
| 92 | addtask make_scripts before do_compile | ||
| 93 | do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock" | ||
| 94 | do_make_scripts[deptask] = "do_populate_sysroot" | ||
| 95 | |||
| 96 | # http://errors.yoctoproject.org/Errors/Details/56327/ | ||
| 97 | PNBLACKLIST[ltp-ddt] ?= "BROKEN: fails since last autotools.bbclass changes - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/0001-Don-t-call-deprecated-glib-functions-and-use-the-new.patch b/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/0001-Don-t-call-deprecated-glib-functions-and-use-the-new.patch deleted file mode 100644 index ecf8e74933..0000000000 --- a/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/0001-Don-t-call-deprecated-glib-functions-and-use-the-new.patch +++ /dev/null | |||
| @@ -1,166 +0,0 @@ | |||
| 1 | From 869e52a9055c72970fed036a1510f676e6ce0824 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Thu, 13 Jun 2013 01:24:19 -0700 | ||
| 4 | Subject: [PATCH] Don't call deprecated glib functions and use the new gthread | ||
| 5 | API. | ||
| 6 | |||
| 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 8 | |||
| 9 | Upstream-Status: Inappropriate[version Unmaintained Upstream] | ||
| 10 | --- | ||
| 11 | client/pk-console.c | 3 ++- | ||
| 12 | client/pk-generate-pack.c | 3 ++- | ||
| 13 | client/pk-monitor.c | 3 ++- | ||
| 14 | contrib/command-not-found/PackageKit.sh | 2 +- | ||
| 15 | contrib/command-not-found/pk-command-not-found.c | 4 ++-- | ||
| 16 | contrib/debuginfo-install/pk-debuginfo-install.c | 4 ++-- | ||
| 17 | src/pk-backend.c | 7 +++++++ | ||
| 18 | src/pk-main.c | 4 ++-- | ||
| 19 | 10 files changed, 20 insertions(+), 10 deletions(-) | ||
| 20 | |||
| 21 | diff --git a/client/pk-console.c b/client/pk-console.c | ||
| 22 | index de927e1..2435f27 100644 | ||
| 23 | --- a/client/pk-console.c | ||
| 24 | +++ b/client/pk-console.c | ||
| 25 | @@ -1264,11 +1264,12 @@ main (int argc, char *argv[]) | ||
| 26 | bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); | ||
| 27 | bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); | ||
| 28 | textdomain (GETTEXT_PACKAGE); | ||
| 29 | - | ||
| 30 | +#if !GLIB_CHECK_VERSION(2,32,0) | ||
| 31 | if (! g_thread_supported ()) | ||
| 32 | g_thread_init (NULL); | ||
| 33 | g_type_init (); | ||
| 34 | dbus_g_thread_init (); | ||
| 35 | +#endif | ||
| 36 | |||
| 37 | /* do stuff on ctrl-c */ | ||
| 38 | signal (SIGINT, pk_console_sigint_cb); | ||
| 39 | diff --git a/client/pk-generate-pack.c b/client/pk-generate-pack.c | ||
| 40 | index 0b2b40f..20d7e8d 100644 | ||
| 41 | --- a/client/pk-generate-pack.c | ||
| 42 | +++ b/client/pk-generate-pack.c | ||
| 43 | @@ -251,12 +251,13 @@ main (int argc, char *argv[]) | ||
| 44 | bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); | ||
| 45 | bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); | ||
| 46 | textdomain (GETTEXT_PACKAGE); | ||
| 47 | - | ||
| 48 | +#if !GLIB_CHECK_VERSION(2,32,0) | ||
| 49 | if (! g_thread_supported ()) | ||
| 50 | g_thread_init (NULL); | ||
| 51 | |||
| 52 | g_type_init (); | ||
| 53 | dbus_g_thread_init (); | ||
| 54 | +#endif | ||
| 55 | |||
| 56 | /* do stuff on ctrl-c */ | ||
| 57 | signal (SIGINT, pk_generate_pack_sigint_cb); | ||
| 58 | diff --git a/client/pk-monitor.c b/client/pk-monitor.c | ||
| 59 | index f230f7a..d43007f 100644 | ||
| 60 | --- a/client/pk-monitor.c | ||
| 61 | +++ b/client/pk-monitor.c | ||
| 62 | @@ -285,11 +285,12 @@ main (int argc, char *argv[]) | ||
| 63 | bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); | ||
| 64 | bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); | ||
| 65 | textdomain (GETTEXT_PACKAGE); | ||
| 66 | - | ||
| 67 | +#if !GLIB_CHECK_VERSION(2,32,0) | ||
| 68 | if (! g_thread_supported ()) | ||
| 69 | g_thread_init (NULL); | ||
| 70 | g_type_init (); | ||
| 71 | dbus_g_thread_init (); | ||
| 72 | +#endif | ||
| 73 | |||
| 74 | context = g_option_context_new (NULL); | ||
| 75 | /* TRANSLATORS: this is a program that monitors PackageKit */ | ||
| 76 | diff --git a/contrib/command-not-found/PackageKit.sh b/contrib/command-not-found/PackageKit.sh | ||
| 77 | index d08989c..d708fff 100644 | ||
| 78 | --- a/contrib/command-not-found/PackageKit.sh | ||
| 79 | +++ b/contrib/command-not-found/PackageKit.sh | ||
| 80 | @@ -18,7 +18,7 @@ command_not_found_handle () { | ||
| 81 | |||
| 82 | # run the command, or just print a warning | ||
| 83 | if [ $runcnf -eq 1 ]; then | ||
| 84 | - /home/hughsie/.root/libexec/pk-command-not-found $1 | ||
| 85 | + /usr/lib/packagekit/pk-command-not-found $1 | ||
| 86 | retval=$? | ||
| 87 | else | ||
| 88 | echo "bash: $1: command not found" | ||
| 89 | diff --git a/contrib/command-not-found/pk-command-not-found.c b/contrib/command-not-found/pk-command-not-found.c | ||
| 90 | index 70679c0..9f81ce4 100644 | ||
| 91 | --- a/contrib/command-not-found/pk-command-not-found.c | ||
| 92 | +++ b/contrib/command-not-found/pk-command-not-found.c | ||
| 93 | @@ -659,12 +659,12 @@ main (int argc, char *argv[]) | ||
| 94 | bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); | ||
| 95 | bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); | ||
| 96 | textdomain (GETTEXT_PACKAGE); | ||
| 97 | - | ||
| 98 | +#if !GLIB_CHECK_VERSION(2,32,0) | ||
| 99 | if (! g_thread_supported ()) | ||
| 100 | g_thread_init (NULL); | ||
| 101 | dbus_g_thread_init (); | ||
| 102 | g_type_init (); | ||
| 103 | - | ||
| 104 | +#endif | ||
| 105 | context = g_option_context_new (NULL); | ||
| 106 | /* TRANSLATORS: tool that gets called when the command is not found */ | ||
| 107 | g_option_context_set_summary (context, _("PackageKit Command Not Found")); | ||
| 108 | diff --git a/contrib/debuginfo-install/pk-debuginfo-install.c b/contrib/debuginfo-install/pk-debuginfo-install.c | ||
| 109 | index c12aca5..b0e1e7c 100644 | ||
| 110 | --- a/contrib/debuginfo-install/pk-debuginfo-install.c | ||
| 111 | +++ b/contrib/debuginfo-install/pk-debuginfo-install.c | ||
| 112 | @@ -532,11 +532,11 @@ main (int argc, char *argv[]) | ||
| 113 | bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); | ||
| 114 | bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); | ||
| 115 | textdomain (GETTEXT_PACKAGE); | ||
| 116 | - | ||
| 117 | +#if !GLIB_CHECK_VERSION(2,32,0) | ||
| 118 | if (! g_thread_supported ()) | ||
| 119 | g_thread_init (NULL); | ||
| 120 | g_type_init (); | ||
| 121 | - | ||
| 122 | +#endif | ||
| 123 | context = g_option_context_new (NULL); | ||
| 124 | /* TRANSLATORS: tool that gets called when the command is not found */ | ||
| 125 | g_option_context_set_summary (context, _("PackageKit Debuginfo Installer")); | ||
| 126 | diff --git a/src/pk-backend.c b/src/pk-backend.c | ||
| 127 | index 5216b63..5b83ae4 100644 | ||
| 128 | --- a/src/pk-backend.c | ||
| 129 | +++ b/src/pk-backend.c | ||
| 130 | @@ -2103,7 +2103,14 @@ pk_backend_thread_create (PkBackend *backend, PkBackendThreadFunc func) | ||
| 131 | egg_warning ("already has thread"); | ||
| 132 | return FALSE; | ||
| 133 | } | ||
| 134 | +#if !GLIB_CHECK_VERSION(2,32,0) | ||
| 135 | backend->priv->thread = g_thread_create ((GThreadFunc) func, backend, FALSE, NULL); | ||
| 136 | +#else | ||
| 137 | + backend->priv->thread = g_thread_try_new ("daemon thread", (GThreadFunc) func, backend, NULL); | ||
| 138 | + if (backend->priv->thread != NULL) { | ||
| 139 | + g_thread_unref(backend->priv->thread); | ||
| 140 | + } | ||
| 141 | +#endif | ||
| 142 | if (backend->priv->thread == NULL) { | ||
| 143 | egg_warning ("failed to create thread"); | ||
| 144 | return FALSE; | ||
| 145 | diff --git a/src/pk-main.c b/src/pk-main.c | ||
| 146 | index 4c758cd..8fa2482 100644 | ||
| 147 | --- a/src/pk-main.c | ||
| 148 | +++ b/src/pk-main.c | ||
| 149 | @@ -219,12 +219,12 @@ main (int argc, char *argv[]) | ||
| 150 | bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); | ||
| 151 | bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); | ||
| 152 | textdomain (GETTEXT_PACKAGE); | ||
| 153 | - | ||
| 154 | +#if !GLIB_CHECK_VERSION(2,32,0) | ||
| 155 | if (! g_thread_supported ()) | ||
| 156 | g_thread_init (NULL); | ||
| 157 | dbus_g_thread_init (); | ||
| 158 | g_type_init (); | ||
| 159 | - | ||
| 160 | +#endif | ||
| 161 | /* TRANSLATORS: describing the service that is running */ | ||
| 162 | context = g_option_context_new (_("PackageKit service")); | ||
| 163 | g_option_context_add_main_entries (context, options, NULL); | ||
| 164 | -- | ||
| 165 | 1.7.9.5 | ||
| 166 | |||
diff --git a/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/configurefix.patch b/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/configurefix.patch deleted file mode 100644 index 48f959186a..0000000000 --- a/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/configurefix.patch +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | Index: PackageKit-0.6.0/configure.ac | ||
| 2 | =================================================================== | ||
| 3 | --- PackageKit-0.6.0.orig/configure.ac 2010-01-04 16:32:18.000000000 +0000 | ||
| 4 | +++ PackageKit-0.6.0/configure.ac 2010-01-29 11:33:48.000000000 +0000 | ||
| 5 | @@ -90,7 +90,7 @@ | ||
| 6 | enable_strict=$default_strict) | ||
| 7 | if test x$enable_strict != xno; then | ||
| 8 | if test "$GCC" = "yes"; then | ||
| 9 | - WARNINGFLAGS_CPP="$WARNINGFLAGS_CPP -Werror" | ||
| 10 | + : | ||
| 11 | fi | ||
| 12 | fi | ||
| 13 | |||
diff --git a/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/opkgfixes.patch b/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/opkgfixes.patch deleted file mode 100644 index 5a73a19d5f..0000000000 --- a/meta-oe/recipes-devtools/packagekit/packagekit-0.5.6/opkgfixes.patch +++ /dev/null | |||
| @@ -1,422 +0,0 @@ | |||
| 1 | Index: PackageKit-0.6.0/backends/opkg/pk-backend-opkg.c | ||
| 2 | =================================================================== | ||
| 3 | --- PackageKit-0.6.0.orig/backends/opkg/pk-backend-opkg.c 2010-01-29 09:39:33.000000000 +0000 | ||
| 4 | +++ PackageKit-0.6.0/backends/opkg/pk-backend-opkg.c 2010-01-29 11:30:51.000000000 +0000 | ||
| 5 | @@ -29,8 +29,7 @@ | ||
| 6 | |||
| 7 | +#include <stdio.h> | ||
| 8 | #include <libopkg/opkg.h> | ||
| 9 | |||
| 10 | -static opkg_t *opkg; | ||
| 11 | - | ||
| 12 | enum { | ||
| 13 | SEARCH_NAME, | ||
| 14 | SEARCH_DESCRIPTION, | ||
| 15 | @@ -62,7 +60,7 @@ | ||
| 16 | * check an opkg package for known GUI dependancies | ||
| 17 | */ | ||
| 18 | static gboolean | ||
| 19 | -opkg_is_gui_pkg (opkg_package_t *pkg) | ||
| 20 | +opkg_is_gui_pkg (pkg_t *pkg) | ||
| 21 | { | ||
| 22 | |||
| 23 | /* TODO: check appropriate tag */ | ||
| 24 | @@ -84,7 +82,7 @@ | ||
| 25 | * check an opkg package to determine if it is a development package | ||
| 26 | */ | ||
| 27 | static gboolean | ||
| 28 | -opkg_is_devel_pkg (opkg_package_t *pkg) | ||
| 29 | +opkg_is_devel_pkg (pkg_t *pkg) | ||
| 30 | { | ||
| 31 | if (g_strrstr (pkg->name, "-dev")) | ||
| 32 | return TRUE; | ||
| 33 | @@ -105,7 +103,7 @@ | ||
| 34 | * returns true if the tag is present | ||
| 35 | */ | ||
| 36 | static gboolean | ||
| 37 | -opkg_check_tag (opkg_package_t *pkg, const gchar *tag) | ||
| 38 | +opkg_check_tag (pkg_t *pkg, const gchar *tag) | ||
| 39 | { | ||
| 40 | if (pkg->tags && tag) | ||
| 41 | return (g_strrstr (pkg->tags, tag) != NULL); | ||
| 42 | @@ -118,7 +116,7 @@ | ||
| 43 | { | ||
| 44 | switch (err) | ||
| 45 | { | ||
| 46 | - case OPKG_NO_ERROR: | ||
| 47 | +/* case OPKG_NO_ERROR: | ||
| 48 | break; | ||
| 49 | case OPKG_PACKAGE_NOT_INSTALLED: | ||
| 50 | pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, NULL); | ||
| 51 | @@ -140,7 +138,7 @@ | ||
| 52 | break; | ||
| 53 | case OPKG_PACKAGE_NOT_AVAILABLE: | ||
| 54 | pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND, NULL); | ||
| 55 | - break; | ||
| 56 | + break;*/ | ||
| 57 | default: | ||
| 58 | opkg_unknown_error (backend, err, "Update package"); | ||
| 59 | } | ||
| 60 | @@ -152,7 +150,7 @@ | ||
| 61 | static void | ||
| 62 | backend_initialize (PkBackend *backend) | ||
| 63 | { | ||
| 64 | - opkg = opkg_new (); | ||
| 65 | + int opkg = opkg_new (); | ||
| 66 | |||
| 67 | if (!opkg) { | ||
| 68 | pk_backend_error_code (backend, | ||
| 69 | @@ -162,8 +160,8 @@ | ||
| 70 | } | ||
| 71 | |||
| 72 | #ifdef OPKG_OFFLINE_ROOT | ||
| 73 | - opkg_set_option (opkg, (char *) "offline_root", OPKG_OFFLINE_ROOT); | ||
| 74 | - opkg_re_read_config_files (opkg); | ||
| 75 | + opkg_set_option ((char *) "offline_root", OPKG_OFFLINE_ROOT); | ||
| 76 | + opkg_re_read_config_files (); | ||
| 77 | #endif | ||
| 78 | |||
| 79 | } | ||
| 80 | @@ -174,22 +172,22 @@ | ||
| 81 | static void | ||
| 82 | backend_destroy (PkBackend *backend) | ||
| 83 | { | ||
| 84 | - opkg_free (opkg); | ||
| 85 | + opkg_free (); | ||
| 86 | } | ||
| 87 | |||
| 88 | |||
| 89 | static void | ||
| 90 | -pk_opkg_progress_cb (opkg_t *_opkg, const opkg_progress_data_t *pdata, void *data) | ||
| 91 | +pk_opkg_progress_cb (const opkg_progress_data_t *pdata, void *data) | ||
| 92 | { | ||
| 93 | - PkBackend *backend = PK_BACKEND (data); | ||
| 94 | + PkBackend *backend = (PkBackend*) data; | ||
| 95 | if (!backend) | ||
| 96 | return; | ||
| 97 | |||
| 98 | pk_backend_set_percentage (backend, pdata->percentage); | ||
| 99 | - if (pdata->package) | ||
| 100 | + if (pdata->pkg) | ||
| 101 | { | ||
| 102 | gchar *uid; | ||
| 103 | - opkg_package_t *pkg = pdata->package; | ||
| 104 | + pkg_t *pkg = pdata->pkg; | ||
| 105 | gint status = PK_INFO_ENUM_UNKNOWN; | ||
| 106 | |||
| 107 | uid = g_strdup_printf ("%s;%s;%s;", | ||
| 108 | @@ -225,12 +223,12 @@ | ||
| 109 | { | ||
| 110 | int ret; | ||
| 111 | |||
| 112 | - ret = opkg_update_package_lists (opkg, pk_opkg_progress_cb, backend); | ||
| 113 | + ret = opkg_update_package_lists (pk_opkg_progress_cb, backend); | ||
| 114 | |||
| 115 | if (ret) { | ||
| 116 | - if (ret == OPKG_DOWNLOAD_FAILED) | ||
| 117 | - pk_backend_error_code (backend, PK_ERROR_ENUM_REPO_NOT_AVAILABLE, NULL); | ||
| 118 | - else | ||
| 119 | +// if (ret == OPKG_DOWNLOAD_FAILED) | ||
| 120 | +// pk_backend_error_code (backend, PK_ERROR_ENUM_REPO_NOT_AVAILABLE, NULL); | ||
| 121 | +// else | ||
| 122 | opkg_unknown_error (backend, ret, "Refreshing cache"); | ||
| 123 | } | ||
| 124 | pk_backend_finished (backend); | ||
| 125 | @@ -256,7 +254,7 @@ | ||
| 126 | */ | ||
| 127 | |||
| 128 | static void | ||
| 129 | -pk_opkg_package_list_cb (opkg_t *_opkg, opkg_package_t *pkg, void *data) | ||
| 130 | +pk_opkg_package_list_cb (pkg_t *pkg, void *data) | ||
| 131 | { | ||
| 132 | SearchParams *params = (SearchParams*) data; | ||
| 133 | gchar *uid; | ||
| 134 | @@ -298,7 +296,7 @@ | ||
| 135 | uid = g_strdup_printf ("%s;%s;%s;", | ||
| 136 | pkg->name, pkg->version, pkg->architecture); | ||
| 137 | |||
| 138 | - if (pkg->installed) | ||
| 139 | + if (pkg->state_status == SS_INSTALLED) | ||
| 140 | status = PK_INFO_ENUM_INSTALLED; | ||
| 141 | else | ||
| 142 | status = PK_INFO_ENUM_AVAILABLE; | ||
| 143 | @@ -318,10 +316,10 @@ | ||
| 144 | opkg_is_gui_pkg (pkg)) | ||
| 145 | goto end_handle; | ||
| 146 | if (pk_bitfield_contain(filters, PK_FILTER_ENUM_INSTALLED) && | ||
| 147 | - (!pkg->installed)) | ||
| 148 | + (pkg->state_status != SS_INSTALLED)) | ||
| 149 | goto end_handle; | ||
| 150 | if (pk_bitfield_contain(filters, PK_FILTER_ENUM_NOT_INSTALLED) && | ||
| 151 | - (pkg->installed)) | ||
| 152 | + (pkg->state_status == SS_INSTALLED)) | ||
| 153 | goto end_handle; | ||
| 154 | |||
| 155 | pk_backend_package (params->backend, status, uid, pkg->description); | ||
| 156 | @@ -338,7 +336,7 @@ | ||
| 157 | |||
| 158 | params = pk_backend_get_pointer (backend, "search-params"); | ||
| 159 | |||
| 160 | - opkg_list_packages (opkg, pk_opkg_package_list_cb, params); | ||
| 161 | + opkg_list_packages (pk_opkg_package_list_cb, params); | ||
| 162 | |||
| 163 | pk_backend_finished (params->backend); | ||
| 164 | |||
| 165 | @@ -349,7 +347,7 @@ | ||
| 166 | } | ||
| 167 | |||
| 168 | static void | ||
| 169 | -backend_search_name (PkBackend *backend, PkBitfield filters, const gchar *search) | ||
| 170 | +backend_search_name (PkBackend *backend, PkBitfield filters, gchar **search) | ||
| 171 | { | ||
| 172 | SearchParams *params; | ||
| 173 | |||
| 174 | @@ -360,7 +358,7 @@ | ||
| 175 | params = g_new0 (SearchParams, 1); | ||
| 176 | params->filters = filters; | ||
| 177 | params->search_type = SEARCH_NAME; | ||
| 178 | - params->needle = g_utf8_strdown (search, -1); | ||
| 179 | + params->needle = g_utf8_strdown (search[0], -1); | ||
| 180 | params->backend = backend; | ||
| 181 | |||
| 182 | pk_backend_set_pointer (backend, "search-params", params); | ||
| 183 | @@ -371,7 +369,7 @@ | ||
| 184 | * backend_search_description: | ||
| 185 | */ | ||
| 186 | static void | ||
| 187 | -backend_search_description (PkBackend *backend, PkBitfield filters, const gchar *search) | ||
| 188 | +backend_search_description (PkBackend *backend, PkBitfield filters, gchar **search) | ||
| 189 | { | ||
| 190 | SearchParams *params; | ||
| 191 | |||
| 192 | @@ -382,7 +380,7 @@ | ||
| 193 | params = g_new0 (SearchParams, 1); | ||
| 194 | params->filters = filters; | ||
| 195 | params->search_type = SEARCH_DESCRIPTION; | ||
| 196 | - params->needle = g_utf8_strdown (search, -1); | ||
| 197 | + params->needle = g_utf8_strdown (search[0], -1); | ||
| 198 | params->backend = backend; | ||
| 199 | |||
| 200 | pk_backend_set_pointer (backend, "search-params", params); | ||
| 201 | @@ -390,7 +388,7 @@ | ||
| 202 | } | ||
| 203 | |||
| 204 | static void | ||
| 205 | -backend_search_group (PkBackend *backend, PkBitfield filters, const gchar *search) | ||
| 206 | +backend_search_group (PkBackend *backend, PkBitfield filters, gchar **search) | ||
| 207 | { | ||
| 208 | SearchParams *params; | ||
| 209 | |||
| 210 | @@ -401,7 +399,7 @@ | ||
| 211 | params = g_new0 (SearchParams, 1); | ||
| 212 | params->filters = filters; | ||
| 213 | params->search_type = SEARCH_TAG; | ||
| 214 | - params->needle = g_strdup_printf ("group::%s", search); | ||
| 215 | + params->needle = g_strdup_printf ("group::%s", search[0]); | ||
| 216 | params->backend = backend; | ||
| 217 | |||
| 218 | pk_backend_set_pointer (backend, "search-params", params); | ||
| 219 | @@ -412,9 +410,9 @@ | ||
| 220 | static gboolean | ||
| 221 | backend_install_packages_thread (PkBackend *backend) | ||
| 222 | { | ||
| 223 | - PkPackageId *pi; | ||
| 224 | gint err, i; | ||
| 225 | gchar **package_ids; | ||
| 226 | + gchar **parts; | ||
| 227 | |||
| 228 | package_ids = pk_backend_get_strv (backend, "pkids"); | ||
| 229 | |||
| 230 | @@ -424,13 +422,13 @@ | ||
| 231 | { | ||
| 232 | pk_backend_package (backend, PK_INFO_ENUM_INSTALLING, package_ids[i], NULL); | ||
| 233 | |||
| 234 | - pi = pk_package_id_new_from_string (package_ids[i]); | ||
| 235 | + parts = pk_package_id_split (package_ids[i]); | ||
| 236 | |||
| 237 | - err = opkg_install_package (opkg, pi->name, pk_opkg_progress_cb, backend); | ||
| 238 | + err = opkg_install_package (parts[PK_PACKAGE_ID_NAME], pk_opkg_progress_cb, backend); | ||
| 239 | if (err) | ||
| 240 | handle_install_error (backend, err); | ||
| 241 | |||
| 242 | - pk_package_id_free (pi); | ||
| 243 | + g_strfreev (parts); | ||
| 244 | if (err != 0) | ||
| 245 | break; | ||
| 246 | } | ||
| 247 | @@ -453,9 +451,9 @@ | ||
| 248 | static gboolean | ||
| 249 | backend_remove_packages_thread (PkBackend *backend) | ||
| 250 | { | ||
| 251 | - PkPackageId *pi; | ||
| 252 | gint err, i; | ||
| 253 | gchar **package_ids; | ||
| 254 | + gchar **parts; | ||
| 255 | gboolean allow_deps; | ||
| 256 | gboolean autoremove; | ||
| 257 | gpointer *data; | ||
| 258 | @@ -467,29 +465,30 @@ | ||
| 259 | autoremove = GPOINTER_TO_INT (data[2]); | ||
| 260 | g_free (data); | ||
| 261 | |||
| 262 | - opkg_set_option (opkg, (char *)"autoremove", &autoremove); | ||
| 263 | - opkg_set_option (opkg, (char *)"force_removal_of_dependent_packages", &allow_deps); | ||
| 264 | + opkg_set_option ((char *)"autoremove", &autoremove); | ||
| 265 | + opkg_set_option ((char *)"force_removal_of_dependent_packages", &allow_deps); | ||
| 266 | |||
| 267 | err = 0; | ||
| 268 | |||
| 269 | for (i = 0; package_ids[i]; i++) | ||
| 270 | { | ||
| 271 | - pi = pk_package_id_new_from_string (package_ids[i]); | ||
| 272 | pk_backend_package (backend, PK_INFO_ENUM_REMOVING, package_ids[i], NULL); | ||
| 273 | |||
| 274 | - err = opkg_remove_package (opkg, pi->name, pk_opkg_progress_cb, backend); | ||
| 275 | + parts = pk_package_id_split (package_ids[i]); | ||
| 276 | + | ||
| 277 | + err = opkg_remove_package (parts[PK_PACKAGE_ID_NAME], pk_opkg_progress_cb, backend); | ||
| 278 | |||
| 279 | switch (err) | ||
| 280 | { | ||
| 281 | - case OPKG_NO_ERROR: | ||
| 282 | - break; | ||
| 283 | - case OPKG_PACKAGE_NOT_INSTALLED: | ||
| 284 | - pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, NULL); | ||
| 285 | - break; | ||
| 286 | + //case OPKG_NO_ERROR: | ||
| 287 | + // break; | ||
| 288 | + //case OPKG_PACKAGE_NOT_INSTALLED: | ||
| 289 | + // pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, NULL); | ||
| 290 | + // break; | ||
| 291 | default: | ||
| 292 | opkg_unknown_error (backend, err, "Remove"); | ||
| 293 | } | ||
| 294 | - pk_package_id_free (pi); | ||
| 295 | + g_strfreev (parts); | ||
| 296 | |||
| 297 | if (err != 0) | ||
| 298 | break; | ||
| 299 | @@ -540,7 +539,7 @@ | ||
| 300 | gint err; | ||
| 301 | |||
| 302 | /* FIXME: support only_trusted */ | ||
| 303 | - err = opkg_upgrade_all (opkg, pk_opkg_progress_cb, backend); | ||
| 304 | + err = opkg_upgrade_all (pk_opkg_progress_cb, backend); | ||
| 305 | |||
| 306 | if (err) | ||
| 307 | opkg_unknown_error (backend, err, "Upgrading system"); | ||
| 308 | @@ -564,29 +563,28 @@ | ||
| 309 | static gboolean | ||
| 310 | backend_update_package_thread (PkBackend *backend) | ||
| 311 | { | ||
| 312 | - PkPackageId *pi; | ||
| 313 | + gchar **parts; | ||
| 314 | gint err = 0; | ||
| 315 | const gchar *package_id; | ||
| 316 | |||
| 317 | /* FIXME: support only_trusted */ | ||
| 318 | package_id = pk_backend_get_string (backend, "pkgid"); | ||
| 319 | - pi = pk_package_id_new_from_string (package_id); | ||
| 320 | + parts = pk_package_id_split (package_id); | ||
| 321 | |||
| 322 | - if (!pi->name || !pi->version) | ||
| 323 | + if (!parts) | ||
| 324 | { | ||
| 325 | pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND, | ||
| 326 | "Package not found"); | ||
| 327 | - pk_package_id_free (pi); | ||
| 328 | pk_backend_finished (backend); | ||
| 329 | return FALSE; | ||
| 330 | } | ||
| 331 | |||
| 332 | - err = opkg_upgrade_package (opkg, pi->name, pk_opkg_progress_cb, backend); | ||
| 333 | + err = opkg_upgrade_package (parts[PK_PACKAGE_ID_NAME], pk_opkg_progress_cb, backend); | ||
| 334 | if (err) | ||
| 335 | handle_install_error (backend, err); | ||
| 336 | |||
| 337 | |||
| 338 | - pk_package_id_free (pi); | ||
| 339 | + g_strfreev (parts); | ||
| 340 | pk_backend_finished (backend); | ||
| 341 | return (err != 0); | ||
| 342 | } | ||
| 343 | @@ -610,13 +608,13 @@ | ||
| 344 | */ | ||
| 345 | |||
| 346 | static void | ||
| 347 | -pk_opkg_list_upgradable_cb (opkg_t *_opkg, opkg_package_t *pkg, void *data) | ||
| 348 | +pk_opkg_list_upgradable_cb (pkg_t *pkg, void *data) | ||
| 349 | { | ||
| 350 | - PkBackend *backend = PK_BACKEND (data); | ||
| 351 | + PkBackend *backend = (PkBackend*) data; | ||
| 352 | gchar *uid; | ||
| 353 | gint status; | ||
| 354 | |||
| 355 | - if (pkg->installed) | ||
| 356 | + if (pkg->state_status == SS_INSTALLED) | ||
| 357 | status = PK_INFO_ENUM_INSTALLED; | ||
| 358 | else | ||
| 359 | status = PK_INFO_ENUM_AVAILABLE; | ||
| 360 | @@ -631,7 +629,7 @@ | ||
| 361 | static gboolean | ||
| 362 | backend_get_updates_thread (PkBackend *backend) | ||
| 363 | { | ||
| 364 | - opkg_list_upgradable_packages (opkg, pk_opkg_list_upgradable_cb, backend); | ||
| 365 | + opkg_list_upgradable_packages (pk_opkg_list_upgradable_cb, backend); | ||
| 366 | pk_backend_finished (backend); | ||
| 367 | return TRUE; | ||
| 368 | } | ||
| 369 | @@ -668,16 +666,18 @@ | ||
| 370 | static gboolean | ||
| 371 | backend_get_details_thread (PkBackend *backend) | ||
| 372 | { | ||
| 373 | - PkPackageId *pi; | ||
| 374 | gchar **package_ids; | ||
| 375 | + gchar **parts; | ||
| 376 | int group_index; | ||
| 377 | PkGroupEnum group = 0; | ||
| 378 | - opkg_package_t *pkg; | ||
| 379 | + pkg_t *pkg; | ||
| 380 | gchar *newid; | ||
| 381 | |||
| 382 | package_ids = pk_backend_get_strv(backend, "package_ids"); | ||
| 383 | - pi = pk_package_id_new_from_string (package_ids[0]); | ||
| 384 | - if (pi == NULL) | ||
| 385 | + parts = pk_package_id_split (package_ids[0]); | ||
| 386 | + | ||
| 387 | + | ||
| 388 | + if (!parts) | ||
| 389 | { | ||
| 390 | pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_ID_INVALID, "invalid package id"); | ||
| 391 | pk_backend_finished (backend); | ||
| 392 | @@ -685,8 +685,8 @@ | ||
| 393 | } | ||
| 394 | |||
| 395 | |||
| 396 | - pkg = opkg_find_package (opkg, pi->name, pi->version, pi->arch, pi->data); | ||
| 397 | - pk_package_id_free (pi); | ||
| 398 | + pkg = opkg_find_package (parts[PK_PACKAGE_ID_NAME], parts[PK_PACKAGE_ID_VERSION], parts[PK_PACKAGE_ID_ARCH], parts[PK_PACKAGE_ID_DATA]); | ||
| 399 | + g_strfreev (parts); | ||
| 400 | |||
| 401 | if (!pkg) | ||
| 402 | { | ||
| 403 | @@ -695,7 +695,7 @@ | ||
| 404 | return FALSE; | ||
| 405 | } | ||
| 406 | |||
| 407 | - newid = g_strdup_printf ("%s;%s;%s;%s", pkg->name, pkg->version, pkg->architecture, pkg->repository); | ||
| 408 | + newid = g_strdup_printf ("%s;%s;%s;%s", pkg->name, pkg->version, pkg->architecture, pkg->src->name); | ||
| 409 | |||
| 410 | if (pkg->tags) { | ||
| 411 | for (group_index = 0; group < PK_GROUP_ENUM_LAST; group_index++) { | ||
| 412 | @@ -706,9 +706,8 @@ | ||
| 413 | } | ||
| 414 | } | ||
| 415 | |||
| 416 | - pk_backend_details (backend, newid, NULL, group, pkg->description, pkg->url, pkg->size); | ||
| 417 | + pk_backend_details (backend, newid, NULL, group, pkg->description, NULL, pkg->size); | ||
| 418 | g_free (newid); | ||
| 419 | - opkg_package_free(pkg); | ||
| 420 | pk_backend_finished (backend); | ||
| 421 | return TRUE; | ||
| 422 | } | ||
diff --git a/meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb b/meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb deleted file mode 100644 index 1b60c470d1..0000000000 --- a/meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb +++ /dev/null | |||
| @@ -1,65 +0,0 @@ | |||
| 1 | SUMMARY = "PackageKit package management abstraction" | ||
| 2 | SECTION = "libs" | ||
| 3 | LICENSE = "GPL-2.0+" | ||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
| 5 | DEPENDS = "gtk+ python polkit dbus dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native" | ||
| 6 | RDEPENDS_${PN} = "opkg bash" | ||
| 7 | |||
| 8 | inherit gnome pythonnative | ||
| 9 | |||
| 10 | SRC_URI = "http://www.freedesktop.org/software/PackageKit/releases/PackageKit-${PV}.tar.bz2;name=archive \ | ||
| 11 | file://configurefix.patch \ | ||
| 12 | file://opkgfixes.patch \ | ||
| 13 | file://0001-Don-t-call-deprecated-glib-functions-and-use-the-new.patch \ | ||
| 14 | " | ||
| 15 | |||
| 16 | SRC_URI[archive.md5sum] = "33a3127e9ed41e26671786aee9fe56ff" | ||
| 17 | SRC_URI[archive.sha256sum] = "8dae41493dfb011442746d252b3435bf3204e17bf7c47e396f90fbd215260e14" | ||
| 18 | |||
| 19 | S = "${WORKDIR}/PackageKit-${PV}" | ||
| 20 | |||
| 21 | PACKAGECONFIG ??= "" | ||
| 22 | PACKAGECONFIG[service-packs] = "--enable-service-packs,--disable-service-packs,libarchive" | ||
| 23 | |||
| 24 | EXTRA_OECONF = "--with-security-framework=dummy \ | ||
| 25 | --with-default-backend=opkg \ | ||
| 26 | --enable-opkg \ | ||
| 27 | --disable-tests \ | ||
| 28 | --disable-ruck \ | ||
| 29 | --disable-qt \ | ||
| 30 | --disable-gstreamer-plugin \ | ||
| 31 | --disable-local \ | ||
| 32 | --disable-networkmanager \ | ||
| 33 | --disable-device-rebind \ | ||
| 34 | ac_cv_path_XMLTO=no \ | ||
| 35 | " | ||
| 36 | |||
| 37 | #do_configure_prepend() { | ||
| 38 | # mkdir -p m4 | ||
| 39 | # echo "EXTRA_DIST=" > gtk-doc.make | ||
| 40 | #} | ||
| 41 | |||
| 42 | do_configure_append() { | ||
| 43 | for i in $(find . -name Makefile) ; do | ||
| 44 | sed -i -e s:${STAGING_DIR_NATIVE}::g \ | ||
| 45 | -e s:/usr/bin/intltool-merge:${STAGING_BINDIR_NATIVE}/intltool-merge:g \ | ||
| 46 | $i | ||
| 47 | done | ||
| 48 | } | ||
| 49 | |||
| 50 | PACKAGES =+ "${PN}-website" | ||
| 51 | FILES_${PN}-website = "${datadir}/PackageKit/website" | ||
| 52 | |||
| 53 | PACKAGES =+ "${PN}-python" | ||
| 54 | FILES_${PN}-python = "${libdir}/python*" | ||
| 55 | |||
| 56 | PACKAGES =+ "${PN}-gtkmodule" | ||
| 57 | FILES_${PN}-gtkmodule = "${libdir}/gtk-2.0/*/*.so" | ||
| 58 | |||
| 59 | FILES_${PN} += "${libdir}/packagekit-backend/*.so ${libdir}/pm-utils ${datadir}/dbus-1/system-services/ ${datadir}/PolicyKit ${datadir}/PackageKit" | ||
| 60 | FILES_${PN}-dbg += "${libdir}/packagekit-backend/.debug/*.so ${libdir}/gtk-2.0/*/.debug" | ||
| 61 | FILES_${PN}-dev += "${libdir}/packagekit-backend/*.la ${libdir}/gtk-2.0/*/*.la" | ||
| 62 | FILES_${PN}-staticdev += "${libdir}/packagekit-backend/*.a ${libdir}/gtk-2.0/*/*.a" | ||
| 63 | |||
| 64 | # PackageKit-0.5.6/backends/opkg/pk-backend-opkg.c:31:26: fatal error: libopkg/opkg.h: No such file or directory | ||
| 65 | PNBLACKLIST[packagekit] ?= "BROKEN: depends on old deprecated libopkg which is currently disabled and will be removed soon - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool.inc b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool.inc deleted file mode 100644 index f7d480f174..0000000000 --- a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool.inc +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | DESCRIPTION = "Vala DBus Binding Tool" | ||
| 2 | SECTION = "devel" | ||
| 3 | DEPENDS = "vala libgee libxml2" | ||
| 4 | HOMEPAGE = "http://wiki.freesmartphone.org/index.php/Implementations/vala-dbus-binding-tool" | ||
| 5 | LICENSE = "GPLv3" | ||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | ||
| 7 | PE = "1" | ||
| 8 | INC_PR = "r3" | ||
| 9 | |||
| 10 | export XDG_DATA_DIRS = "${STAGING_DATADIR}" | ||
| 11 | |||
| 12 | SRC_URI = "${SOURCEFORGE_MIRROR}/freesmartphone/sources/${BP}.tar.bz2" | ||
| 13 | |||
| 14 | inherit autotools perlnative pkgconfig | ||
| 15 | |||
| 16 | BBCLASSEXTEND = "native" | ||
diff --git a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool/0001-configure.ac-don-t-use-dash-in-m4-macro-names.patch b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool/0001-configure.ac-don-t-use-dash-in-m4-macro-names.patch deleted file mode 100644 index 14d84ae8a0..0000000000 --- a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool/0001-configure.ac-don-t-use-dash-in-m4-macro-names.patch +++ /dev/null | |||
| @@ -1,34 +0,0 @@ | |||
| 1 | From 8abed2e5bf8e7815b11df6d22042d5f0ac8efcb0 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 3 | Date: Tue, 5 May 2015 13:43:35 +0200 | ||
| 4 | Subject: [PATCH] configure.ac: don't use dash in m4 macro names | ||
| 5 | |||
| 6 | * otherwise it doesn't get expanded and vala-dbus-binding-tool ends with version 'vala-dbus-binding-tool_version' | ||
| 7 | |||
| 8 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 9 | --- | ||
| 10 | configure.ac | 10 +++++----- | ||
| 11 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/configure.ac b/configure.ac | ||
| 14 | index 48f007c..18d0bde 100644 | ||
| 15 | --- a/configure.ac | ||
| 16 | +++ b/configure.ac | ||
| 17 | @@ -1,9 +1,9 @@ | ||
| 18 | -m4_define([vala-dbus-binding-tool_released], [0]) | ||
| 19 | -m4_define([vala-dbus-binding-tool_base_version], [1.0]) | ||
| 20 | -m4_define([vala-dbus-binding-tool_maybe_gitrev], m4_if(vala-dbus-binding-tool_released, [1], [], [m4_esyscmd([git show-ref --hash=5 HEAD | tr -d '\n\r'])])) | ||
| 21 | -m4_define([vala-dbus-binding-tool_version], m4_if(vala-dbus-binding-tool_released, [1], [vala-dbus-binding-tool_base_version], [vala-dbus-binding-tool_base_version-vala-dbus-binding-tool_maybe_gitrev])) | ||
| 22 | +m4_define([vala_dbus_binding_tool_released], [0]) | ||
| 23 | +m4_define([vala_dbus_binding_tool_base_version], [1.0]) | ||
| 24 | +m4_define([vala_dbus_binding_tool_maybe_gitrev], m4_if(vala_dbus_binding_tool_released, [1], [], [m4_esyscmd([git show-ref --hash=5 HEAD | tr -d '\n\r'])])) | ||
| 25 | +m4_define([vala_dbus_binding_tool_version], m4_if(vala_dbus_binding_tool_released, [1], [vala_dbus_binding_tool_base_version], [vala_dbus_binding_tool_base_version-vala_dbus_binding_tool_maybe_gitrev])) | ||
| 26 | |||
| 27 | -AC_INIT([vala-dbus-binding-tool], [vala-dbus-binding-tool_version], [fso@openphoenux.org], [vala-dbus-binding-tool]) | ||
| 28 | +AC_INIT([vala-dbus-binding-tool], [vala_dbus_binding_tool_version], [fso@openphoenux.org], [vala-dbus-binding-tool]) | ||
| 29 | AC_CONFIG_SRCDIR([src/Makefile.am]) | ||
| 30 | AC_CONFIG_HEADERS(config.h) | ||
| 31 | AM_INIT_AUTOMAKE([dist-bzip2]) | ||
| 32 | -- | ||
| 33 | 2.3.5 | ||
| 34 | |||
diff --git a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_0.4.0.bb b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_0.4.0.bb deleted file mode 100644 index 19e3dceca6..0000000000 --- a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_0.4.0.bb +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | require vala-dbus-binding-tool.inc | ||
| 2 | |||
| 3 | SRC_URI[md5sum] = "59eab7abf38f35355d3786803bd2441f" | ||
| 4 | SRC_URI[sha256sum] = "1e37ab2e6238eaef9f573560ea7379e6955570f7c9503083e50c4c185c1956df" | ||
| 5 | |||
| 6 | PNBLACKLIST[vala-dbus-binding-tool] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/131628/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
diff --git a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb deleted file mode 100644 index 32f34550dd..0000000000 --- a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | require vala-dbus-binding-tool.inc | ||
| 2 | |||
| 3 | # Temporary remove negative preference, because there are 2 versions of 0.4.0 archives: | ||
| 4 | # the original one depending on libgee1.0 from | ||
| 5 | # http://downloads.freesmartphone.org/sources/${BPN}/${BP}.tar.bz2 | ||
| 6 | # and new one depending on libgee0.8 from | ||
| 7 | # http://sourceforge.net/projects/freesmartphone/files/sources/ | ||
| 8 | # The original one can be already deployed on various premirrors, | ||
| 9 | # so prefer the git recipe which doesn't suffer from this issue | ||
| 10 | # DEFAULT_PREFERENCE = "-1" | ||
| 11 | |||
| 12 | SRCREV = "742c04c2bb0743891904522ce47e50f9e5c99b12" | ||
| 13 | PV = "0.4.0+gitr${SRCPV}" | ||
| 14 | |||
| 15 | SRC_URI = "git://github.com/freesmartphone/vala-dbus-binding-tool.git;protocol=https \ | ||
| 16 | file://0001-configure.ac-don-t-use-dash-in-m4-macro-names.patch \ | ||
| 17 | " | ||
| 18 | S = "${WORKDIR}/git" | ||
| 19 | |||
| 20 | PNBLACKLIST[vala-dbus-binding-tool] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130581/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
