mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-31 13:20:03 +00:00
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>
This commit is contained in:
Martin Jansa
-29
@@ -1,29 +0,0 @@
|
||||
From ac1953d04f3f26d6aa5d8f53a9397d3ba0e96fa3 Mon Sep 17 00:00:00 2001
|
||||
From: Koen Kooi <koen@circuitco.com>
|
||||
Date: Fri, 11 May 2012 15:23:02 +0000
|
||||
Subject: [PATCH] ide: use 'node' as interpreter for sketches instead of
|
||||
argv[0]
|
||||
|
||||
This enables running scripts with node 0.6.x instead of 0.4.x
|
||||
|
||||
Signed-off-by: root <root@beaglebone.(none)>
|
||||
---
|
||||
server/cloud9/ide.js | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/server/cloud9/ide.js b/server/cloud9/ide.js
|
||||
index ce782f5..6c4e0f7 100644
|
||||
--- a/server/cloud9/ide.js
|
||||
+++ b/server/cloud9/ide.js
|
||||
@@ -53,7 +53,7 @@ var Ide = module.exports = function(options, httpServer, exts, socket) {
|
||||
};
|
||||
|
||||
this.$users = {};
|
||||
- this.nodeCmd = process.argv[0];
|
||||
+ this.nodeCmd = "node";
|
||||
|
||||
var davOptions = {
|
||||
node: this.options.mountDir,
|
||||
--
|
||||
1.7.7
|
||||
|
||||
@@ -1,118 +0,0 @@
|
||||
SUMMARY = "Meet Cloud9, development-as-a-service for Javascripters and other developers"
|
||||
HOMEPAGE = "http://c9.io"
|
||||
LICENSE = "GPLv3"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=4784c3bcff601fd8f9515f52a11e7018"
|
||||
|
||||
PR = "r5"
|
||||
|
||||
# Nodejs-native for node-waf, nodejs4-native for the headers
|
||||
DEPENDS = "libxml2 nodejs-native nodejs4-native"
|
||||
|
||||
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"
|
||||
inherit systemd
|
||||
|
||||
SRC_URI = "git://github.com/ajaxorg/cloud9.git;name=cloud9ide \
|
||||
git://github.com/ajaxorg/o3;destsuffix=o3;name=o3 \
|
||||
git://github.com/ajaxorg/ace.git;destsuffix=git/support/ace;name=ace \
|
||||
git://github.com/ajaxorg/ace.wiki.git;destsuffix=git/support/ace/doc/wiki;name=acewiki \
|
||||
git://github.com/ajaxorg/apf.git;destsuffix=git/support/apf;name=apf \
|
||||
git://github.com/ajaxorg/async.js.git;destsuffix=git/support/asyncjs;name=asyncjs \
|
||||
git://github.com/ajaxorg/connect.git;destsuffix=git/support/connect;name=connect;branch=ajaxorg \
|
||||
git://github.com/jashkenas/coffee-script.git;destsuffix=git/support/connect/support/coffee-script;name=coffee-script \
|
||||
git://github.com/visionmedia/expresso.git;destsuffix=git/support/connect/support/expresso;name=expresso \
|
||||
git://github.com/visionmedia/node-jscoverage.git;destsuffix=git/support/connect/support/expresso/deps/jscoverage;name=jscoverage \
|
||||
git://github.com/cloudhead/less.js.git;destsuffix=git/support/connect/support/less;name=less \
|
||||
git://github.com/matehat/sass.js.git;destsuffix=git/support/connect/support/sass;name=sass \
|
||||
git://github.com/ajaxorg/jsDAV.git;destsuffix=git/support/jsdav;name=jsdav \
|
||||
git://github.com/fjakobs/async.js.git;destsuffix=git/support/jsdav/support/async.js;name=async-js \
|
||||
git://github.com/felixge/node-formidable.git;destsuffix=git/support/jsdav/support/formidable;name=formidable \
|
||||
git://github.com/ajaxorg/jsftp.git;destsuffix=git/support/jsdav/support/jsftp;name=jsftp \
|
||||
git://github.com/Gozala/streamer.git;destsuffix=git/support/jsdav/support/jsftp/support/streamer;name=streamer \
|
||||
git://github.com/ajaxorg/node-sftp.git;destsuffix=git/support/jsdav/support/node-sftp;name=sftp \
|
||||
git://github.com/ajaxorg/lib-v8debug.git;destsuffix=git/support/lib-v8debug;name=lib-v8debug \
|
||||
git://github.com/ajaxorg/socket.io.git;destsuffix=git/support/socket.io;name=socketio;branch=cadorn-upstream \
|
||||
git://github.com/LearnBoost/socket.io-client.git;destsuffix=git/support/socket.io-client;name=socketio-client \
|
||||
git://github.com/ajaxorg/treehugger.git;destsuffix=git/support/treehugger;name=treehugger \
|
||||
git://github.com/ajaxorg/UglifyJS.git;destsuffix=git/support/uglify-js;name=uglify-js \
|
||||
file://index.js \
|
||||
file://cloud9-avahi.service \
|
||||
file://cloud9.service \
|
||||
file://0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch \
|
||||
"
|
||||
|
||||
SRCREV_cloud9ide = "c4e2574896a22bb749f0500b25f41c888d346bed"
|
||||
SRCREV_o3 = "d66d4e3252e505f44ada6804c8cab39915ce8afd"
|
||||
SRCREV_ace = "0fc5392cbe46fb134052c3065a238ad8e3b31cfd"
|
||||
SRCREV_acewiki = "d2a65d0addc2e5ab922bbff9cb6022a4652b4f13"
|
||||
SRCREV_apf = "2560b762b2b0e5a8b46f8a4062f927a9a9d239f4"
|
||||
SRCREV_asyncjs = "d36ead408e2959b1e99572114ef3a1b6a48c1072"
|
||||
SRCREV_connect = "6bec95b51f2286b942bc7f340d62d816bcdc13d4"
|
||||
SRCREV_coffee-script = "a53c104db16d3ac9d13cf9f16834edec250b9749"
|
||||
SRCREV_expresso = "7f10ab7fa655299b4e2f519065b0495e6ac34ef2"
|
||||
SRCREV_jscoverage = "0d4608a6b4275b020ba665389aa75897d5d4a584"
|
||||
SRCREV_less = "a2807288008587b95c6c2f8ba5cac16f1bcab98f"
|
||||
SRCREV_sass = "4dfd4c699e7a8baf226215ab044854c4507f4420"
|
||||
SRCREV_jsdav = "f04ebf3d012cc8aeabfcfb2b8fab8966d52929e9"
|
||||
SRCREV_async-js = "92fb710a70efd3cdc2376ebfba71a7fb3a4f1651"
|
||||
SRCREV_formidable = "a37292d4b7d6d76a38909ed670334c9068d40871"
|
||||
SRCREV_jsftp = "e3f10c8927347c170cdd0150ef38e18272acf942"
|
||||
SRCREV_streamer = "1a7f75d4065819171ac91a09974199b932dbe17d"
|
||||
SRCREV_sftp = "a0539345134970d7535a19cb2608e3d1bc119d71"
|
||||
SRCREV_lib-v8debug = "7c11897f4bc77c7275c2b6dff5becc72ac018662"
|
||||
SRCREV_socketio = "735d5239b325df2ba67d2b9bb4ec32442283bc06"
|
||||
SRCREV_socketio-client = "4375ef1344ecb8ad75a3848a00af6b391822f86b"
|
||||
SRCREV_treehugger = "436d0d6dd0ce43782e6be08ad12c356730626996"
|
||||
SRCREV_uglify-js = "941c845c4a01e4e47a158458fe846eb36d0828ad"
|
||||
|
||||
SRCREV_FORMAT = "cloud9ide"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
do_configure () {
|
||||
cd ${WORKDIR}/o3
|
||||
node-waf -vv configure
|
||||
}
|
||||
|
||||
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"
|
||||
|
||||
do_compile () {
|
||||
cd ${WORKDIR}/o3
|
||||
node4 tools/gluegen.js
|
||||
cd hosts
|
||||
${CXX} ${TARGET_CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o sh_node.o node-o3/sh_node.cc
|
||||
${CXX} ${TARGET_CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o sh_node_libs.o node-o3/sh_node_libs.cc
|
||||
cd ..
|
||||
${CXX} ${TARGET_LDFLAGS} hosts/sh_node.o hosts/sh_node_libs.o -o o3.node -shared -Wl,-Bdynamic -lxml2
|
||||
}
|
||||
|
||||
do_install () {
|
||||
install -m 0755 -d ${D}${datadir}/cloud9 ${D}${bindir} ${D}/var/lib/cloud9
|
||||
rsync -r --exclude=".*" ${S}/* ${D}${datadir}/cloud9
|
||||
|
||||
touch ${D}${bindir}/cloud9
|
||||
echo "#!/bin/sh" > ${D}${bindir}/cloud9
|
||||
echo "node4 ${datadir}/cloud9/bin/cloud9.js -l 0.0.0.0 -w /var/lib/cloud9 -p 3000" >> ${D}${bindir}/cloud9
|
||||
chmod 0755 ${D}${bindir}/cloud9
|
||||
|
||||
install -m 0755 -d ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml
|
||||
install -m 0644 ${WORKDIR}/index.js ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/index.js
|
||||
install -m 0644 ${WORKDIR}/o3/modules/o3.js ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.js
|
||||
install -m 0755 ${WORKDIR}/o3/o3.node ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.node
|
||||
|
||||
install -m 0755 -d ${D}${sysconfdir}/avahi/services/
|
||||
install -m 0644 ${WORKDIR}/cloud9-avahi.service ${D}${sysconfdir}/avahi/services/
|
||||
|
||||
install -d ${D}${systemd_unitdir}/system
|
||||
install -m 0644 ${WORKDIR}/cloud9.service ${D}${systemd_unitdir}/system
|
||||
}
|
||||
|
||||
FILES_${PN}-dbg += "${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/.debug \
|
||||
${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/.debug \
|
||||
"
|
||||
|
||||
RDEPENDS_${PN} = "nodejs4 nodejs gzip"
|
||||
|
||||
RPROVIDES_${PN} += "${PN}-systemd"
|
||||
RREPLACES_${PN} += "${PN}-systemd"
|
||||
RCONFLICTS_${PN} += "${PN}-systemd"
|
||||
SYSTEMD_SERVICE_${PN} = "cloud9.service"
|
||||
@@ -1,29 +0,0 @@
|
||||
From 4cf7e16fe9b773e2e7763d4b773854eefe2aa9ab Mon Sep 17 00:00:00 2001
|
||||
From: Otavio Salvador <otavio@ossystems.com.br>
|
||||
Date: Tue, 12 Jan 2016 09:59:55 -0200
|
||||
Subject: [PATCH] Stop using relative path for scsilib.c link
|
||||
Organization: O.S. Systems Software LTDA.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
||||
---
|
||||
Makefile.linux | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.linux b/Makefile.linux
|
||||
index 78333ff..e210564 100644
|
||||
--- a/Makefile.linux
|
||||
+++ b/Makefile.linux
|
||||
@@ -129,7 +129,7 @@ scsilib.c:
|
||||
echo "Please specify OS={aix,linux,hpux,solaris,windows}"; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
- ln -sf ../scsilib-$(OS).c scsilib.c
|
||||
+ ln -sf scsilib-$(OS).c scsilib.c
|
||||
|
||||
print:;
|
||||
@$(PRINTER) $(PRINTFLAGS) $(ALL_CFILES)
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -1,92 +0,0 @@
|
||||
From e3c6eb8776f659eb9e6eeccf90d785eff18ecf74 Mon Sep 17 00:00:00 2001
|
||||
From: Otavio Salvador <otavio@ossystems.com.br>
|
||||
Date: Mon, 15 Feb 2016 18:00:05 -0200
|
||||
Subject: [PATCH] Use 'tcsh' shell
|
||||
Organization: O.S. Systems Software LTDA.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
||||
---
|
||||
Scripts/dta | 2 +-
|
||||
Scripts/dtc | 2 +-
|
||||
Scripts/dtf | 2 +-
|
||||
Scripts/dtr | 2 +-
|
||||
Scripts/dts | 2 +-
|
||||
Scripts/dtt | 2 +-
|
||||
Scripts/dtw | 2 +-
|
||||
7 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/Scripts/dta b/Scripts/dta
|
||||
index ebc7072..4f90247 100755
|
||||
--- a/Scripts/dta
|
||||
+++ b/Scripts/dta
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/csh
|
||||
+#!/bin/tcsh
|
||||
#
|
||||
# Script file to test asynchronous communication lines.
|
||||
#
|
||||
diff --git a/Scripts/dtc b/Scripts/dtc
|
||||
index da69c2e..89d48c2 100755
|
||||
--- a/Scripts/dtc
|
||||
+++ b/Scripts/dtc
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/csh
|
||||
+#!/bin/tcsh
|
||||
# %Z%%M% %I% %E%
|
||||
#
|
||||
# Date: August 7, 1990
|
||||
diff --git a/Scripts/dtf b/Scripts/dtf
|
||||
index 9f8cd87..321d261 100755
|
||||
--- a/Scripts/dtf
|
||||
+++ b/Scripts/dtf
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /bin/csh
|
||||
+#! /bin/tcsh
|
||||
#
|
||||
# Script file to gather floppy disk performance data.
|
||||
#
|
||||
diff --git a/Scripts/dtr b/Scripts/dtr
|
||||
index ddb7947..1ff5a0b 100755
|
||||
--- a/Scripts/dtr
|
||||
+++ b/Scripts/dtr
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/csh
|
||||
+#!/bin/tcsh
|
||||
# %Z%%M% %I% %E%
|
||||
#
|
||||
# Date: August 21, 1990
|
||||
diff --git a/Scripts/dts b/Scripts/dts
|
||||
index 6b8a167..42d2312 100755
|
||||
--- a/Scripts/dts
|
||||
+++ b/Scripts/dts
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/csh
|
||||
+#!/bin/tcsh
|
||||
# %Z%%M% %I% %E%
|
||||
#
|
||||
# Date: August 7, 1990
|
||||
diff --git a/Scripts/dtt b/Scripts/dtt
|
||||
index 36cc6bd..df19d2f 100755
|
||||
--- a/Scripts/dtt
|
||||
+++ b/Scripts/dtt
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /bin/csh
|
||||
+#! /bin/tcsh
|
||||
# %Z%%M% %I% %E%
|
||||
#
|
||||
# Date: August 7, 1990
|
||||
diff --git a/Scripts/dtw b/Scripts/dtw
|
||||
index 8a4ac39..c58e304 100755
|
||||
--- a/Scripts/dtw
|
||||
+++ b/Scripts/dtw
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/csh
|
||||
+#!/bin/tcsh
|
||||
# %Z%%M% %I% %E%
|
||||
#
|
||||
# Date: August 21, 1990
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
Patch from http://pkgs.fedoraproject.org/git/rpms/dt.git
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
||||
|
||||
diff -rupN dt.v18.32.old/common.h dt.v18.32/common.h
|
||||
--- dt.v18.32.old/common.h 2013-03-01 23:52:30.000000000 +0100
|
||||
+++ dt.v18.32/common.h 2014-09-24 17:41:40.777604710 +0200
|
||||
@@ -127,7 +127,7 @@ typedef volatile slarge_t v_slarge;
|
||||
|
||||
#endif /* defined(_WIN64) */
|
||||
|
||||
-#elif defined(__GNUC__) && defined(_BSD_SOURCE) || defined(SCO) || defined(__QNXNTO__) || defined(SOLARIS) || defined(HP_UX) || defined(AIX) || defined(_NT_SOURCE)
|
||||
+#elif defined(__GNUC__) && defined(_BSD_SOURCE) || defined (_DEFAULT_SOURCE) || defined(SCO) || defined(__QNXNTO__) || defined(SOLARIS) || defined(HP_UX) || defined(AIX) || defined(_NT_SOURCE)
|
||||
|
||||
#define QuadIsLongLong
|
||||
typedef unsigned long long int large_t;
|
||||
@@ -1,48 +0,0 @@
|
||||
Patch from http://pkgs.fedoraproject.org/git/rpms/dt.git
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
||||
|
||||
diff -rupN dt.v18.32.old/dt.c dt.v18.32/dt.c
|
||||
--- dt.v18.32.old/dt.c 2014-08-18 14:45:53.242351115 +0200
|
||||
+++ dt.v18.32/dt.c 2014-08-18 15:11:36.367719880 +0200
|
||||
@@ -4378,7 +4378,7 @@ report_error(
|
||||
(void)sprintf(dip->di_msg_buffer, "(%d): '%s', errno = %d - %s\n",
|
||||
dip->di_process_id, error_info, errno, emsg);
|
||||
}
|
||||
- syslog(LOG_ERR, dip->di_msg_buffer);
|
||||
+ syslog(LOG_ERR, "%s", dip->di_msg_buffer);
|
||||
}
|
||||
#endif /* defined(SYSLOG) */
|
||||
|
||||
diff -rupN dt.v18.32.old/dtutil.c dt.v18.32/dtutil.c
|
||||
--- dt.v18.32.old/dtutil.c 2014-08-18 14:45:53.354350779 +0200
|
||||
+++ dt.v18.32/dtutil.c 2014-08-18 15:13:53.835307311 +0200
|
||||
@@ -5180,7 +5180,7 @@ ReportDeviceInfo (
|
||||
bp += Sprintf(bp,
|
||||
"(%d) Device name: %s\n",
|
||||
dip->di_process_id, dip->di_dname);
|
||||
- syslog(LOG_ERR, dip->di_msg_buffer);
|
||||
+ syslog(LOG_ERR, "%s", dip->di_msg_buffer);
|
||||
bp = dip->di_msg_buffer;
|
||||
# if defined(SCSI)
|
||||
if (dip->di_serial_number) {
|
||||
@@ -5193,7 +5193,7 @@ ReportDeviceInfo (
|
||||
dip->di_process_id, dip->di_device_id);
|
||||
}
|
||||
# endif /* defined(SCSI) */
|
||||
- syslog(LOG_ERR, dip->di_msg_buffer);
|
||||
+ syslog(LOG_ERR, "%s", dip->di_msg_buffer);
|
||||
bp = dip->di_msg_buffer;
|
||||
bp += Sprintf(bp,
|
||||
"(%d) Relative block number where the error occurred is " LUF ","
|
||||
@@ -5203,7 +5203,7 @@ ReportDeviceInfo (
|
||||
} else {
|
||||
bp += Sprintf(bp, "\n");
|
||||
}
|
||||
- syslog(LOG_ERR, dip->di_msg_buffer);
|
||||
+ syslog(LOG_ERR, "%s", dip->di_msg_buffer);
|
||||
}
|
||||
#endif /* defined(SYSLOG) */
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
SUMMARY = "Generic data test program"
|
||||
DESCRIPTION = "The Data Test Program (dt) is a generic data test program used to verify proper \
|
||||
operation of peripherals, file systems, device drivers, or any data stream supported by the \
|
||||
operating system."
|
||||
HOMEPAGE = "http://www.scsifaq.org/RMiller_Tools/dt.html"
|
||||
|
||||
SECTION = "console/tests"
|
||||
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=be8bb25bbcfaa0725710d188e5152668"
|
||||
|
||||
# Source URI taken from Fedora RPM spec file at:
|
||||
# http://pkgs.fedoraproject.org/git/rpms/dt.git
|
||||
SRC_URI = "http://dl.dropboxusercontent.com/u/32363629/Datatest/dt-source-v${PV}.tar.gz \
|
||||
file://dt-default-source-define.patch \
|
||||
file://dt-wformat-security.patch \
|
||||
file://Stop-using-relative-path-for-scsilib.c-link.patch \
|
||||
file://Use-tcsh-shell.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "3054aeaaba047a1dbe90c2132a382ee2"
|
||||
SRC_URI[sha256sum] = "10d164676e918a4d07f233bcd11e4cb6bfd1052c996182cd1827ccd0c063fcc6"
|
||||
|
||||
S = "${WORKDIR}/dt.v${PV}"
|
||||
|
||||
TARGET_CC_ARCH += "${LDFLAGS}"
|
||||
|
||||
EXTRA_OEMAKE += "-f Makefile.linux \
|
||||
OS=linux \
|
||||
CFLAGS="-I.. -DAIO -DFIFO -DMMAP -D__linux__ -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DTHREADS -DSCSI""
|
||||
|
||||
do_compile() {
|
||||
oe_runmake
|
||||
}
|
||||
|
||||
do_install() {
|
||||
install -Dm755 dt ${D}${sbindir}/dt
|
||||
install -Dm644 Documentation/dt.man ${D}${mandir}/man8/dt.8
|
||||
|
||||
install -d ${D}${datadir}/dt/
|
||||
install -d ${D}${docdir}/dt/html/
|
||||
install -m755 Scripts/dt? ${D}${datadir}/dt/
|
||||
install -m644 data/pattern_* ${D}${datadir}/dt/
|
||||
install -m644 html/* ${D}${docdir}/dt/html/
|
||||
}
|
||||
|
||||
RDEPENDS_${PN} += "tcsh"
|
||||
|
||||
PNBLACKLIST[dt] ?= "Rdepends on blacklisted tcsh - the recipe will be removed on 2017-09-01 unless the issue is fixed"
|
||||
@@ -1,31 +0,0 @@
|
||||
From 5bda9c0af56869c6ff2c25d38ea087179c946bc6 Mon Sep 17 00:00:00 2001
|
||||
From: Chong Lu <Chong.Lu@windriver.com>
|
||||
Date: Tue, 11 Mar 2014 14:47:22 +0800
|
||||
Subject: [PATCH] ltp: Don't link against libfl
|
||||
|
||||
We have already defined yywrap function in scan.l file. After this, we no longer need to
|
||||
link against libfl and so no longer get errors about undefined references to yylex.
|
||||
|
||||
Upstream-status: Pending
|
||||
|
||||
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
|
||||
---
|
||||
pan/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/pan/Makefile b/pan/Makefile
|
||||
index 4cc6466..a4b575b 100644
|
||||
--- a/pan/Makefile
|
||||
+++ b/pan/Makefile
|
||||
@@ -31,7 +31,7 @@ CPPFLAGS += -Wno-error
|
||||
|
||||
CPPFLAGS += -I$(abs_srcdir)
|
||||
|
||||
-LDLIBS += -lm $(LEXLIB)
|
||||
+LDLIBS += -lm
|
||||
|
||||
LFLAGS += -l
|
||||
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
@@ -1,97 +0,0 @@
|
||||
SUMMARY = "Embedded Linux Device Driver Tests based on Linux Test Project"
|
||||
HOMEPAGE = "http://arago-project.org/git/projects/test-automation/ltp-ddt.git"
|
||||
SECTION = "console/utils"
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
|
||||
|
||||
PROVIDES += "ltp"
|
||||
DEPENDS += "zip-native virtual/kernel alsa-lib"
|
||||
|
||||
RDEPENDS_${PN} += "pm-qa serialcheck"
|
||||
|
||||
inherit autotools module-base kernel-module-split
|
||||
|
||||
PACKAGE_ARCH = "${MACHINE_ARCH}"
|
||||
|
||||
SRCREV = "f086bed6cc88bf102eaad0e96cb7ebe79944a8ad"
|
||||
BRANCH ?= "master"
|
||||
|
||||
SRC_URI = "git://arago-project.org/git/projects/test-automation/ltp-ddt.git;branch=${BRANCH} \
|
||||
file://ltp-Do-not-link-against-libfl.patch \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
LTPROOT = "/opt/ltp"
|
||||
|
||||
EXTRA_OEMAKE_append = " \
|
||||
prefix=${LTPROOT} \
|
||||
CROSS_COMPILE=${HOST_PREFIX} \
|
||||
SKIP_IDCHECK=1 \
|
||||
KERNEL_PATH=${STAGING_KERNEL_DIR} \
|
||||
KERNEL_INC=${STAGING_KERNEL_DIR} \
|
||||
KERNEL_USR_INC=${STAGING_INCDIR} \
|
||||
ALSA_INCPATH=${STAGING_INCDIR} \
|
||||
ALSA_LIBPATH=${STAGING_LIBDIR} \
|
||||
PLATFORM=${MACHINE} \
|
||||
RANLIB=${RANLIB} \
|
||||
DESTDIR=${D} \
|
||||
CC='${CC}' \
|
||||
KERNEL_CC='${KERNEL_CC}' \
|
||||
"
|
||||
|
||||
TARGET_CC_ARCH += "${LDFLAGS}"
|
||||
|
||||
FILES_${PN}-dbg += " \
|
||||
${LTPROOT}/.debug \
|
||||
${LTPROOT}/bin/.debug \
|
||||
${LTPROOT}/runtest/.debug \
|
||||
${LTPROOT}/testcases/bin/.debug \
|
||||
${LTPROOT}/testcases/bin/*/bin/.debug \
|
||||
${LTPROOT}/testcases/bin/*/test/.debug \
|
||||
${LTPROOT}/testcases/bin/ddt/.debug \
|
||||
${LTPROOT}/testcases/bin/ddt/*/bin/.debug \
|
||||
${LTPROOT}/testcases/bin/ddt/*/test/.debug \
|
||||
${LTPROOT}/testcases/realtime/*/*/.debug \
|
||||
"
|
||||
|
||||
FILES_${PN}-staticdev += "${LTPROOT}/lib"
|
||||
FILES_${PN} += "${LTPROOT}/*"
|
||||
|
||||
KERNEL_MODULES_META_PACKAGE = "${PN}"
|
||||
|
||||
kmoddir = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/ddt"
|
||||
|
||||
# ltp doesn't regenerate ffsb-6.0-rc2 configure and hardcode configure call.
|
||||
# we explicitly force regeneration of that directory and pass configure options.
|
||||
do_configure_append() {
|
||||
(cd utils/ffsb-6.0-rc2; autoreconf -fvi; ./configure ${CONFIGUREOPTS})
|
||||
}
|
||||
|
||||
# The makefiles make excessive use of make -C and several include testcases.mk
|
||||
# which triggers a build of the syscall header. To reproduce, build ltp,
|
||||
# then delete the header, then "make -j XX" and watch regen.sh run multiple
|
||||
# times. Its easier to generate this once here instead.
|
||||
do_compile_prepend () {
|
||||
( make -C ${B}/testcases/kernel include/linux_syscall_numbers.h )
|
||||
}
|
||||
|
||||
do_compile_append () {
|
||||
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
|
||||
oe_runmake modules
|
||||
}
|
||||
|
||||
do_install() {
|
||||
oe_runmake install
|
||||
install -d ${D}${datadir}
|
||||
install -d ${D}${kmoddir}
|
||||
mv ${D}${LTPROOT}/testcases/bin/ddt/*.ko ${D}${kmoddir}
|
||||
}
|
||||
|
||||
# do_make_scripts should be a separate task for the lock to work
|
||||
addtask make_scripts before do_compile
|
||||
do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock"
|
||||
do_make_scripts[deptask] = "do_populate_sysroot"
|
||||
|
||||
# http://errors.yoctoproject.org/Errors/Details/56327/
|
||||
PNBLACKLIST[ltp-ddt] ?= "BROKEN: fails since last autotools.bbclass changes - the recipe will be removed on 2017-09-01 unless the issue is fixed"
|
||||
-166
@@ -1,166 +0,0 @@
|
||||
From 869e52a9055c72970fed036a1510f676e6ce0824 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 13 Jun 2013 01:24:19 -0700
|
||||
Subject: [PATCH] Don't call deprecated glib functions and use the new gthread
|
||||
API.
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
Upstream-Status: Inappropriate[version Unmaintained Upstream]
|
||||
---
|
||||
client/pk-console.c | 3 ++-
|
||||
client/pk-generate-pack.c | 3 ++-
|
||||
client/pk-monitor.c | 3 ++-
|
||||
contrib/command-not-found/PackageKit.sh | 2 +-
|
||||
contrib/command-not-found/pk-command-not-found.c | 4 ++--
|
||||
contrib/debuginfo-install/pk-debuginfo-install.c | 4 ++--
|
||||
src/pk-backend.c | 7 +++++++
|
||||
src/pk-main.c | 4 ++--
|
||||
10 files changed, 20 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/client/pk-console.c b/client/pk-console.c
|
||||
index de927e1..2435f27 100644
|
||||
--- a/client/pk-console.c
|
||||
+++ b/client/pk-console.c
|
||||
@@ -1264,11 +1264,12 @@ main (int argc, char *argv[])
|
||||
bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
|
||||
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
|
||||
textdomain (GETTEXT_PACKAGE);
|
||||
-
|
||||
+#if !GLIB_CHECK_VERSION(2,32,0)
|
||||
if (! g_thread_supported ())
|
||||
g_thread_init (NULL);
|
||||
g_type_init ();
|
||||
dbus_g_thread_init ();
|
||||
+#endif
|
||||
|
||||
/* do stuff on ctrl-c */
|
||||
signal (SIGINT, pk_console_sigint_cb);
|
||||
diff --git a/client/pk-generate-pack.c b/client/pk-generate-pack.c
|
||||
index 0b2b40f..20d7e8d 100644
|
||||
--- a/client/pk-generate-pack.c
|
||||
+++ b/client/pk-generate-pack.c
|
||||
@@ -251,12 +251,13 @@ main (int argc, char *argv[])
|
||||
bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
|
||||
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
|
||||
textdomain (GETTEXT_PACKAGE);
|
||||
-
|
||||
+#if !GLIB_CHECK_VERSION(2,32,0)
|
||||
if (! g_thread_supported ())
|
||||
g_thread_init (NULL);
|
||||
|
||||
g_type_init ();
|
||||
dbus_g_thread_init ();
|
||||
+#endif
|
||||
|
||||
/* do stuff on ctrl-c */
|
||||
signal (SIGINT, pk_generate_pack_sigint_cb);
|
||||
diff --git a/client/pk-monitor.c b/client/pk-monitor.c
|
||||
index f230f7a..d43007f 100644
|
||||
--- a/client/pk-monitor.c
|
||||
+++ b/client/pk-monitor.c
|
||||
@@ -285,11 +285,12 @@ main (int argc, char *argv[])
|
||||
bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
|
||||
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
|
||||
textdomain (GETTEXT_PACKAGE);
|
||||
-
|
||||
+#if !GLIB_CHECK_VERSION(2,32,0)
|
||||
if (! g_thread_supported ())
|
||||
g_thread_init (NULL);
|
||||
g_type_init ();
|
||||
dbus_g_thread_init ();
|
||||
+#endif
|
||||
|
||||
context = g_option_context_new (NULL);
|
||||
/* TRANSLATORS: this is a program that monitors PackageKit */
|
||||
diff --git a/contrib/command-not-found/PackageKit.sh b/contrib/command-not-found/PackageKit.sh
|
||||
index d08989c..d708fff 100644
|
||||
--- a/contrib/command-not-found/PackageKit.sh
|
||||
+++ b/contrib/command-not-found/PackageKit.sh
|
||||
@@ -18,7 +18,7 @@ command_not_found_handle () {
|
||||
|
||||
# run the command, or just print a warning
|
||||
if [ $runcnf -eq 1 ]; then
|
||||
- /home/hughsie/.root/libexec/pk-command-not-found $1
|
||||
+ /usr/lib/packagekit/pk-command-not-found $1
|
||||
retval=$?
|
||||
else
|
||||
echo "bash: $1: command not found"
|
||||
diff --git a/contrib/command-not-found/pk-command-not-found.c b/contrib/command-not-found/pk-command-not-found.c
|
||||
index 70679c0..9f81ce4 100644
|
||||
--- a/contrib/command-not-found/pk-command-not-found.c
|
||||
+++ b/contrib/command-not-found/pk-command-not-found.c
|
||||
@@ -659,12 +659,12 @@ main (int argc, char *argv[])
|
||||
bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
|
||||
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
|
||||
textdomain (GETTEXT_PACKAGE);
|
||||
-
|
||||
+#if !GLIB_CHECK_VERSION(2,32,0)
|
||||
if (! g_thread_supported ())
|
||||
g_thread_init (NULL);
|
||||
dbus_g_thread_init ();
|
||||
g_type_init ();
|
||||
-
|
||||
+#endif
|
||||
context = g_option_context_new (NULL);
|
||||
/* TRANSLATORS: tool that gets called when the command is not found */
|
||||
g_option_context_set_summary (context, _("PackageKit Command Not Found"));
|
||||
diff --git a/contrib/debuginfo-install/pk-debuginfo-install.c b/contrib/debuginfo-install/pk-debuginfo-install.c
|
||||
index c12aca5..b0e1e7c 100644
|
||||
--- a/contrib/debuginfo-install/pk-debuginfo-install.c
|
||||
+++ b/contrib/debuginfo-install/pk-debuginfo-install.c
|
||||
@@ -532,11 +532,11 @@ main (int argc, char *argv[])
|
||||
bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
|
||||
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
|
||||
textdomain (GETTEXT_PACKAGE);
|
||||
-
|
||||
+#if !GLIB_CHECK_VERSION(2,32,0)
|
||||
if (! g_thread_supported ())
|
||||
g_thread_init (NULL);
|
||||
g_type_init ();
|
||||
-
|
||||
+#endif
|
||||
context = g_option_context_new (NULL);
|
||||
/* TRANSLATORS: tool that gets called when the command is not found */
|
||||
g_option_context_set_summary (context, _("PackageKit Debuginfo Installer"));
|
||||
diff --git a/src/pk-backend.c b/src/pk-backend.c
|
||||
index 5216b63..5b83ae4 100644
|
||||
--- a/src/pk-backend.c
|
||||
+++ b/src/pk-backend.c
|
||||
@@ -2103,7 +2103,14 @@ pk_backend_thread_create (PkBackend *backend, PkBackendThreadFunc func)
|
||||
egg_warning ("already has thread");
|
||||
return FALSE;
|
||||
}
|
||||
+#if !GLIB_CHECK_VERSION(2,32,0)
|
||||
backend->priv->thread = g_thread_create ((GThreadFunc) func, backend, FALSE, NULL);
|
||||
+#else
|
||||
+ backend->priv->thread = g_thread_try_new ("daemon thread", (GThreadFunc) func, backend, NULL);
|
||||
+ if (backend->priv->thread != NULL) {
|
||||
+ g_thread_unref(backend->priv->thread);
|
||||
+ }
|
||||
+#endif
|
||||
if (backend->priv->thread == NULL) {
|
||||
egg_warning ("failed to create thread");
|
||||
return FALSE;
|
||||
diff --git a/src/pk-main.c b/src/pk-main.c
|
||||
index 4c758cd..8fa2482 100644
|
||||
--- a/src/pk-main.c
|
||||
+++ b/src/pk-main.c
|
||||
@@ -219,12 +219,12 @@ main (int argc, char *argv[])
|
||||
bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
|
||||
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
|
||||
textdomain (GETTEXT_PACKAGE);
|
||||
-
|
||||
+#if !GLIB_CHECK_VERSION(2,32,0)
|
||||
if (! g_thread_supported ())
|
||||
g_thread_init (NULL);
|
||||
dbus_g_thread_init ();
|
||||
g_type_init ();
|
||||
-
|
||||
+#endif
|
||||
/* TRANSLATORS: describing the service that is running */
|
||||
context = g_option_context_new (_("PackageKit service"));
|
||||
g_option_context_add_main_entries (context, options, NULL);
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
Index: PackageKit-0.6.0/configure.ac
|
||||
===================================================================
|
||||
--- PackageKit-0.6.0.orig/configure.ac 2010-01-04 16:32:18.000000000 +0000
|
||||
+++ PackageKit-0.6.0/configure.ac 2010-01-29 11:33:48.000000000 +0000
|
||||
@@ -90,7 +90,7 @@
|
||||
enable_strict=$default_strict)
|
||||
if test x$enable_strict != xno; then
|
||||
if test "$GCC" = "yes"; then
|
||||
- WARNINGFLAGS_CPP="$WARNINGFLAGS_CPP -Werror"
|
||||
+ :
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -1,422 +0,0 @@
|
||||
Index: PackageKit-0.6.0/backends/opkg/pk-backend-opkg.c
|
||||
===================================================================
|
||||
--- PackageKit-0.6.0.orig/backends/opkg/pk-backend-opkg.c 2010-01-29 09:39:33.000000000 +0000
|
||||
+++ PackageKit-0.6.0/backends/opkg/pk-backend-opkg.c 2010-01-29 11:30:51.000000000 +0000
|
||||
@@ -29,8 +29,7 @@
|
||||
|
||||
+#include <stdio.h>
|
||||
#include <libopkg/opkg.h>
|
||||
|
||||
-static opkg_t *opkg;
|
||||
-
|
||||
enum {
|
||||
SEARCH_NAME,
|
||||
SEARCH_DESCRIPTION,
|
||||
@@ -62,7 +60,7 @@
|
||||
* check an opkg package for known GUI dependancies
|
||||
*/
|
||||
static gboolean
|
||||
-opkg_is_gui_pkg (opkg_package_t *pkg)
|
||||
+opkg_is_gui_pkg (pkg_t *pkg)
|
||||
{
|
||||
|
||||
/* TODO: check appropriate tag */
|
||||
@@ -84,7 +82,7 @@
|
||||
* check an opkg package to determine if it is a development package
|
||||
*/
|
||||
static gboolean
|
||||
-opkg_is_devel_pkg (opkg_package_t *pkg)
|
||||
+opkg_is_devel_pkg (pkg_t *pkg)
|
||||
{
|
||||
if (g_strrstr (pkg->name, "-dev"))
|
||||
return TRUE;
|
||||
@@ -105,7 +103,7 @@
|
||||
* returns true if the tag is present
|
||||
*/
|
||||
static gboolean
|
||||
-opkg_check_tag (opkg_package_t *pkg, const gchar *tag)
|
||||
+opkg_check_tag (pkg_t *pkg, const gchar *tag)
|
||||
{
|
||||
if (pkg->tags && tag)
|
||||
return (g_strrstr (pkg->tags, tag) != NULL);
|
||||
@@ -118,7 +116,7 @@
|
||||
{
|
||||
switch (err)
|
||||
{
|
||||
- case OPKG_NO_ERROR:
|
||||
+/* case OPKG_NO_ERROR:
|
||||
break;
|
||||
case OPKG_PACKAGE_NOT_INSTALLED:
|
||||
pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, NULL);
|
||||
@@ -140,7 +138,7 @@
|
||||
break;
|
||||
case OPKG_PACKAGE_NOT_AVAILABLE:
|
||||
pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND, NULL);
|
||||
- break;
|
||||
+ break;*/
|
||||
default:
|
||||
opkg_unknown_error (backend, err, "Update package");
|
||||
}
|
||||
@@ -152,7 +150,7 @@
|
||||
static void
|
||||
backend_initialize (PkBackend *backend)
|
||||
{
|
||||
- opkg = opkg_new ();
|
||||
+ int opkg = opkg_new ();
|
||||
|
||||
if (!opkg) {
|
||||
pk_backend_error_code (backend,
|
||||
@@ -162,8 +160,8 @@
|
||||
}
|
||||
|
||||
#ifdef OPKG_OFFLINE_ROOT
|
||||
- opkg_set_option (opkg, (char *) "offline_root", OPKG_OFFLINE_ROOT);
|
||||
- opkg_re_read_config_files (opkg);
|
||||
+ opkg_set_option ((char *) "offline_root", OPKG_OFFLINE_ROOT);
|
||||
+ opkg_re_read_config_files ();
|
||||
#endif
|
||||
|
||||
}
|
||||
@@ -174,22 +172,22 @@
|
||||
static void
|
||||
backend_destroy (PkBackend *backend)
|
||||
{
|
||||
- opkg_free (opkg);
|
||||
+ opkg_free ();
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
-pk_opkg_progress_cb (opkg_t *_opkg, const opkg_progress_data_t *pdata, void *data)
|
||||
+pk_opkg_progress_cb (const opkg_progress_data_t *pdata, void *data)
|
||||
{
|
||||
- PkBackend *backend = PK_BACKEND (data);
|
||||
+ PkBackend *backend = (PkBackend*) data;
|
||||
if (!backend)
|
||||
return;
|
||||
|
||||
pk_backend_set_percentage (backend, pdata->percentage);
|
||||
- if (pdata->package)
|
||||
+ if (pdata->pkg)
|
||||
{
|
||||
gchar *uid;
|
||||
- opkg_package_t *pkg = pdata->package;
|
||||
+ pkg_t *pkg = pdata->pkg;
|
||||
gint status = PK_INFO_ENUM_UNKNOWN;
|
||||
|
||||
uid = g_strdup_printf ("%s;%s;%s;",
|
||||
@@ -225,12 +223,12 @@
|
||||
{
|
||||
int ret;
|
||||
|
||||
- ret = opkg_update_package_lists (opkg, pk_opkg_progress_cb, backend);
|
||||
+ ret = opkg_update_package_lists (pk_opkg_progress_cb, backend);
|
||||
|
||||
if (ret) {
|
||||
- if (ret == OPKG_DOWNLOAD_FAILED)
|
||||
- pk_backend_error_code (backend, PK_ERROR_ENUM_REPO_NOT_AVAILABLE, NULL);
|
||||
- else
|
||||
+// if (ret == OPKG_DOWNLOAD_FAILED)
|
||||
+// pk_backend_error_code (backend, PK_ERROR_ENUM_REPO_NOT_AVAILABLE, NULL);
|
||||
+// else
|
||||
opkg_unknown_error (backend, ret, "Refreshing cache");
|
||||
}
|
||||
pk_backend_finished (backend);
|
||||
@@ -256,7 +254,7 @@
|
||||
*/
|
||||
|
||||
static void
|
||||
-pk_opkg_package_list_cb (opkg_t *_opkg, opkg_package_t *pkg, void *data)
|
||||
+pk_opkg_package_list_cb (pkg_t *pkg, void *data)
|
||||
{
|
||||
SearchParams *params = (SearchParams*) data;
|
||||
gchar *uid;
|
||||
@@ -298,7 +296,7 @@
|
||||
uid = g_strdup_printf ("%s;%s;%s;",
|
||||
pkg->name, pkg->version, pkg->architecture);
|
||||
|
||||
- if (pkg->installed)
|
||||
+ if (pkg->state_status == SS_INSTALLED)
|
||||
status = PK_INFO_ENUM_INSTALLED;
|
||||
else
|
||||
status = PK_INFO_ENUM_AVAILABLE;
|
||||
@@ -318,10 +316,10 @@
|
||||
opkg_is_gui_pkg (pkg))
|
||||
goto end_handle;
|
||||
if (pk_bitfield_contain(filters, PK_FILTER_ENUM_INSTALLED) &&
|
||||
- (!pkg->installed))
|
||||
+ (pkg->state_status != SS_INSTALLED))
|
||||
goto end_handle;
|
||||
if (pk_bitfield_contain(filters, PK_FILTER_ENUM_NOT_INSTALLED) &&
|
||||
- (pkg->installed))
|
||||
+ (pkg->state_status == SS_INSTALLED))
|
||||
goto end_handle;
|
||||
|
||||
pk_backend_package (params->backend, status, uid, pkg->description);
|
||||
@@ -338,7 +336,7 @@
|
||||
|
||||
params = pk_backend_get_pointer (backend, "search-params");
|
||||
|
||||
- opkg_list_packages (opkg, pk_opkg_package_list_cb, params);
|
||||
+ opkg_list_packages (pk_opkg_package_list_cb, params);
|
||||
|
||||
pk_backend_finished (params->backend);
|
||||
|
||||
@@ -349,7 +347,7 @@
|
||||
}
|
||||
|
||||
static void
|
||||
-backend_search_name (PkBackend *backend, PkBitfield filters, const gchar *search)
|
||||
+backend_search_name (PkBackend *backend, PkBitfield filters, gchar **search)
|
||||
{
|
||||
SearchParams *params;
|
||||
|
||||
@@ -360,7 +358,7 @@
|
||||
params = g_new0 (SearchParams, 1);
|
||||
params->filters = filters;
|
||||
params->search_type = SEARCH_NAME;
|
||||
- params->needle = g_utf8_strdown (search, -1);
|
||||
+ params->needle = g_utf8_strdown (search[0], -1);
|
||||
params->backend = backend;
|
||||
|
||||
pk_backend_set_pointer (backend, "search-params", params);
|
||||
@@ -371,7 +369,7 @@
|
||||
* backend_search_description:
|
||||
*/
|
||||
static void
|
||||
-backend_search_description (PkBackend *backend, PkBitfield filters, const gchar *search)
|
||||
+backend_search_description (PkBackend *backend, PkBitfield filters, gchar **search)
|
||||
{
|
||||
SearchParams *params;
|
||||
|
||||
@@ -382,7 +380,7 @@
|
||||
params = g_new0 (SearchParams, 1);
|
||||
params->filters = filters;
|
||||
params->search_type = SEARCH_DESCRIPTION;
|
||||
- params->needle = g_utf8_strdown (search, -1);
|
||||
+ params->needle = g_utf8_strdown (search[0], -1);
|
||||
params->backend = backend;
|
||||
|
||||
pk_backend_set_pointer (backend, "search-params", params);
|
||||
@@ -390,7 +388,7 @@
|
||||
}
|
||||
|
||||
static void
|
||||
-backend_search_group (PkBackend *backend, PkBitfield filters, const gchar *search)
|
||||
+backend_search_group (PkBackend *backend, PkBitfield filters, gchar **search)
|
||||
{
|
||||
SearchParams *params;
|
||||
|
||||
@@ -401,7 +399,7 @@
|
||||
params = g_new0 (SearchParams, 1);
|
||||
params->filters = filters;
|
||||
params->search_type = SEARCH_TAG;
|
||||
- params->needle = g_strdup_printf ("group::%s", search);
|
||||
+ params->needle = g_strdup_printf ("group::%s", search[0]);
|
||||
params->backend = backend;
|
||||
|
||||
pk_backend_set_pointer (backend, "search-params", params);
|
||||
@@ -412,9 +410,9 @@
|
||||
static gboolean
|
||||
backend_install_packages_thread (PkBackend *backend)
|
||||
{
|
||||
- PkPackageId *pi;
|
||||
gint err, i;
|
||||
gchar **package_ids;
|
||||
+ gchar **parts;
|
||||
|
||||
package_ids = pk_backend_get_strv (backend, "pkids");
|
||||
|
||||
@@ -424,13 +422,13 @@
|
||||
{
|
||||
pk_backend_package (backend, PK_INFO_ENUM_INSTALLING, package_ids[i], NULL);
|
||||
|
||||
- pi = pk_package_id_new_from_string (package_ids[i]);
|
||||
+ parts = pk_package_id_split (package_ids[i]);
|
||||
|
||||
- err = opkg_install_package (opkg, pi->name, pk_opkg_progress_cb, backend);
|
||||
+ err = opkg_install_package (parts[PK_PACKAGE_ID_NAME], pk_opkg_progress_cb, backend);
|
||||
if (err)
|
||||
handle_install_error (backend, err);
|
||||
|
||||
- pk_package_id_free (pi);
|
||||
+ g_strfreev (parts);
|
||||
if (err != 0)
|
||||
break;
|
||||
}
|
||||
@@ -453,9 +451,9 @@
|
||||
static gboolean
|
||||
backend_remove_packages_thread (PkBackend *backend)
|
||||
{
|
||||
- PkPackageId *pi;
|
||||
gint err, i;
|
||||
gchar **package_ids;
|
||||
+ gchar **parts;
|
||||
gboolean allow_deps;
|
||||
gboolean autoremove;
|
||||
gpointer *data;
|
||||
@@ -467,29 +465,30 @@
|
||||
autoremove = GPOINTER_TO_INT (data[2]);
|
||||
g_free (data);
|
||||
|
||||
- opkg_set_option (opkg, (char *)"autoremove", &autoremove);
|
||||
- opkg_set_option (opkg, (char *)"force_removal_of_dependent_packages", &allow_deps);
|
||||
+ opkg_set_option ((char *)"autoremove", &autoremove);
|
||||
+ opkg_set_option ((char *)"force_removal_of_dependent_packages", &allow_deps);
|
||||
|
||||
err = 0;
|
||||
|
||||
for (i = 0; package_ids[i]; i++)
|
||||
{
|
||||
- pi = pk_package_id_new_from_string (package_ids[i]);
|
||||
pk_backend_package (backend, PK_INFO_ENUM_REMOVING, package_ids[i], NULL);
|
||||
|
||||
- err = opkg_remove_package (opkg, pi->name, pk_opkg_progress_cb, backend);
|
||||
+ parts = pk_package_id_split (package_ids[i]);
|
||||
+
|
||||
+ err = opkg_remove_package (parts[PK_PACKAGE_ID_NAME], pk_opkg_progress_cb, backend);
|
||||
|
||||
switch (err)
|
||||
{
|
||||
- case OPKG_NO_ERROR:
|
||||
- break;
|
||||
- case OPKG_PACKAGE_NOT_INSTALLED:
|
||||
- pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, NULL);
|
||||
- break;
|
||||
+ //case OPKG_NO_ERROR:
|
||||
+ // break;
|
||||
+ //case OPKG_PACKAGE_NOT_INSTALLED:
|
||||
+ // pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, NULL);
|
||||
+ // break;
|
||||
default:
|
||||
opkg_unknown_error (backend, err, "Remove");
|
||||
}
|
||||
- pk_package_id_free (pi);
|
||||
+ g_strfreev (parts);
|
||||
|
||||
if (err != 0)
|
||||
break;
|
||||
@@ -540,7 +539,7 @@
|
||||
gint err;
|
||||
|
||||
/* FIXME: support only_trusted */
|
||||
- err = opkg_upgrade_all (opkg, pk_opkg_progress_cb, backend);
|
||||
+ err = opkg_upgrade_all (pk_opkg_progress_cb, backend);
|
||||
|
||||
if (err)
|
||||
opkg_unknown_error (backend, err, "Upgrading system");
|
||||
@@ -564,29 +563,28 @@
|
||||
static gboolean
|
||||
backend_update_package_thread (PkBackend *backend)
|
||||
{
|
||||
- PkPackageId *pi;
|
||||
+ gchar **parts;
|
||||
gint err = 0;
|
||||
const gchar *package_id;
|
||||
|
||||
/* FIXME: support only_trusted */
|
||||
package_id = pk_backend_get_string (backend, "pkgid");
|
||||
- pi = pk_package_id_new_from_string (package_id);
|
||||
+ parts = pk_package_id_split (package_id);
|
||||
|
||||
- if (!pi->name || !pi->version)
|
||||
+ if (!parts)
|
||||
{
|
||||
pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND,
|
||||
"Package not found");
|
||||
- pk_package_id_free (pi);
|
||||
pk_backend_finished (backend);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
- err = opkg_upgrade_package (opkg, pi->name, pk_opkg_progress_cb, backend);
|
||||
+ err = opkg_upgrade_package (parts[PK_PACKAGE_ID_NAME], pk_opkg_progress_cb, backend);
|
||||
if (err)
|
||||
handle_install_error (backend, err);
|
||||
|
||||
|
||||
- pk_package_id_free (pi);
|
||||
+ g_strfreev (parts);
|
||||
pk_backend_finished (backend);
|
||||
return (err != 0);
|
||||
}
|
||||
@@ -610,13 +608,13 @@
|
||||
*/
|
||||
|
||||
static void
|
||||
-pk_opkg_list_upgradable_cb (opkg_t *_opkg, opkg_package_t *pkg, void *data)
|
||||
+pk_opkg_list_upgradable_cb (pkg_t *pkg, void *data)
|
||||
{
|
||||
- PkBackend *backend = PK_BACKEND (data);
|
||||
+ PkBackend *backend = (PkBackend*) data;
|
||||
gchar *uid;
|
||||
gint status;
|
||||
|
||||
- if (pkg->installed)
|
||||
+ if (pkg->state_status == SS_INSTALLED)
|
||||
status = PK_INFO_ENUM_INSTALLED;
|
||||
else
|
||||
status = PK_INFO_ENUM_AVAILABLE;
|
||||
@@ -631,7 +629,7 @@
|
||||
static gboolean
|
||||
backend_get_updates_thread (PkBackend *backend)
|
||||
{
|
||||
- opkg_list_upgradable_packages (opkg, pk_opkg_list_upgradable_cb, backend);
|
||||
+ opkg_list_upgradable_packages (pk_opkg_list_upgradable_cb, backend);
|
||||
pk_backend_finished (backend);
|
||||
return TRUE;
|
||||
}
|
||||
@@ -668,16 +666,18 @@
|
||||
static gboolean
|
||||
backend_get_details_thread (PkBackend *backend)
|
||||
{
|
||||
- PkPackageId *pi;
|
||||
gchar **package_ids;
|
||||
+ gchar **parts;
|
||||
int group_index;
|
||||
PkGroupEnum group = 0;
|
||||
- opkg_package_t *pkg;
|
||||
+ pkg_t *pkg;
|
||||
gchar *newid;
|
||||
|
||||
package_ids = pk_backend_get_strv(backend, "package_ids");
|
||||
- pi = pk_package_id_new_from_string (package_ids[0]);
|
||||
- if (pi == NULL)
|
||||
+ parts = pk_package_id_split (package_ids[0]);
|
||||
+
|
||||
+
|
||||
+ if (!parts)
|
||||
{
|
||||
pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_ID_INVALID, "invalid package id");
|
||||
pk_backend_finished (backend);
|
||||
@@ -685,8 +685,8 @@
|
||||
}
|
||||
|
||||
|
||||
- pkg = opkg_find_package (opkg, pi->name, pi->version, pi->arch, pi->data);
|
||||
- pk_package_id_free (pi);
|
||||
+ pkg = opkg_find_package (parts[PK_PACKAGE_ID_NAME], parts[PK_PACKAGE_ID_VERSION], parts[PK_PACKAGE_ID_ARCH], parts[PK_PACKAGE_ID_DATA]);
|
||||
+ g_strfreev (parts);
|
||||
|
||||
if (!pkg)
|
||||
{
|
||||
@@ -695,7 +695,7 @@
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
- newid = g_strdup_printf ("%s;%s;%s;%s", pkg->name, pkg->version, pkg->architecture, pkg->repository);
|
||||
+ newid = g_strdup_printf ("%s;%s;%s;%s", pkg->name, pkg->version, pkg->architecture, pkg->src->name);
|
||||
|
||||
if (pkg->tags) {
|
||||
for (group_index = 0; group < PK_GROUP_ENUM_LAST; group_index++) {
|
||||
@@ -706,9 +706,8 @@
|
||||
}
|
||||
}
|
||||
|
||||
- pk_backend_details (backend, newid, NULL, group, pkg->description, pkg->url, pkg->size);
|
||||
+ pk_backend_details (backend, newid, NULL, group, pkg->description, NULL, pkg->size);
|
||||
g_free (newid);
|
||||
- opkg_package_free(pkg);
|
||||
pk_backend_finished (backend);
|
||||
return TRUE;
|
||||
}
|
||||
@@ -1,65 +0,0 @@
|
||||
SUMMARY = "PackageKit package management abstraction"
|
||||
SECTION = "libs"
|
||||
LICENSE = "GPL-2.0+"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
|
||||
DEPENDS = "gtk+ python polkit dbus dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native"
|
||||
RDEPENDS_${PN} = "opkg bash"
|
||||
|
||||
inherit gnome pythonnative
|
||||
|
||||
SRC_URI = "http://www.freedesktop.org/software/PackageKit/releases/PackageKit-${PV}.tar.bz2;name=archive \
|
||||
file://configurefix.patch \
|
||||
file://opkgfixes.patch \
|
||||
file://0001-Don-t-call-deprecated-glib-functions-and-use-the-new.patch \
|
||||
"
|
||||
|
||||
SRC_URI[archive.md5sum] = "33a3127e9ed41e26671786aee9fe56ff"
|
||||
SRC_URI[archive.sha256sum] = "8dae41493dfb011442746d252b3435bf3204e17bf7c47e396f90fbd215260e14"
|
||||
|
||||
S = "${WORKDIR}/PackageKit-${PV}"
|
||||
|
||||
PACKAGECONFIG ??= ""
|
||||
PACKAGECONFIG[service-packs] = "--enable-service-packs,--disable-service-packs,libarchive"
|
||||
|
||||
EXTRA_OECONF = "--with-security-framework=dummy \
|
||||
--with-default-backend=opkg \
|
||||
--enable-opkg \
|
||||
--disable-tests \
|
||||
--disable-ruck \
|
||||
--disable-qt \
|
||||
--disable-gstreamer-plugin \
|
||||
--disable-local \
|
||||
--disable-networkmanager \
|
||||
--disable-device-rebind \
|
||||
ac_cv_path_XMLTO=no \
|
||||
"
|
||||
|
||||
#do_configure_prepend() {
|
||||
# mkdir -p m4
|
||||
# echo "EXTRA_DIST=" > gtk-doc.make
|
||||
#}
|
||||
|
||||
do_configure_append() {
|
||||
for i in $(find . -name Makefile) ; do
|
||||
sed -i -e s:${STAGING_DIR_NATIVE}::g \
|
||||
-e s:/usr/bin/intltool-merge:${STAGING_BINDIR_NATIVE}/intltool-merge:g \
|
||||
$i
|
||||
done
|
||||
}
|
||||
|
||||
PACKAGES =+ "${PN}-website"
|
||||
FILES_${PN}-website = "${datadir}/PackageKit/website"
|
||||
|
||||
PACKAGES =+ "${PN}-python"
|
||||
FILES_${PN}-python = "${libdir}/python*"
|
||||
|
||||
PACKAGES =+ "${PN}-gtkmodule"
|
||||
FILES_${PN}-gtkmodule = "${libdir}/gtk-2.0/*/*.so"
|
||||
|
||||
FILES_${PN} += "${libdir}/packagekit-backend/*.so ${libdir}/pm-utils ${datadir}/dbus-1/system-services/ ${datadir}/PolicyKit ${datadir}/PackageKit"
|
||||
FILES_${PN}-dbg += "${libdir}/packagekit-backend/.debug/*.so ${libdir}/gtk-2.0/*/.debug"
|
||||
FILES_${PN}-dev += "${libdir}/packagekit-backend/*.la ${libdir}/gtk-2.0/*/*.la"
|
||||
FILES_${PN}-staticdev += "${libdir}/packagekit-backend/*.a ${libdir}/gtk-2.0/*/*.a"
|
||||
|
||||
# PackageKit-0.5.6/backends/opkg/pk-backend-opkg.c:31:26: fatal error: libopkg/opkg.h: No such file or directory
|
||||
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"
|
||||
@@ -1,16 +0,0 @@
|
||||
DESCRIPTION = "Vala DBus Binding Tool"
|
||||
SECTION = "devel"
|
||||
DEPENDS = "vala libgee libxml2"
|
||||
HOMEPAGE = "http://wiki.freesmartphone.org/index.php/Implementations/vala-dbus-binding-tool"
|
||||
LICENSE = "GPLv3"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||
PE = "1"
|
||||
INC_PR = "r3"
|
||||
|
||||
export XDG_DATA_DIRS = "${STAGING_DATADIR}"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/freesmartphone/sources/${BP}.tar.bz2"
|
||||
|
||||
inherit autotools perlnative pkgconfig
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
-34
@@ -1,34 +0,0 @@
|
||||
From 8abed2e5bf8e7815b11df6d22042d5f0ac8efcb0 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Tue, 5 May 2015 13:43:35 +0200
|
||||
Subject: [PATCH] configure.ac: don't use dash in m4 macro names
|
||||
|
||||
* otherwise it doesn't get expanded and vala-dbus-binding-tool ends with version 'vala-dbus-binding-tool_version'
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
configure.ac | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 48f007c..18d0bde 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1,9 +1,9 @@
|
||||
-m4_define([vala-dbus-binding-tool_released], [0])
|
||||
-m4_define([vala-dbus-binding-tool_base_version], [1.0])
|
||||
-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'])]))
|
||||
-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]))
|
||||
+m4_define([vala_dbus_binding_tool_released], [0])
|
||||
+m4_define([vala_dbus_binding_tool_base_version], [1.0])
|
||||
+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'])]))
|
||||
+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]))
|
||||
|
||||
-AC_INIT([vala-dbus-binding-tool], [vala-dbus-binding-tool_version], [fso@openphoenux.org], [vala-dbus-binding-tool])
|
||||
+AC_INIT([vala-dbus-binding-tool], [vala_dbus_binding_tool_version], [fso@openphoenux.org], [vala-dbus-binding-tool])
|
||||
AC_CONFIG_SRCDIR([src/Makefile.am])
|
||||
AC_CONFIG_HEADERS(config.h)
|
||||
AM_INIT_AUTOMAKE([dist-bzip2])
|
||||
--
|
||||
2.3.5
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
require vala-dbus-binding-tool.inc
|
||||
|
||||
SRC_URI[md5sum] = "59eab7abf38f35355d3786803bd2441f"
|
||||
SRC_URI[sha256sum] = "1e37ab2e6238eaef9f573560ea7379e6955570f7c9503083e50c4c185c1956df"
|
||||
|
||||
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"
|
||||
@@ -1,20 +0,0 @@
|
||||
require vala-dbus-binding-tool.inc
|
||||
|
||||
# Temporary remove negative preference, because there are 2 versions of 0.4.0 archives:
|
||||
# the original one depending on libgee1.0 from
|
||||
# http://downloads.freesmartphone.org/sources/${BPN}/${BP}.tar.bz2
|
||||
# and new one depending on libgee0.8 from
|
||||
# http://sourceforge.net/projects/freesmartphone/files/sources/
|
||||
# The original one can be already deployed on various premirrors,
|
||||
# so prefer the git recipe which doesn't suffer from this issue
|
||||
# DEFAULT_PREFERENCE = "-1"
|
||||
|
||||
SRCREV = "742c04c2bb0743891904522ce47e50f9e5c99b12"
|
||||
PV = "0.4.0+gitr${SRCPV}"
|
||||
|
||||
SRC_URI = "git://github.com/freesmartphone/vala-dbus-binding-tool.git;protocol=https \
|
||||
file://0001-configure.ac-don-t-use-dash-in-m4-macro-names.patch \
|
||||
"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
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"
|
||||
Reference in New Issue
Block a user