* [meta-oe][PATCH 0/8] Merge some recipes from oe-classic and smaller fixes
@ 2012-08-01 22:20 Martin Jansa
2012-08-01 22:20 ` [meta-oe][PATCH 1/8] fbreader: drop machine overrides Martin Jansa
` (8 more replies)
0 siblings, 9 replies; 22+ messages in thread
From: Martin Jansa @ 2012-08-01 22:20 UTC (permalink / raw)
To: openembedded-devel
The following changes since commit 5a5198ff6eccb097b785c22a256a072a41c7f2cd:
gedit: unbreak build by adding pythonnative to inherit (2012-07-31 13:22:31 +0200)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull
Martin Jansa (8):
fbreader: drop machine overrides
emacs: rename TUTORIAL.ko to TUTORIAL.KO so it's not picked by
package.bbclass for striping
emacs: copy only needed stuff to qemu-treedir, not whole sysroot
phonet-utils: simplify with inherit autotools
sip: import from oe-classic and upgrade to latest
python-sip: import from oe-classic and upgrade to latest
python-pyqt: import from oe-classic
anki: import from oe-classic and upgrade to latest
.../phonet-utils/phonet-utils_git.bb | 10 +-
.../python-pyqt-4.8.4/assistantclient-fix.patch | 13 +
.../python/python-pyqt-4.8.4/fix_qthelp_ftbfs.diff | 15 ++
.../python-pyqt-4.8.4/fix_the_QAssitant_ftbfs.diff | 29 +++
.../python/python-pyqt-4.8.4/pyqt-generated.patch | 24 ++
.../python-pyqt-4.8.4/qreal_float_support.diff | 248 ++++++++++++++++++++
.../recipes-devtools/python/python-pyqt_4.8.4.bb | 115 +++++++++
meta-oe/recipes-devtools/python/python-sip.inc | 42 ++++
.../recipes-devtools/python/python-sip_4.13.3.bb | 1 +
.../no-need-for-pyqt-at-buildtime.patch | 23 ++
meta-oe/recipes-extended/anki/anki.inc | 16 ++
meta-oe/recipes-extended/anki/anki_1.2.11.bb | 4 +
.../no-need-for-pyqt-at-buildtime.patch | 14 ++
meta-oe/recipes-extended/anki/libanki_1.2.11.bb | 6 +
meta-oe/recipes-extended/sip/sip-native_4.13.3.bb | 33 +++
meta-oe/recipes-support/emacs/emacs.inc | 80 ++++++-
meta-oe/recipes-support/emacs/emacs_23.4.bb | 2 +
.../recipes-support/fbreader/fbreader_0.12.10.bb | 5 -
meta-oe/recipes-support/fbreader/fbreader_git.bb | 4 -
19 files changed, 657 insertions(+), 27 deletions(-)
create mode 100644 meta-oe/recipes-devtools/python/python-pyqt-4.8.4/assistantclient-fix.patch
create mode 100644 meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_qthelp_ftbfs.diff
create mode 100644 meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_the_QAssitant_ftbfs.diff
create mode 100644 meta-oe/recipes-devtools/python/python-pyqt-4.8.4/pyqt-generated.patch
create mode 100644 meta-oe/recipes-devtools/python/python-pyqt-4.8.4/qreal_float_support.diff
create mode 100644 meta-oe/recipes-devtools/python/python-pyqt_4.8.4.bb
create mode 100644 meta-oe/recipes-devtools/python/python-sip.inc
create mode 100644 meta-oe/recipes-devtools/python/python-sip_4.13.3.bb
create mode 100644 meta-oe/recipes-extended/anki/anki-1.2.11/no-need-for-pyqt-at-buildtime.patch
create mode 100644 meta-oe/recipes-extended/anki/anki.inc
create mode 100644 meta-oe/recipes-extended/anki/anki_1.2.11.bb
create mode 100644 meta-oe/recipes-extended/anki/libanki-1.2.11/no-need-for-pyqt-at-buildtime.patch
create mode 100644 meta-oe/recipes-extended/anki/libanki_1.2.11.bb
create mode 100644 meta-oe/recipes-extended/sip/sip-native_4.13.3.bb
--
1.7.8.6
^ permalink raw reply [flat|nested] 22+ messages in thread
* [meta-oe][PATCH 1/8] fbreader: drop machine overrides
2012-08-01 22:20 [meta-oe][PATCH 0/8] Merge some recipes from oe-classic and smaller fixes Martin Jansa
@ 2012-08-01 22:20 ` Martin Jansa
2012-08-01 22:20 ` [meta-oe][PATCH 2/8] emacs: rename TUTORIAL.ko to TUTORIAL.KO so it's not picked by package.bbclass for striping Martin Jansa
` (7 subsequent siblings)
8 siblings, 0 replies; 22+ messages in thread
From: Martin Jansa @ 2012-08-01 22:20 UTC (permalink / raw)
To: openembedded-devel
* sorry forgot to move them to .bbappend before merging to meta-oe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../recipes-support/fbreader/fbreader_0.12.10.bb | 5 -----
meta-oe/recipes-support/fbreader/fbreader_git.bb | 4 ----
2 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/meta-oe/recipes-support/fbreader/fbreader_0.12.10.bb b/meta-oe/recipes-support/fbreader/fbreader_0.12.10.bb
index 40fc631..4786846 100644
--- a/meta-oe/recipes-support/fbreader/fbreader_0.12.10.bb
+++ b/meta-oe/recipes-support/fbreader/fbreader_0.12.10.bb
@@ -15,11 +15,6 @@ READER_ARCH ?= "desktop"
READER_UI ?= "gtk"
READER_STATUS ?= "release"
-# because of defaults overriden in machine config
-PACKAGE_ARCH_om-gta01 = "${MACHINE_ARCH}"
-PACKAGE_ARCH_om-gta02 = "${MACHINE_ARCH}"
-PACKAGE_ARCH_om-gta04 = "${MACHINE_ARCH}"
-
FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary ${libdir}/zlibrary"
FILES_${PN}-dbg += "${libdir}/zlibrary/ui/.debug/"
diff --git a/meta-oe/recipes-support/fbreader/fbreader_git.bb b/meta-oe/recipes-support/fbreader/fbreader_git.bb
index 8baec79..937bdc8 100644
--- a/meta-oe/recipes-support/fbreader/fbreader_git.bb
+++ b/meta-oe/recipes-support/fbreader/fbreader_git.bb
@@ -19,10 +19,6 @@ READER_ARCH ?= "desktop"
READER_UI ?= "gtk"
READER_STATUS ?= "release"
-# because of defaults overriden in machine config
-PACKAGE_ARCH_om-gta01 = "${MACHINE_ARCH}"
-PACKAGE_ARCH_om-gta02 = "${MACHINE_ARCH}"
-
FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary ${libdir}/zlibrary"
FILES_${PN}-dbg += "${libdir}/zlibrary/ui/.debug/"
--
1.7.8.6
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-oe][PATCH 2/8] emacs: rename TUTORIAL.ko to TUTORIAL.KO so it's not picked by package.bbclass for striping
2012-08-01 22:20 [meta-oe][PATCH 0/8] Merge some recipes from oe-classic and smaller fixes Martin Jansa
2012-08-01 22:20 ` [meta-oe][PATCH 1/8] fbreader: drop machine overrides Martin Jansa
@ 2012-08-01 22:20 ` Martin Jansa
2012-08-01 22:21 ` [meta-oe][PATCH 3/8] emacs: copy only needed stuff to qemu-treedir, not whole sysroot Martin Jansa
` (6 subsequent siblings)
8 siblings, 0 replies; 22+ messages in thread
From: Martin Jansa @ 2012-08-01 22:20 UTC (permalink / raw)
To: openembedded-devel
* with http://patchwork.openembedded.org/patch/33365/ it's not fatal but still anoying
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-support/emacs/emacs.inc | 6 ++++++
meta-oe/recipes-support/emacs/emacs_23.4.bb | 2 ++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/meta-oe/recipes-support/emacs/emacs.inc b/meta-oe/recipes-support/emacs/emacs.inc
index f6cd461..150658e 100644
--- a/meta-oe/recipes-support/emacs/emacs.inc
+++ b/meta-oe/recipes-support/emacs/emacs.inc
@@ -65,4 +65,10 @@ do_compile_prepend() {
fi
}
+do_install_append() {
+ # freaks package.bbclass and whole bitbake call returns error code
+ # ERROR: runstrip: ''arm-oe-linux-gnueabi-strip' '/var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/emacs-23.4-r0/package/usr/share/emacs/23.4/etc/tutorials/TUTORIAL.ko'' strip command failed
+ mv ${D}${datadir}/${BPN}/${PV}/etc/tutorials/TUTORIAL.ko ${D}${datadir}/${BPN}/${PV}/etc/tutorials/TUTORIAL.KO
+}
+
EXTRA_OEMAKE += 'QEMU="${QEMU}"'
diff --git a/meta-oe/recipes-support/emacs/emacs_23.4.bb b/meta-oe/recipes-support/emacs/emacs_23.4.bb
index 625a4b9..65cc3a3 100644
--- a/meta-oe/recipes-support/emacs/emacs_23.4.bb
+++ b/meta-oe/recipes-support/emacs/emacs_23.4.bb
@@ -1,5 +1,7 @@
require emacs.inc
+PR = "r1"
+
SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \
file://use-qemu.patch \
file://nostdlib-unwind.patch \
--
1.7.8.6
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-oe][PATCH 3/8] emacs: copy only needed stuff to qemu-treedir, not whole sysroot
2012-08-01 22:20 [meta-oe][PATCH 0/8] Merge some recipes from oe-classic and smaller fixes Martin Jansa
2012-08-01 22:20 ` [meta-oe][PATCH 1/8] fbreader: drop machine overrides Martin Jansa
2012-08-01 22:20 ` [meta-oe][PATCH 2/8] emacs: rename TUTORIAL.ko to TUTORIAL.KO so it's not picked by package.bbclass for striping Martin Jansa
@ 2012-08-01 22:21 ` Martin Jansa
2012-08-01 22:21 ` [meta-oe][PATCH 4/8] phonet-utils: simplify with inherit autotools Martin Jansa
` (5 subsequent siblings)
8 siblings, 0 replies; 22+ messages in thread
From: Martin Jansa @ 2012-08-01 22:21 UTC (permalink / raw)
To: openembedded-devel
* my typical sysroot is huge (5.5G) and only 86M is really needed
we can also copy copy whole
${STAGING_DIR_TARGET}/${libdir}/lib*.so.*
${STAGING_DIR_TARGET}/${base_libdir}/l*
but that is still quite big (3.2G)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-support/emacs/emacs.inc | 74 ++++++++++++++++++++++++++----
1 files changed, 64 insertions(+), 10 deletions(-)
diff --git a/meta-oe/recipes-support/emacs/emacs.inc b/meta-oe/recipes-support/emacs/emacs.inc
index 150658e..61761e8 100644
--- a/meta-oe/recipes-support/emacs/emacs.inc
+++ b/meta-oe/recipes-support/emacs/emacs.inc
@@ -50,18 +50,72 @@ do_compile_prepend() {
if [ -e $treedir ];then
rm -rf $treedir
fi
- mkdir $treedir
- cp -pPR ${STAGING_DIR_TARGET}/* $treedir
- if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/libgcc_s.so ]; then
- cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib
- fi
- if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/libgcc_s.so.* ]; then
- cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib
- fi
+
+ # copy only as much stuff as we need
+ # before: 5.5G ../../qemu-treedir/
+ # after: 86M ../../qemu-treedir/
+ mkdir -p $treedir/${base_libdir}
+ cp -pPR \
+ ${STAGING_DIR_TARGET}/${base_libdir}/ld-* \
+ ${STAGING_DIR_TARGET}/${base_libdir}/libc.* \
+ ${STAGING_DIR_TARGET}/${base_libdir}/libc-* \
+ ${STAGING_DIR_TARGET}/${base_libdir}/libm-* \
+ ${STAGING_DIR_TARGET}/${base_libdir}/libm.* \
+ ${STAGING_DIR_TARGET}/${base_libdir}/libtinfo.so.* \
+ ${STAGING_DIR_TARGET}/${base_libdir}/libresolv* \
+ ${STAGING_DIR_TARGET}/${base_libdir}/libdl* \
+ ${STAGING_DIR_TARGET}/${base_libdir}/librt* \
+ ${STAGING_DIR_TARGET}/${base_libdir}/libresolv* \
+ ${STAGING_DIR_TARGET}/${base_libdir}/libgcc_s.so.* \
+ ${STAGING_DIR_TARGET}/${base_libdir}/libuuid.so.* \
+ ${STAGING_DIR_TARGET}/${base_libdir}/libpthread* $treedir/${base_libdir}/
+
+ cp -pPR \
+ ${STAGING_DIR_TARGET}/${libdir}/libICE.so.* \
+ ${STAGING_DIR_TARGET}/${libdir}/libSM.so.* \
+ ${STAGING_DIR_TARGET}/${libdir}/libatk-1.0.so.* \
+ ${STAGING_DIR_TARGET}/${libdir}/libcairo.so.* \
+ ${STAGING_DIR_TARGET}/${libdir}/libdbus-1.so.* \
+ ${STAGING_DIR_TARGET}/${libdir}/libdbus-glib-1.so.* \
+ ${STAGING_DIR_TARGET}/${libdir}/libexpat.so.* \
+ ${STAGING_DIR_TARGET}/${libdir}/libffi.so.* \
+ ${STAGING_DIR_TARGET}/${libdir}/libfontconfig.so.* \
+ ${STAGING_DIR_TARGET}/${libdir}/libfreetype.so.* \
+ ${STAGING_DIR_TARGET}/${libdir}/libgconf-2.so.* \
+ ${STAGING_DIR_TARGET}/${libdir}/libgif.so.* \
+ ${STAGING_DIR_TARGET}/${libdir}/libjpeg.so.* \
+ ${STAGING_DIR_TARGET}/${libdir}/liblzma.so.* \
+ ${STAGING_DIR_TARGET}/${libdir}/libpixman-1.so.* \
+ ${STAGING_DIR_TARGET}/${libdir}/libpng12.so.* \
+ ${STAGING_DIR_TARGET}/${libdir}/librsvg-2.so.* \
+ ${STAGING_DIR_TARGET}/${libdir}/libstdc++.so.* \
+ ${STAGING_DIR_TARGET}/${libdir}/libtiff.so.* \
+ ${STAGING_DIR_TARGET}/${libdir}/libxml2.so.* \
+ ${STAGING_DIR_TARGET}/${libdir}/libz.so.* $treedir/${base_libdir}/
+
+ # X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xft Xpm Xrandr Xrender
+ cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libX*.so.* $treedir/${base_libdir}/
+
+ # gdk-x11 gdk_pixbuf gio glib gmodule gobject gthread gtk-x11
+ cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libg*-2.0.so.* $treedir/${base_libdir}/
+
+ # pango pangocairo pangoft2
+ cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libpango*-1.0.so.* $treedir/${base_libdir}/
+
+ # xcb-render xcb-shm xcb
+ cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libxcb*.so.* $treedir/${base_libdir}/
+
+ #cp -pPR ${STAGING_DIR_TARGET}/* $treedir
+ if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so ]; then
+ cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so $treedir/lib
+ fi
+ if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* ]; then
+ cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* $treedir/lib
+ fi
# stupid hack, but without it, it tries to use /usr/lib/libc.so from host and fails
# temacs: error while loading shared libraries: /usr/lib/libc.so: ELF file version does not match current one
- if [ ! -f $treedir/lib/libc.so ]; then
- ln -s libc.so.6 $treedir/lib/libc.so
+ if [ ! -f $treedir/${base_libdir}/libc.so ]; then
+ ln -s libc.so.6 $treedir/${base_libdir}/libc.so
fi
}
--
1.7.8.6
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-oe][PATCH 4/8] phonet-utils: simplify with inherit autotools
2012-08-01 22:20 [meta-oe][PATCH 0/8] Merge some recipes from oe-classic and smaller fixes Martin Jansa
` (2 preceding siblings ...)
2012-08-01 22:21 ` [meta-oe][PATCH 3/8] emacs: copy only needed stuff to qemu-treedir, not whole sysroot Martin Jansa
@ 2012-08-01 22:21 ` Martin Jansa
2012-08-01 22:21 ` [meta-oe][PATCH 5/8] sip: import from oe-classic and upgrade to latest Martin Jansa
` (4 subsequent siblings)
8 siblings, 0 replies; 22+ messages in thread
From: Martin Jansa @ 2012-08-01 22:21 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../phonet-utils/phonet-utils_git.bb | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/meta-oe/recipes-connectivity/phonet-utils/phonet-utils_git.bb b/meta-oe/recipes-connectivity/phonet-utils/phonet-utils_git.bb
index 9a3310e..f5bd1cf 100644
--- a/meta-oe/recipes-connectivity/phonet-utils/phonet-utils_git.bb
+++ b/meta-oe/recipes-connectivity/phonet-utils/phonet-utils_git.bb
@@ -3,17 +3,11 @@ HOMEPAGE = ""
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
SRC_URI = "git://gitorious.org/meego-cellular/phonet-utils.git;branch=master;protocol=git"
-PR = "r1"
+PR = "r2"
S = "${WORKDIR}/git"
SRCREV = "4acfa720fd37d178a048fc2be17180137d4a70ea"
PV = "0.0.0+gitr${SRCPV}"
-do_compile () {
- make
-}
-
-do_install () {
- DESTDIR=${D} oe_runmake install
-}
+inherit autotools
FILES_${PN} += "${base_libdir}/udev/rules.d/85-phonet-utils.rules"
--
1.7.8.6
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-oe][PATCH 5/8] sip: import from oe-classic and upgrade to latest
2012-08-01 22:20 [meta-oe][PATCH 0/8] Merge some recipes from oe-classic and smaller fixes Martin Jansa
` (3 preceding siblings ...)
2012-08-01 22:21 ` [meta-oe][PATCH 4/8] phonet-utils: simplify with inherit autotools Martin Jansa
@ 2012-08-01 22:21 ` Martin Jansa
2012-08-01 22:21 ` [meta-oe][PATCH 6/8] python-sip: " Martin Jansa
` (3 subsequent siblings)
8 siblings, 0 replies; 22+ messages in thread
From: Martin Jansa @ 2012-08-01 22:21 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-extended/sip/sip-native_4.13.3.bb | 33 +++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
create mode 100644 meta-oe/recipes-extended/sip/sip-native_4.13.3.bb
diff --git a/meta-oe/recipes-extended/sip/sip-native_4.13.3.bb b/meta-oe/recipes-extended/sip/sip-native_4.13.3.bb
new file mode 100644
index 0000000..2ef10bf
--- /dev/null
+++ b/meta-oe/recipes-extended/sip/sip-native_4.13.3.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "SIP is a C++/Python Wrapper Generator"
+AUTHOR = "Phil Thompson"
+HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
+SECTION = "devel"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://sipgen.sbf;endline=15;md5=88e887a386c18a01240d8d055da4e441"
+
+SRC_URI = "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/sip-${PV}.tar.gz"
+SRC_URI[md5sum] = "76192829cc42ec558db46e4f9e1d8ba9"
+SRC_URI[sha256sum] = "ec295f71ef339c5b98db5650865f2c6c1200c4085b7a3f33f284111e1f534ac1"
+S = "${WORKDIR}/sip-${PV}/sipgen"
+
+inherit qt4x11 native python-dir
+
+EXTRA_QMAKEVARS_POST += "DESTDIR=${S} CONFIG=console"
+
+export BUILD_SYS
+export HOST_SYS
+export STAGING_LIBDIR
+export STAGING_INCDIR
+
+do_configure_prepend() {
+ cat sipgen.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > sipgen.pro
+}
+do_install() {
+ install -d ${D}${bindir}
+ install -m 0755 sip ${D}${bindir}/sip
+ # python-pyqt expects sip4
+ ln -sf sip ${D}${bindir}/sip4
+ cd ${WORKDIR}/sip-${PV} && python configure.py
+ install -d ${D}${PYTHON_SITEPACKAGES_DIR}
+ install -m 0755 sip*.py ${D}${PYTHON_SITEPACKAGES_DIR}
+}
--
1.7.8.6
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-oe][PATCH 6/8] python-sip: import from oe-classic and upgrade to latest
2012-08-01 22:20 [meta-oe][PATCH 0/8] Merge some recipes from oe-classic and smaller fixes Martin Jansa
` (4 preceding siblings ...)
2012-08-01 22:21 ` [meta-oe][PATCH 5/8] sip: import from oe-classic and upgrade to latest Martin Jansa
@ 2012-08-01 22:21 ` Martin Jansa
2012-08-01 22:21 ` [meta-oe][PATCH 7/8] python-pyqt: import from oe-classic Martin Jansa
` (2 subsequent siblings)
8 siblings, 0 replies; 22+ messages in thread
From: Martin Jansa @ 2012-08-01 22:21 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-devtools/python/python-sip.inc | 42 ++++++++++++++++++++
.../recipes-devtools/python/python-sip_4.13.3.bb | 1 +
2 files changed, 43 insertions(+), 0 deletions(-)
create mode 100644 meta-oe/recipes-devtools/python/python-sip.inc
create mode 100644 meta-oe/recipes-devtools/python/python-sip_4.13.3.bb
diff --git a/meta-oe/recipes-devtools/python/python-sip.inc b/meta-oe/recipes-devtools/python/python-sip.inc
new file mode 100644
index 0000000..19abbba
--- /dev/null
+++ b/meta-oe/recipes-devtools/python/python-sip.inc
@@ -0,0 +1,42 @@
+DESCRIPTION = "Runtime helper for sip-generated python wrapper libraries"
+SECTION = "devel/python"
+HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
+AUTHOR = "Phil Thompson"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://siplib.sbf.in;endline=15;md5=e0e7b5d0c4656666df09826ea1d2071c"
+DEPENDS = "python"
+RDEPENDS_${PN} = "python-core"
+
+SRC_URI = "http://www.riverbankcomputing.com/static/Downloads/sip4/sip-${PV}.tar.gz"
+
+S = "${WORKDIR}/sip-${PV}/siplib"
+
+inherit qt4x11 distutils-base
+
+EXTRA_QMAKEVARS_POST += " TEMPLATE=lib \
+ CONFIG=console \
+ DESTDIR= \
+ VERSION=1.0.0 \
+ TARGET=sip \
+ DEFINES=SIP_QT_SUPPORT \
+ INCLUDEPATH+=. \
+ INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \
+ INCLUDEPATH+=${STAGING_INCDIR}"
+
+
+do_configure_prepend() {
+ cat siplib.sbf.in | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, | sed s,@CFG_MODULE_BASENAME@,sip, > siplib.pro
+ cat siplib.c.in | sed s,@CFG_MODULE_BASENAME@,sip, > siplib.c
+ cat sip.h.in | sed -e s,@CFG_MODULE_NAME@,sip,g > sip.h
+}
+
+do_install() {
+ install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/
+ install -m 0755 libsip.so.1.0.0 ${D}${libdir}/${PYTHON_DIR}/site-packages/sip.so
+ # sipconfig.py sipdistutils.py
+ install -d ${D}${includedir}
+ install -m 0644 ../siplib/sip.h ${D}${includedir}/sip.h
+}
+
+FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages/sip.so"
+
diff --git a/meta-oe/recipes-devtools/python/python-sip_4.13.3.bb b/meta-oe/recipes-devtools/python/python-sip_4.13.3.bb
new file mode 100644
index 0000000..b1bda92
--- /dev/null
+++ b/meta-oe/recipes-devtools/python/python-sip_4.13.3.bb
@@ -0,0 +1 @@
+require python-sip.inc
--
1.7.8.6
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-oe][PATCH 7/8] python-pyqt: import from oe-classic
2012-08-01 22:20 [meta-oe][PATCH 0/8] Merge some recipes from oe-classic and smaller fixes Martin Jansa
` (5 preceding siblings ...)
2012-08-01 22:21 ` [meta-oe][PATCH 6/8] python-sip: " Martin Jansa
@ 2012-08-01 22:21 ` Martin Jansa
2012-08-01 22:21 ` [meta-oe][PATCH 8/8] anki: import from oe-classic and upgrade to latest Martin Jansa
[not found] ` <cover.1344259248.git.Martin.Jansa@gmail.com>
8 siblings, 0 replies; 22+ messages in thread
From: Martin Jansa @ 2012-08-01 22:21 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../python-pyqt-4.8.4/assistantclient-fix.patch | 13 +
.../python/python-pyqt-4.8.4/fix_qthelp_ftbfs.diff | 15 ++
.../python-pyqt-4.8.4/fix_the_QAssitant_ftbfs.diff | 29 +++
.../python/python-pyqt-4.8.4/pyqt-generated.patch | 24 ++
.../python-pyqt-4.8.4/qreal_float_support.diff | 248 ++++++++++++++++++++
.../recipes-devtools/python/python-pyqt_4.8.4.bb | 115 +++++++++
6 files changed, 444 insertions(+), 0 deletions(-)
create mode 100644 meta-oe/recipes-devtools/python/python-pyqt-4.8.4/assistantclient-fix.patch
create mode 100644 meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_qthelp_ftbfs.diff
create mode 100644 meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_the_QAssitant_ftbfs.diff
create mode 100644 meta-oe/recipes-devtools/python/python-pyqt-4.8.4/pyqt-generated.patch
create mode 100644 meta-oe/recipes-devtools/python/python-pyqt-4.8.4/qreal_float_support.diff
create mode 100644 meta-oe/recipes-devtools/python/python-pyqt_4.8.4.bb
diff --git a/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/assistantclient-fix.patch b/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/assistantclient-fix.patch
new file mode 100644
index 0000000..15f83d2
--- /dev/null
+++ b/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/assistantclient-fix.patch
@@ -0,0 +1,13 @@
+Index: PyQt-x11-gpl-4.8.3/sip/QtAssistant/qassistantclient.sip
+===================================================================
+--- PyQt-x11-gpl-4.8.3.orig/sip/QtAssistant/qassistantclient.sip
++++ PyQt-x11-gpl-4.8.3/sip/QtAssistant/qassistantclient.sip
+@@ -33,7 +33,7 @@
+ class QAssistantClient : QObject
+ {
+ %TypeHeaderCode
+-#include <qassistantclient.h>
++#include <QtAssistant/qassistantclient.h>
+ %End
+
+ %ConvertToSubClassCode
diff --git a/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_qthelp_ftbfs.diff b/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_qthelp_ftbfs.diff
new file mode 100644
index 0000000..e7a6882
--- /dev/null
+++ b/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_qthelp_ftbfs.diff
@@ -0,0 +1,15 @@
+Description: Fix QtHelp FTBFS with ld --no-add-needed.
+Author: Felix Geyer <debfx-pkg@fobos.de>
+
+--- python-qt4-4.8.1.orig/configure.py
++++ python-qt4-4.8.1/configure.py
+@@ -364,7 +364,8 @@ class ConfigurePyQt4:
+ pyqt_modules.append("QtCore")
+
+ check_module("QtGui", "qwidget.h", "new QWidget()")
+- check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")")
++ check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")",
++ extra_libs=["QtCore"])
+ check_module("QtMultimedia", "QAudioDeviceInfo",
+ "new QAudioDeviceInfo()")
+ check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()")
diff --git a/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_the_QAssitant_ftbfs.diff b/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_the_QAssitant_ftbfs.diff
new file mode 100644
index 0000000..96e3062
--- /dev/null
+++ b/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_the_QAssitant_ftbfs.diff
@@ -0,0 +1,29 @@
+From aa85ab2be6be7cb3c4df68139a8271fc4c8c11c8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca@synchrotron-soleil.fr>
+Date: Tue, 1 Mar 2011 21:49:23 +0100
+Subject: [PATCH] * fix the QAssitant ftbfs
+
+---
+ configure.py | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.py b/configure.py
+index 7ed9582..185ec9f 100644
+--- a/configure.py
++++ b/configure.py
+@@ -354,10 +354,10 @@ class ConfigurePyQt4:
+
+ if opts.mwg_ssl_dir:
+ ass_lib_dirs = [os.path.join(opts.mwg_ssl_dir, "lib")]
+- ass_libs = ["ssleay32", "libeay32"]
++ ass_libs = ["ssleay32", "libeay32", "QtCore"]
+ else:
+ ass_lib_dirs = None
+- ass_libs = None
++ ass_libs = ["QtCore"]
+
+ # Note that the order in which we check is important for the
+ # consolidated module - a module's dependencies must be checked first.
+--
+1.7.4.1
+
diff --git a/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/pyqt-generated.patch b/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/pyqt-generated.patch
new file mode 100644
index 0000000..0af5549
--- /dev/null
+++ b/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/pyqt-generated.patch
@@ -0,0 +1,24 @@
+diff -uNr PyQt-x11-gpl-4.8.4.orig/QtGui/sipQtGuiQSystemTrayIcon.cpp PyQt-x11-gpl-4.8.4/QtGui/sipQtGuiQSystemTrayIcon.cpp
+--- PyQt-x11-gpl-4.8.4.orig/QtGui/sipQtGuiQSystemTrayIcon.cpp 2012-08-01 16:37:34.000000000 +0200
++++ PyQt-x11-gpl-4.8.4/QtGui/sipQtGuiQSystemTrayIcon.cpp 2012-08-01 17:05:45.000000000 +0200
+@@ -957,8 +957,6 @@
+ qtgui_untrack(sipCpp);
+ #line 959 "QtGui/sipQtGuiQSystemTrayIcon.cpp"
+
+- QSystemTrayIcon *sipCpp = reinterpret_cast<QSystemTrayIcon *>(sipCppV);
+-
+ if (QThread::currentThread() == sipCpp->thread())
+ delete sipCpp;
+ else
+diff -uNr PyQt-x11-gpl-4.8.4.orig/QtGui/sipQtGuiQGraphicsScene.cpp PyQt-x11-gpl-4.8.4/QtGui/sipQtGuiQGraphicsScene.cpp
+--- PyQt-x11-gpl-4.8.4.orig/QtGui/sipQtGuiQGraphicsScene.cpp 2012-08-01 16:37:35.000000000 +0200
++++ PyQt-x11-gpl-4.8.4/QtGui/sipQtGuiQGraphicsScene.cpp 2012-08-01 17:26:58.000000000 +0200
+@@ -4016,8 +4016,6 @@
+ qtgui_untrack(sipCpp);
+ #line 4018 "QtGui/sipQtGuiQGraphicsScene.cpp"
+
+- QGraphicsScene *sipCpp = reinterpret_cast<QGraphicsScene *>(sipCppV);
+-
+ if (QThread::currentThread() == sipCpp->thread())
+ delete sipCpp;
+ else
diff --git a/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/qreal_float_support.diff b/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/qreal_float_support.diff
new file mode 100644
index 0000000..abdf70f
--- /dev/null
+++ b/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/qreal_float_support.diff
@@ -0,0 +1,248 @@
+## 03_qreal_float_support.dpatch by Michael Casadevall <sonicmctails@gmail.com>
+Index: python-qt4-4.8.3/configure.py
+===================================================================
+--- python-qt4-4.8.3.orig/configure.py 2011-02-24 10:33:30.000000000 +0200
++++ python-qt4-4.8.3/configure.py 2011-02-24 10:33:18.000000000 +0200
+@@ -2004,8 +2004,9 @@
+ out << "PyQt_NoOpenGLES\\n";
+ #endif
+
+- if (sizeof (qreal) != sizeof (double))
++#if defined(QT_NO_FPU) || defined(QT_ARCH_ARM) || defined(QT_ARCH_WINDOWSCE)
+ out << "PyQt_qreal_double\\n";
++#endif
+
+ return 0;
+ }
+Index: python-qt4-4.8.3/sip/QtCore/qlist.sip
+===================================================================
+--- python-qt4-4.8.3.orig/sip/QtCore/qlist.sip 2011-02-24 10:33:27.000000000 +0200
++++ python-qt4-4.8.3/sip/QtCore/qlist.sip 2011-02-24 10:33:18.000000000 +0200
+@@ -811,3 +811,227 @@
+ return sipGetState(sipTransferObj);
+ %End
+ };
++
++// If we're on an architecture where qreal != double, then we need to also
++// explicately handle doubles. On architectures where qreal == double, they
++// will automaticially be cast upwards
++
++%If (!PyQt_qreal_double)
++
++%If (Qt_4_3_0 -)
++// QList<QPair<double, double> > is implemented as a Python list of 2-element tuples.
++%MappedType QList<QPair<double, double> >
++{
++%TypeHeaderCode
++#include <qlist.h>
++#include <qpair.h>
++%End
++
++%ConvertFromTypeCode
++ // Create the list.
++ PyObject *l;
++
++ if ((l = PyList_New(sipCpp->size())) == NULL)
++ return NULL;
++
++ // Set the list elements.
++ for (int i = 0; i < sipCpp->size(); ++i)
++ {
++ const QPair<double, double> &p = sipCpp->at(i);
++ PyObject *pobj;
++
++ if ((pobj = Py_BuildValue((char *)"dd", p.first, p.second)) == NULL)
++ {
++ Py_DECREF(l);
++
++ return NULL;
++ }
++
++ PyList_SET_ITEM(l, i, pobj);
++ }
++
++ return l;
++%End
++
++%ConvertToTypeCode
++ SIP_SSIZE_T len;
++
++ // Check the type if that is all that is required.
++ if (sipIsErr == NULL)
++ {
++ if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0)
++ return 0;
++
++ for (SIP_SSIZE_T i = 0; i < len; ++i)
++ {
++ PyObject *tup = PySequence_ITEM(sipPy, i);
++
++ if (!PySequence_Check(tup) || PySequence_Size(tup) != 2)
++ return 0;
++ }
++
++ return 1;
++ }
++
++ QList<QPair<double, double> > *ql = new QList<QPair<double, double> >;
++ len = PySequence_Size(sipPy);
++
++ for (SIP_SSIZE_T i = 0; i < len; ++i)
++ {
++ PyObject *tup = PySequence_ITEM(sipPy, i);
++
++ double first = PyFloat_AsDouble(PySequence_ITEM(tup, 0));
++ double second = PyFloat_AsDouble(PySequence_ITEM(tup, 1));
++
++ ql->append(QPair<double, double>(first, second));
++ }
++
++ *sipCppPtr = ql;
++
++ return sipGetState(sipTransferObj);
++%End
++};
++%End
++%If (Qt_4_3_0 -)
++// QList<QPair<double, TYPE> > is implemented as a Python list of 2-element tuples.
++template<double, TYPE>
++%MappedType QList<QPair<double, TYPE> >
++{
++%TypeHeaderCode
++#include <qlist.h>
++#include <qpair.h>
++%End
++
++%ConvertFromTypeCode
++ // Create the list.
++ PyObject *l;
++
++ if ((l = PyList_New(sipCpp->size())) == NULL)
++ return NULL;
++
++ // Set the list elements.
++ for (int i = 0; i < sipCpp->size(); ++i)
++ {
++ const QPair<double, TYPE> &p = sipCpp->at(i);
++ TYPE *t = new TYPE(p.second);
++ PyObject *pobj;
++
++ if ((pobj = sipBuildResult(NULL, "(dB)", p.first, t, sipClass_TYPE, sipTransferObj)) == NULL)
++ {
++ Py_DECREF(l);
++ delete t;
++
++ return NULL;
++ }
++
++ PyList_SET_ITEM(l, i, pobj);
++ }
++
++ return l;
++%End
++
++%ConvertToTypeCode
++ SIP_SSIZE_T len;
++
++ // Check the type if that is all that is required.
++ if (sipIsErr == NULL)
++ {
++ if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0)
++ return 0;
++
++ for (SIP_SSIZE_T i = 0; i < len; ++i)
++ {
++ PyObject *tup = PySequence_ITEM(sipPy, i);
++
++ if (!PySequence_Check(tup) || PySequence_Size(tup) != 2)
++ return 0;
++
++ if (!sipCanConvertToInstance(PySequence_ITEM(tup, 1), sipClass_TYPE, SIP_NOT_NONE))
++ return 0;
++ }
++
++ return 1;
++ }
++
++ QList<QPair<double, TYPE> > *ql = new QList<QPair<double, TYPE> >;
++ len = PySequence_Size(sipPy);
++
++ for (SIP_SSIZE_T i = 0; i < len; ++i)
++ {
++ PyObject *tup = PySequence_ITEM(sipPy, i);
++ double d;
++ int state;
++
++ d = PyFloat_AsDouble(PySequence_ITEM(tup, 0));
++ TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PySequence_ITEM(tup, 1), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
++
++ if (*sipIsErr)
++ {
++ sipReleaseInstance(t, sipClass_TYPE, state);
++
++ delete ql;
++ return 0;
++ }
++
++ ql->append(QPair<double, TYPE>(d, *t));
++
++ sipReleaseInstance(t, sipClass_TYPE, state);
++ }
++
++ *sipCppPtr = ql;
++
++ return sipGetState(sipTransferObj);
++%End
++};
++%End
++
++// QList<double> is implemented as a Python list of doubles.
++%MappedType QList<double>
++{
++%TypeHeaderCode
++#include <qlist.h>
++%End
++
++%ConvertFromTypeCode
++ // Create the list.
++ PyObject *l;
++
++ if ((l = PyList_New(sipCpp->size())) == NULL)
++ return NULL;
++
++ // Set the list elements.
++ for (int i = 0; i < sipCpp->size(); ++i)
++ {
++ PyObject *pobj;
++
++ if ((pobj = PyFloat_FromDouble(sipCpp->value(i))) == NULL)
++ {
++ Py_DECREF(l);
++
++ return NULL;
++ }
++
++ PyList_SET_ITEM(l, i, pobj);
++ }
++
++ return l;
++%End
++
++%ConvertToTypeCode
++ // Check the type if that is all that is required.
++ if (sipIsErr == NULL)
++ return (PySequence_Check(sipPy) && PySequence_Size(sipPy) >= 0);
++
++ QList<double> *ql = new QList<double>;
++ SIP_SSIZE_T len = PySequence_Size(sipPy);
++
++ for (SIP_SSIZE_T i = 0; i < len; ++i)
++ ql->append(PyFloat_AsDouble(PySequence_ITEM(sipPy, i)));
++
++ *sipCppPtr = ql;
++
++ return sipGetState(sipTransferObj);
++%End
++};
++
++%End
diff --git a/meta-oe/recipes-devtools/python/python-pyqt_4.8.4.bb b/meta-oe/recipes-devtools/python/python-pyqt_4.8.4.bb
new file mode 100644
index 0000000..8bae09e
--- /dev/null
+++ b/meta-oe/recipes-devtools/python/python-pyqt_4.8.4.bb
@@ -0,0 +1,115 @@
+DESCRIPTION = "Python Qt4 Bindings"
+HOMEPAGE = "http://riverbankcomputing.co.uk"
+AUTHOR = "Phil Thomson @ riverbank.co.uk"
+SECTION = "devel/python"
+LICENSE = "GPLv2 & GPLv3 & GPL_EXCEPTION"
+LIC_FILES_CHKSUM = "\
+ file://GPL_EXCEPTION.TXT;md5=b73b0be471db679533dc94781c14af58 \
+ file://GPL_EXCEPTION_ADDENDUM.TXT;md5=c1e04ec2aa0911061005a801abf81e40 \
+ file://OPENSOURCE-NOTICE.TXT;md5=6ad9123620cc04a22c394753ad4767d7 \
+ file://LICENSE-MERGED-GPL2-GPL3;md5=53ced8933428255115039368cdca0aef \
+ file://LICENSE.GPL2;md5=59bccd9d4dcaae9e668798337b91a022 \
+ file://LICENSE.GPL3;md5=da83bb3624af9ff4808aa9ffc49fc582 \
+"
+
+DEPENDS = "sip-native python-sip"
+RDEPENDS_${PN} = "python-core"
+SRCNAME = "pyqt"
+
+PYQT_OE_VERSION = "Qt_4_7_1"
+
+SRC_URI = "\
+ http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${PV}.tar.gz \
+ \
+ file://fix_qthelp_ftbfs.diff \
+ file://fix_the_QAssitant_ftbfs.diff \
+ file://assistantclient-fix.patch \
+ file://pyqt-generated.patch;apply=no \
+"
+SRC_URI[md5sum] = "97c5dc1042feb5b3fe20baabad055af1"
+SRC_URI[sha256sum] = "fcfa3ecc0b4fad6d93227751b36a6f81ea104ee19dd26905f52de59f060b3e98"
+S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
+
+# arm and mips machines need some extra patches
+SRC_URI_append_arm = "\
+ file://qreal_float_support.diff \
+"
+
+SRC_URI_append_mipsel = "\
+ file://qreal_float_support.diff \
+"
+
+inherit qt4x11 sip distutils-base
+
+PARALLEL_MAKE = ""
+
+QMAKE_PROFILES = "pyqt.pro"
+# NOTE: has to match with MIN(qt version we have in OE, last known Qt version by SIP/PyQt)
+EXTRA_SIPTAGS = "-tWS_X11 -t${PYQT_OE_VERSION} -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility"
+EXTRA_OEMAKE = " MAKEFLAGS= "
+
+# arm and mips need extra params for the qreal issue
+EXTRA_SIPTAGS_append_arm = " -x PyQt_qreal_double"
+EXTRA_SIPTAGS_append_mipsel = " -x PyQt_qreal_double"
+
+SIP_MODULES = "QtCore QtDeclarative QtGui QtNetwork QtSql QtSvg QtXml QtWebKit"
+MAKE_MODULES = "qpy ${SIP_MODULES}"
+
+EXTRA_QMAKEVARS_POST += "\
+ INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/Qt \
+ INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \
+ INCLUDEPATH+=../qpy/QtCore \
+ INCLUDEPATH+=../qpy/QtGui \
+ INCLUDEPATH+=../qpy/QtDeclarative \
+ INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtCore \
+ INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtGui \
+ INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtDeclarative \
+ INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtWebKit \
+ INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtNetwork \
+"
+FIX_QREAL = "\
+"
+
+do_generate_prepend() {
+ for i in ${FIX_QREAL}; do
+ sed -i -e s,qreal,float,g sip/$i
+ done
+}
+
+do_configure_prepend() {
+ printf "TEMPLATE=subdirs\nSUBDIRS=${MAKE_MODULES}\n" >pyqt.pro
+ printf "TEMPLATE=subdirs\nSUBDIRS=QtCore QtDeclarative QtGui\n" >qpy/qpy.pro
+ ln -sf ./qpycore.pro qpy/QtCore/QtCore.pro
+ ln -sf ./qpydeclarative.pro qpy/QtDeclarative/QtDeclarative.pro
+ ln -sf ./qpygui.pro qpy/QtGui/QtGui.pro
+ echo "INCLUDEPATH+=${S}/QtCore" >>qpy/QtCore/QtCore.pro
+ echo "INCLUDEPATH+=${S}/QtGui" >>qpy/QtGui/QtGui.pro
+ echo "INCLUDEPATH+=${S}/QtDeclarative" >>qpy/QtDeclarative/QtDeclarative.pro
+ echo "LIBS+=-L../qpy/QtGui/ -lqpygui" >>QtGui/QtGui.pro
+ echo "LIBS+=-L../qpy/QtCore/ -lqpycore" >>QtCore/QtCore.pro
+ echo "LIBS+=-L../qpy/QtDeclarative/ -lqpydeclarative" >>QtDeclarative/QtDeclarative.pro
+ # hack for broken generated code (duplicated sipCpp declaration).
+ patch -p1 < ${WORKDIR}/pyqt-generated.patch
+}
+
+do_install() {
+ install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4
+ for module in ${SIP_MODULES}
+ do
+ echo "from PyQt4.${module} import *\n" >> ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/Qt.py
+ install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/${module}.so
+ done
+ cp -pPR elementtree ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/
+ cp __init__.py ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/
+
+ install -d ${STAGING_SIPDIR}/qt/
+ install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages
+ for module in ${SIP_MODULES}
+ do
+ install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/
+ install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/${module}.so
+ done
+}
+
+FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages"
+
--
1.7.8.6
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-oe][PATCH 8/8] anki: import from oe-classic and upgrade to latest
2012-08-01 22:20 [meta-oe][PATCH 0/8] Merge some recipes from oe-classic and smaller fixes Martin Jansa
` (6 preceding siblings ...)
2012-08-01 22:21 ` [meta-oe][PATCH 7/8] python-pyqt: import from oe-classic Martin Jansa
@ 2012-08-01 22:21 ` Martin Jansa
2012-08-02 6:52 ` Martin Jansa
[not found] ` <cover.1343908599.git.Martin.Jansa@gmail.com>
[not found] ` <cover.1344259248.git.Martin.Jansa@gmail.com>
8 siblings, 2 replies; 22+ messages in thread
From: Martin Jansa @ 2012-08-01 22:21 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../no-need-for-pyqt-at-buildtime.patch | 23 ++++++++++++++++++++
meta-oe/recipes-extended/anki/anki.inc | 16 +++++++++++++
meta-oe/recipes-extended/anki/anki_1.2.11.bb | 4 +++
.../no-need-for-pyqt-at-buildtime.patch | 14 ++++++++++++
meta-oe/recipes-extended/anki/libanki_1.2.11.bb | 6 +++++
5 files changed, 63 insertions(+), 0 deletions(-)
create mode 100644 meta-oe/recipes-extended/anki/anki-1.2.11/no-need-for-pyqt-at-buildtime.patch
create mode 100644 meta-oe/recipes-extended/anki/anki.inc
create mode 100644 meta-oe/recipes-extended/anki/anki_1.2.11.bb
create mode 100644 meta-oe/recipes-extended/anki/libanki-1.2.11/no-need-for-pyqt-at-buildtime.patch
create mode 100644 meta-oe/recipes-extended/anki/libanki_1.2.11.bb
diff --git a/meta-oe/recipes-extended/anki/anki-1.2.11/no-need-for-pyqt-at-buildtime.patch b/meta-oe/recipes-extended/anki/anki-1.2.11/no-need-for-pyqt-at-buildtime.patch
new file mode 100644
index 0000000..b9f984b
--- /dev/null
+++ b/meta-oe/recipes-extended/anki/anki-1.2.11/no-need-for-pyqt-at-buildtime.patch
@@ -0,0 +1,23 @@
+--- anki-1.2.11/setup.py.orig 2012-08-01 11:13:49.452021898 +0200
++++ anki-1.2.11/setup.py 2012-08-01 13:10:06.340272121 +0200
+@@ -1,10 +1,8 @@
+ from setuptools import setup, find_packages
+ import sys, os
+
+-import ankiqt
+-
+ setup(name='ankiqt',
+- version=ankiqt.appVersion,
++ version=os.environ["BUILD_PV"],
+ description='An intelligent spaced-repetition memory training program',
+ long_description="",
+ # Get strings from http://www.python.org/pypi?%3Aaction=list_classifiers
+@@ -22,7 +20,7 @@
+ license='GPLv3',
+ packages=find_packages(),
+ include_package_data=True,
+- install_requires = 'anki >= ' + ankiqt.appVersion,
++ install_requires = 'anki >= ' + os.environ["BUILD_PV"],
+ zip_safe=False,
+ package_data={'ankiqt':
+ ['locale/*/*/*']},
diff --git a/meta-oe/recipes-extended/anki/anki.inc b/meta-oe/recipes-extended/anki/anki.inc
new file mode 100644
index 0000000..50db4db
--- /dev/null
+++ b/meta-oe/recipes-extended/anki/anki.inc
@@ -0,0 +1,16 @@
+DESCRIPTION = "Anki is a program designed to help you remember facts \
+(such as words and phrases in a foreign language) \
+as easily, quickly and efficiently as possible"
+HOMEPAGE = "http://ichi2.net/anki/"
+AUTHOR = "Damien Elmes"
+RDEPENDS_${PN} = "python-pyqt libanki"
+RRECOMMENDS_${PN} = "virtual-japanese-font"
+
+inherit setuptools
+
+SRC_URI = "http://anki.googlecode.com/files/anki-${PV}.tgz"
+SRC_URI[md5sum] = "dcd43787bed2dbe63ffb6d153ee9dbe5"
+SRC_URI[sha256sum] = "ca075fd0c0d6851d22046de8f6fa90d7c442cdd4a6783f7c6ffad7fbc46f5089"
+
+export BUILD_PV := "${PV}"
+SRC_URI += "file://no-need-for-pyqt-at-buildtime.patch"
diff --git a/meta-oe/recipes-extended/anki/anki_1.2.11.bb b/meta-oe/recipes-extended/anki/anki_1.2.11.bb
new file mode 100644
index 0000000..6518da8
--- /dev/null
+++ b/meta-oe/recipes-extended/anki/anki_1.2.11.bb
@@ -0,0 +1,4 @@
+require anki.inc
+
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
diff --git a/meta-oe/recipes-extended/anki/libanki-1.2.11/no-need-for-pyqt-at-buildtime.patch b/meta-oe/recipes-extended/anki/libanki-1.2.11/no-need-for-pyqt-at-buildtime.patch
new file mode 100644
index 0000000..fa90eb4
--- /dev/null
+++ b/meta-oe/recipes-extended/anki/libanki-1.2.11/no-need-for-pyqt-at-buildtime.patch
@@ -0,0 +1,14 @@
+--- libanki/setup.py.orig 2012-08-01 13:10:19.942271847 +0200
++++ libanki/setup.py 2012-08-01 13:10:32.773272650 +0200
+@@ -1,10 +1,8 @@
+ from setuptools import setup, find_packages
+ import sys, os
+
+-import anki
+-
+ setup(name='anki',
+- version=anki.version,
++ version=os.environ["BUILD_PV"],
+ description='An intelligent spaced-repetition memory training library',
+ long_description="",
+ # Get strings from http://www.python.org/pypi?%3Aaction=list_classifiers
diff --git a/meta-oe/recipes-extended/anki/libanki_1.2.11.bb b/meta-oe/recipes-extended/anki/libanki_1.2.11.bb
new file mode 100644
index 0000000..92c251b
--- /dev/null
+++ b/meta-oe/recipes-extended/anki/libanki_1.2.11.bb
@@ -0,0 +1,6 @@
+require anki.inc
+
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=070ca3b3ac381b278fa104643f2c858d"
+
+S = "${WORKDIR}/anki-${PV}/libanki"
--
1.7.8.6
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [meta-oe][PATCH 8/8] anki: import from oe-classic and upgrade to latest
2012-08-01 22:21 ` [meta-oe][PATCH 8/8] anki: import from oe-classic and upgrade to latest Martin Jansa
@ 2012-08-02 6:52 ` Martin Jansa
[not found] ` <cover.1343908599.git.Martin.Jansa@gmail.com>
1 sibling, 0 replies; 22+ messages in thread
From: Martin Jansa @ 2012-08-02 6:52 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1072 bytes --]
On Thu, Aug 02, 2012 at 12:21:05AM +0200, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> .../no-need-for-pyqt-at-buildtime.patch | 23 ++++++++++++++++++++
> meta-oe/recipes-extended/anki/anki.inc | 16 +++++++++++++
> meta-oe/recipes-extended/anki/anki_1.2.11.bb | 4 +++
> .../no-need-for-pyqt-at-buildtime.patch | 14 ++++++++++++
> meta-oe/recipes-extended/anki/libanki_1.2.11.bb | 6 +++++
> 5 files changed, 63 insertions(+), 0 deletions(-)
> create mode 100644 meta-oe/recipes-extended/anki/anki-1.2.11/no-need-for-pyqt-at-buildtime.patch
> create mode 100644 meta-oe/recipes-extended/anki/anki.inc
> create mode 100644 meta-oe/recipes-extended/anki/anki_1.2.11.bb
> create mode 100644 meta-oe/recipes-extended/anki/libanki-1.2.11/no-need-for-pyqt-at-buildtime.patch
> create mode 100644 meta-oe/recipes-extended/anki/libanki_1.2.11.bb
Please ignore this one, it has some runtime issues.
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* [meta-oe][PATCHv2 8/8] anki: import from oe-classic
[not found] ` <cover.1343908599.git.Martin.Jansa@gmail.com>
@ 2012-08-02 11:57 ` Martin Jansa
0 siblings, 0 replies; 22+ messages in thread
From: Martin Jansa @ 2012-08-02 11:57 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-extended/anki/anki-0.4.3.inc | 8 +++++
meta-oe/recipes-extended/anki/anki.inc | 9 ++++++
.../anki/anki/no-need-for-pyqt-at-buildtime.patch | 28 ++++++++++++++++++++
meta-oe/recipes-extended/anki/anki_0.4.3.bb | 4 +++
.../libanki/no-need-for-pyqt-at-buildtime.patch | 14 ++++++++++
meta-oe/recipes-extended/anki/libanki_0.4.3.bb | 3 ++
6 files changed, 66 insertions(+), 0 deletions(-)
create mode 100644 meta-oe/recipes-extended/anki/anki-0.4.3.inc
create mode 100644 meta-oe/recipes-extended/anki/anki.inc
create mode 100644 meta-oe/recipes-extended/anki/anki/no-need-for-pyqt-at-buildtime.patch
create mode 100644 meta-oe/recipes-extended/anki/anki_0.4.3.bb
create mode 100644 meta-oe/recipes-extended/anki/libanki/no-need-for-pyqt-at-buildtime.patch
create mode 100644 meta-oe/recipes-extended/anki/libanki_0.4.3.bb
diff --git a/meta-oe/recipes-extended/anki/anki-0.4.3.inc b/meta-oe/recipes-extended/anki/anki-0.4.3.inc
new file mode 100644
index 0000000..072e7f1
--- /dev/null
+++ b/meta-oe/recipes-extended/anki/anki-0.4.3.inc
@@ -0,0 +1,8 @@
+require anki.inc
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/anki/anki-${PV}.tgz"
+SRC_URI[md5sum] = "90434860945de4c09d55cdb5dbe984fc"
+SRC_URI[sha256sum] = "18a93fb46363ca34963fc2588cadf7415dd799dd647efa681859eb8b1b22f104"
+
+export BUILD_PV := "${PV}"
+SRC_URI += "file://no-need-for-pyqt-at-buildtime.patch"
diff --git a/meta-oe/recipes-extended/anki/anki.inc b/meta-oe/recipes-extended/anki/anki.inc
new file mode 100644
index 0000000..3092539
--- /dev/null
+++ b/meta-oe/recipes-extended/anki/anki.inc
@@ -0,0 +1,9 @@
+DESCRIPTION = "Anki is a program designed to help you remember facts \
+(such as words and phrases in a foreign language) \
+as easily, quickly and efficiently as possible"
+HOMEPAGE = "http://ichi2.net/anki/"
+AUTHOR = "Damien Elmes"
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
+
+inherit setuptools
diff --git a/meta-oe/recipes-extended/anki/anki/no-need-for-pyqt-at-buildtime.patch b/meta-oe/recipes-extended/anki/anki/no-need-for-pyqt-at-buildtime.patch
new file mode 100644
index 0000000..9eac1dc
--- /dev/null
+++ b/meta-oe/recipes-extended/anki/anki/no-need-for-pyqt-at-buildtime.patch
@@ -0,0 +1,28 @@
+#
+# (C) Michael 'Mickey' Lauer <mlauer@vanille-media.de>
+#
+Index: anki-0.4.3/setup.py
+===================================================================
+--- anki-0.4.3.orig/setup.py 2008-02-12 19:17:56.000000000 +0000
++++ anki-0.4.3/setup.py 2008-02-12 19:19:29.000000000 +0000
+@@ -3,10 +3,8 @@
+ from setuptools import setup, find_packages
+ import sys, os
+
+-import ankiqt
+-
+ setup(name='ankiqt',
+- version=ankiqt.appVersion,
++ version=os.environ["BUILD_PV"],
+ description='An intelligent spaced-repetition memory training program',
+ long_description="",
+ # Get strings from http://www.python.org/pypi?%3Aaction=list_classifiers
+@@ -24,7 +22,7 @@
+ license='GPLv2',
+ packages=find_packages(),
+ include_package_data=True,
+- install_requires = 'anki >= ' + ankiqt.appVersion,
++ install_requires = 'anki >= ' + os.environ["BUILD_PV"],
+ zip_safe=False,
+ package_data={'ankiqt':
+ ['locale/*/*/*']},
diff --git a/meta-oe/recipes-extended/anki/anki_0.4.3.bb b/meta-oe/recipes-extended/anki/anki_0.4.3.bb
new file mode 100644
index 0000000..7943ce8
--- /dev/null
+++ b/meta-oe/recipes-extended/anki/anki_0.4.3.bb
@@ -0,0 +1,4 @@
+require ${PN}-${PV}.inc
+
+RDEPENDS_${PN} = "python-pyqt python-sip libanki"
+RRECOMMENDS_${PN} = "virtual-japanese-font"
diff --git a/meta-oe/recipes-extended/anki/libanki/no-need-for-pyqt-at-buildtime.patch b/meta-oe/recipes-extended/anki/libanki/no-need-for-pyqt-at-buildtime.patch
new file mode 100644
index 0000000..92583e5
--- /dev/null
+++ b/meta-oe/recipes-extended/anki/libanki/no-need-for-pyqt-at-buildtime.patch
@@ -0,0 +1,14 @@
+--- libanki.orig/setup.py 2008-01-02 13:22:22.000000000 +0100
++++ libanki/setup.py 2012-08-02 11:39:13.604173933 +0200
+@@ -3,10 +3,8 @@
+ from setuptools import setup, find_packages
+ import sys, os
+
+-import anki
+-
+ setup(name='anki',
+- version=anki.version,
++ version=os.environ["BUILD_PV"],
+ description='An intelligent spaced-repetition memory training library',
+ long_description="",
+ # Get strings from http://www.python.org/pypi?%3Aaction=list_classifiers
diff --git a/meta-oe/recipes-extended/anki/libanki_0.4.3.bb b/meta-oe/recipes-extended/anki/libanki_0.4.3.bb
new file mode 100644
index 0000000..636932f
--- /dev/null
+++ b/meta-oe/recipes-extended/anki/libanki_0.4.3.bb
@@ -0,0 +1,3 @@
+require anki-${PV}.inc
+
+S = "${WORKDIR}/anki-${PV}/libanki"
--
1.7.8.6
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-oe][PATCH 09/12] systemd-compat-units: move list of disabled services to variable, fix hwclock.sh and output
[not found] ` <cover.1344259248.git.Martin.Jansa@gmail.com>
@ 2012-08-06 13:37 ` Martin Jansa
2012-08-06 14:25 ` Koen Kooi
2012-08-06 13:37 ` [meta-oe][PATCH 10/12] mplayer2: enable speex Martin Jansa
` (2 subsequent siblings)
3 siblings, 1 reply; 22+ messages in thread
From: Martin Jansa @ 2012-08-06 13:37 UTC (permalink / raw)
To: openembedded-devel
* variable allows to add items in .bbappend without overwritting whole
postinst
* hwclock.service should be used to blacklist SYSV hwclock.sh (not hwclock.sh.service)
* show only newly disabled SYSV scripts
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../recipes-core/systemd/systemd-compat-units.bb | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/meta-systemd/recipes-core/systemd/systemd-compat-units.bb b/meta-systemd/recipes-core/systemd/systemd-compat-units.bb
index c9a6b67..2973208 100644
--- a/meta-systemd/recipes-core/systemd/systemd-compat-units.bb
+++ b/meta-systemd/recipes-core/systemd/systemd-compat-units.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Units to make systemd work better with existing sysvinit scripts"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-PR = "r15"
+PR = "r16"
inherit allarch
@@ -26,15 +26,24 @@ do_install() {
chmod 0755 ${D}${bindir}/runlevel
}
+SYSTEMD_DISABLED_SYSV_SERVICES = " \
+ busybox-udhcpc \
+ dnsmasq \
+ hwclock \
+ networking \
+ syslog \
+ syslog.busybox \
+"
+
pkg_postinst_${PN} () {
cd $D${sysconfdir}/init.d
echo -n "Disabling the following sysv scripts: "
-for i in busybox-udhcpc dnsmasq hwclock.sh networking syslog syslog.busybox ; do
- if [ -e $i ] ; then
- echo -n "$i " ; ln -s /dev/null $D${systemd_unitdir}/system/$i.service
- fi
+for i in ${SYSTEMD_DISABLED_SYSV_SERVICES} ; do
+ if [ \( -e $i -o $i.sh \) -a ! -e $D${base_libdir}/systemd/system/$i.service ] ; then
+ echo -n "$i " ; ln -s /dev/null $D${base_libdir}/systemd/system/$i.service
+ fi
done ; echo
}
--
1.7.8.6
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-oe][PATCH 10/12] mplayer2: enable speex
[not found] ` <cover.1344259248.git.Martin.Jansa@gmail.com>
2012-08-06 13:37 ` [meta-oe][PATCH 09/12] systemd-compat-units: move list of disabled services to variable, fix hwclock.sh and output Martin Jansa
@ 2012-08-06 13:37 ` Martin Jansa
2012-08-06 13:37 ` [meta-oe][PATCH 11/12] php: inherit pythonnative Martin Jansa
2012-08-06 13:37 ` [meta-oe][PATCH 12/12] php: add build-defs.h to SSTATE_SCAN_FILES it defines path to sysroot where pear.conf is later created Martin Jansa
3 siblings, 0 replies; 22+ messages in thread
From: Martin Jansa @ 2012-08-06 13:37 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
index 0b73d57..e2aadf5 100644
--- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
+++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
@@ -1,7 +1,9 @@
DESCRIPTION = "Open Source multimedia player."
SECTION = "multimedia"
HOMEPAGE = "http://www.mplayerhq.hu/"
-DEPENDS = "libvpx live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame libxv virtual/libx11 libass \
+DEPENDS = "libvpx live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib \
+ libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame \
+ libxv virtual/libx11 libass speex \
${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}"
RDEPENDS_${PN} = "mplayer-common"
@@ -21,7 +23,7 @@ SRCREV = "e3f5043233336d8b4b0731c6a8b42a8fda5535ac"
ARM_INSTRUCTION_SET = "arm"
PV = "2.0+gitr${SRCPV}"
-PR = "r8"
+PR = "r9"
PARALLEL_MAKE = ""
@@ -74,7 +76,7 @@ EXTRA_OECONF = " \
--disable-real \
--disable-xvid \
\
- --disable-speex \
+ --enable-speex \
--enable-theora \
--disable-ladspa \
--disable-libdv \
--
1.7.8.6
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-oe][PATCH 11/12] php: inherit pythonnative
[not found] ` <cover.1344259248.git.Martin.Jansa@gmail.com>
2012-08-06 13:37 ` [meta-oe][PATCH 09/12] systemd-compat-units: move list of disabled services to variable, fix hwclock.sh and output Martin Jansa
2012-08-06 13:37 ` [meta-oe][PATCH 10/12] mplayer2: enable speex Martin Jansa
@ 2012-08-06 13:37 ` Martin Jansa
2012-08-06 13:37 ` [meta-oe][PATCH 12/12] php: add build-defs.h to SSTATE_SCAN_FILES it defines path to sysroot where pear.conf is later created Martin Jansa
3 siblings, 0 replies; 22+ messages in thread
From: Martin Jansa @ 2012-08-06 13:37 UTC (permalink / raw)
To: openembedded-devel
* fixes:
| AUTOV is 1.12
| Traceback (most recent call last):
| File "/OE/shr-core/openembedded-core/scripts/cp-noerror", line 8, in <module>
| import shutil
| File "/usr/lib/python2.7/shutil.py", line 12, in <module>
| import collections
| File "/usr/lib/python2.7/collections.py", line 9, in <module>
| from operator import itemgetter as _itemgetter
| ImportError: /usr/lib/python2.7/lib-dynload/operator.so: undefined symbol: _PyUnicodeUCS4_AsDefaultEncodedString
| ERROR: Function failed: do_configure (see /OE/shr-core/tmp-eglibc/work/x86_64-linux/php-native-5.3.6-r1.0/temp/log.do_configure.14841 for further information)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-devtools/php/php.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
index 7f2dc45..7c03798 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -13,7 +13,7 @@ SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2"
S = "${WORKDIR}/php-${PV}"
-inherit autotools pkgconfig
+inherit autotools pkgconfig pythonnative
# Common EXTRA_OECONF
COMMON_EXTRA_OECONF = "--enable-sockets --enable-pcntl --enable-shared"
--
1.7.8.6
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-oe][PATCH 12/12] php: add build-defs.h to SSTATE_SCAN_FILES it defines path to sysroot where pear.conf is later created
[not found] ` <cover.1344259248.git.Martin.Jansa@gmail.com>
` (2 preceding siblings ...)
2012-08-06 13:37 ` [meta-oe][PATCH 11/12] php: inherit pythonnative Martin Jansa
@ 2012-08-06 13:37 ` Martin Jansa
3 siblings, 0 replies; 22+ messages in thread
From: Martin Jansa @ 2012-08-06 13:37 UTC (permalink / raw)
To: openembedded-devel
* without this fails in do_install (shr-core-branches is workspace where
we got SSTATE_MIRROR):
| [PEAR] PEAR - installed: 1.9.2
| Wrote PEAR system config file at:
/var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/php-5.3.6-r0.0/image//var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/sysroots/x86_64-linux/etc/pear.conf
| You may want to add: /usr/lib/php to your php.ini include_path
| Installing header files:
/var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/php-5.3.6-r0.0/image/usr/include/php/
| sed: can't read
/var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/php-5.3.6-r0.0/image//etc/pear.conf:
No such file or directory
| ERROR: Function failed: do_install (see
/var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/php-5.3.6-r0.0/temp/log.do_install.3783
for further information)
NOTE: package php-5.3.6-r0.0: task do_install: Failed
* it also has couple of unpackaged dirs in ${D} (all used in STAGING_DIR_NATIVE)
WARNING: QA Issue: php: Files/directories were installed but not shipped
/var
/var/lib
/var/lib/jenkins
/var/lib/jenkins/jobs
/var/lib/jenkins/jobs/shr-core
/var/lib/jenkins/jobs/shr-core/workspace
/var/lib/jenkins/jobs/shr-core/workspace/shr-core
/var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc
/var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/sysroots
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-devtools/php/php.inc | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
index 7c03798..320696c 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -7,7 +7,7 @@ DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \
libc-client openssl"
DEPENDS_virtclass-native = "zlib-native libxml2-native"
-INC_PR = "r0"
+INC_PR = "r1"
SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2"
@@ -15,6 +15,8 @@ S = "${WORKDIR}/php-${PV}"
inherit autotools pkgconfig pythonnative
+SSTATE_SCAN_FILES += "build-defs.h"
+
# Common EXTRA_OECONF
COMMON_EXTRA_OECONF = "--enable-sockets --enable-pcntl --enable-shared"
EXTRA_OECONF = "--enable-mbstring --enable-discard-path --enable-wddx \
--
1.7.8.6
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [meta-oe][PATCH 09/12] systemd-compat-units: move list of disabled services to variable, fix hwclock.sh and output
2012-08-06 13:37 ` [meta-oe][PATCH 09/12] systemd-compat-units: move list of disabled services to variable, fix hwclock.sh and output Martin Jansa
@ 2012-08-06 14:25 ` Koen Kooi
2012-08-06 14:33 ` Martin Jansa
0 siblings, 1 reply; 22+ messages in thread
From: Koen Kooi @ 2012-08-06 14:25 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 06-08-12 15:37, Martin Jansa schreef:
> * variable allows to add items in .bbappend without overwritting whole
> postinst * hwclock.service should be used to blacklist SYSV hwclock.sh
> (not hwclock.sh.service) * show only newly disabled SYSV scripts
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---
> .../recipes-core/systemd/systemd-compat-units.bb | 19
> ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-)
>
> diff --git a/meta-systemd/recipes-core/systemd/systemd-compat-units.bb
> b/meta-systemd/recipes-core/systemd/systemd-compat-units.bb index
> c9a6b67..2973208 100644 ---
> a/meta-systemd/recipes-core/systemd/systemd-compat-units.bb +++
> b/meta-systemd/recipes-core/systemd/systemd-compat-units.bb @@ -3,7 +3,7
> @@ DESCRIPTION = "Units to make systemd work better with existing
> sysvinit scripts" LICENSE = "MIT" LIC_FILES_CHKSUM =
> "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
>
> -PR = "r15" +PR = "r16"
>
> inherit allarch
>
> @@ -26,15 +26,24 @@ do_install() { chmod 0755 ${D}${bindir}/runlevel }
>
> +SYSTEMD_DISABLED_SYSV_SERVICES = " \ + busybox-udhcpc \ + dnsmasq \ +
> hwclock \ + networking \ + syslog \ + syslog.busybox \ +" +
> pkg_postinst_${PN} () { cd $D${sysconfdir}/init.d
>
> echo -n "Disabling the following sysv scripts: "
>
> -for i in busybox-udhcpc dnsmasq hwclock.sh networking syslog
> syslog.busybox ; do - if [ -e $i ] ; then - echo -n "$i " ; ln -s
> /dev/null $D${systemd_unitdir}/system/$i.service - fi +for i in
> ${SYSTEMD_DISABLED_SYSV_SERVICES} ; do + if [ \( -e $i -o $i.sh \) -a
> ! -e $D${base_libdir}/systemd/system/$i.service ] ; then + echo -n
> "$i " ; ln -s /dev/null $D${base_libdir}/systemd/system/$i.service +
> fi done ; echo }
Doing something like this should work a bit better:
for i in ${SYSTEMD_DISABLED_SYSV_SERVICES} ; do
systemctl mask $i
done
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFQH9P2MkyGM64RGpERAlt0AKC5RPAcFlS5DKhIBjnGptlWCuuN9gCfVZ/Y
jcUARKDAfbMatCrQx2ELcAw=
=qvM6
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-oe][PATCH 09/12] systemd-compat-units: move list of disabled services to variable, fix hwclock.sh and output
2012-08-06 14:25 ` Koen Kooi
@ 2012-08-06 14:33 ` Martin Jansa
2012-08-06 16:13 ` Martin Jansa
0 siblings, 1 reply; 22+ messages in thread
From: Martin Jansa @ 2012-08-06 14:33 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 2465 bytes --]
On Mon, Aug 06, 2012 at 04:25:58PM +0200, Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Op 06-08-12 15:37, Martin Jansa schreef:
> > * variable allows to add items in .bbappend without overwritting whole
> > postinst * hwclock.service should be used to blacklist SYSV hwclock.sh
> > (not hwclock.sh.service) * show only newly disabled SYSV scripts
> >
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---
> > .../recipes-core/systemd/systemd-compat-units.bb | 19
> > ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-)
> >
> > diff --git a/meta-systemd/recipes-core/systemd/systemd-compat-units.bb
> > b/meta-systemd/recipes-core/systemd/systemd-compat-units.bb index
> > c9a6b67..2973208 100644 ---
> > a/meta-systemd/recipes-core/systemd/systemd-compat-units.bb +++
> > b/meta-systemd/recipes-core/systemd/systemd-compat-units.bb @@ -3,7 +3,7
> > @@ DESCRIPTION = "Units to make systemd work better with existing
> > sysvinit scripts" LICENSE = "MIT" LIC_FILES_CHKSUM =
> > "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
> >
> > -PR = "r15" +PR = "r16"
> >
> > inherit allarch
> >
> > @@ -26,15 +26,24 @@ do_install() { chmod 0755 ${D}${bindir}/runlevel }
> >
> > +SYSTEMD_DISABLED_SYSV_SERVICES = " \ + busybox-udhcpc \ + dnsmasq \ +
> > hwclock \ + networking \ + syslog \ + syslog.busybox \ +" +
> > pkg_postinst_${PN} () { cd $D${sysconfdir}/init.d
> >
> > echo -n "Disabling the following sysv scripts: "
> >
> > -for i in busybox-udhcpc dnsmasq hwclock.sh networking syslog
> > syslog.busybox ; do - if [ -e $i ] ; then - echo -n "$i " ; ln -s
> > /dev/null $D${systemd_unitdir}/system/$i.service - fi +for i in
> > ${SYSTEMD_DISABLED_SYSV_SERVICES} ; do + if [ \( -e $i -o $i.sh \) -a
> > ! -e $D${base_libdir}/systemd/system/$i.service ] ; then + echo -n
> > "$i " ; ln -s /dev/null $D${base_libdir}/systemd/system/$i.service +
> > fi done ; echo }
>
> Doing something like this should work a bit better:
>
> for i in ${SYSTEMD_DISABLED_SYSV_SERVICES} ; do
> systemctl mask $i
> done
Thanks for info.
It needs .service suffis so
systemctl mask $i.service
and I'll send v2 after testing if this works also in do_rootfs time.
Or you can merge this pull request and I'll send thich change as
follow-up after testing.
Cheers,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-oe][PATCH 09/12] systemd-compat-units: move list of disabled services to variable, fix hwclock.sh and output
2012-08-06 14:33 ` Martin Jansa
@ 2012-08-06 16:13 ` Martin Jansa
2012-08-06 16:19 ` Martin Jansa
0 siblings, 1 reply; 22+ messages in thread
From: Martin Jansa @ 2012-08-06 16:13 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 3194 bytes --]
On Mon, Aug 06, 2012 at 04:33:06PM +0200, Martin Jansa wrote:
> On Mon, Aug 06, 2012 at 04:25:58PM +0200, Koen Kooi wrote:
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA1
> >
> > Op 06-08-12 15:37, Martin Jansa schreef:
> > > * variable allows to add items in .bbappend without overwritting whole
> > > postinst * hwclock.service should be used to blacklist SYSV hwclock.sh
> > > (not hwclock.sh.service) * show only newly disabled SYSV scripts
> > >
> > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---
> > > .../recipes-core/systemd/systemd-compat-units.bb | 19
> > > ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/meta-systemd/recipes-core/systemd/systemd-compat-units.bb
> > > b/meta-systemd/recipes-core/systemd/systemd-compat-units.bb index
> > > c9a6b67..2973208 100644 ---
> > > a/meta-systemd/recipes-core/systemd/systemd-compat-units.bb +++
> > > b/meta-systemd/recipes-core/systemd/systemd-compat-units.bb @@ -3,7 +3,7
> > > @@ DESCRIPTION = "Units to make systemd work better with existing
> > > sysvinit scripts" LICENSE = "MIT" LIC_FILES_CHKSUM =
> > > "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
> > >
> > > -PR = "r15" +PR = "r16"
> > >
> > > inherit allarch
> > >
> > > @@ -26,15 +26,24 @@ do_install() { chmod 0755 ${D}${bindir}/runlevel }
> > >
> > > +SYSTEMD_DISABLED_SYSV_SERVICES = " \ + busybox-udhcpc \ + dnsmasq \ +
> > > hwclock \ + networking \ + syslog \ + syslog.busybox \ +" +
> > > pkg_postinst_${PN} () { cd $D${sysconfdir}/init.d
> > >
> > > echo -n "Disabling the following sysv scripts: "
> > >
> > > -for i in busybox-udhcpc dnsmasq hwclock.sh networking syslog
> > > syslog.busybox ; do - if [ -e $i ] ; then - echo -n "$i " ; ln -s
> > > /dev/null $D${systemd_unitdir}/system/$i.service - fi +for i in
> > > ${SYSTEMD_DISABLED_SYSV_SERVICES} ; do + if [ \( -e $i -o $i.sh \) -a
> > > ! -e $D${base_libdir}/systemd/system/$i.service ] ; then + echo -n
> > > "$i " ; ln -s /dev/null $D${base_libdir}/systemd/system/$i.service +
> > > fi done ; echo }
> >
> > Doing something like this should work a bit better:
> >
> > for i in ${SYSTEMD_DISABLED_SYSV_SERVICES} ; do
> > systemctl mask $i
> > done
>
> Thanks for info.
>
> It needs .service suffis so
> systemctl mask $i.service
>
> and I'll send v2 after testing if this works also in do_rootfs time.
Doesn't seem to work in do_rootfs
http://git.shr-project.org/git/?p=buildhistory.git;a=commitdiff;h=0a30b3b26081ab6f543d280874c2ecff43cbe0fa
http://git.shr-project.org/git/?p=buildhistory.git;a=commitdiff;h=7b690a71c50e07a685fb31ef4a5295fdb5c2f853
but no error in log.do_rootfs
Configuring systemd-speed-hacks.
Configuring systemd-compat-units.
Configuring udev-extraconf.
(even the line "Disabling the following sysv scripts:" is missing,
weird)
Cheers,
>
> Or you can merge this pull request and I'll send thich change as
> follow-up after testing.
>
> Cheers,
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-oe][PATCH 09/12] systemd-compat-units: move list of disabled services to variable, fix hwclock.sh and output
2012-08-06 16:13 ` Martin Jansa
@ 2012-08-06 16:19 ` Martin Jansa
2012-08-06 22:12 ` [PATCH 1/2] systemd-systemctl-native: extend systemctl wrapper to support mask action Martin Jansa
0 siblings, 1 reply; 22+ messages in thread
From: Martin Jansa @ 2012-08-06 16:19 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 3816 bytes --]
On Mon, Aug 06, 2012 at 06:13:46PM +0200, Martin Jansa wrote:
> On Mon, Aug 06, 2012 at 04:33:06PM +0200, Martin Jansa wrote:
> > On Mon, Aug 06, 2012 at 04:25:58PM +0200, Koen Kooi wrote:
> > > -----BEGIN PGP SIGNED MESSAGE-----
> > > Hash: SHA1
> > >
> > > Op 06-08-12 15:37, Martin Jansa schreef:
> > > > * variable allows to add items in .bbappend without overwritting whole
> > > > postinst * hwclock.service should be used to blacklist SYSV hwclock.sh
> > > > (not hwclock.sh.service) * show only newly disabled SYSV scripts
> > > >
> > > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---
> > > > .../recipes-core/systemd/systemd-compat-units.bb | 19
> > > > ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-)
> > > >
> > > > diff --git a/meta-systemd/recipes-core/systemd/systemd-compat-units.bb
> > > > b/meta-systemd/recipes-core/systemd/systemd-compat-units.bb index
> > > > c9a6b67..2973208 100644 ---
> > > > a/meta-systemd/recipes-core/systemd/systemd-compat-units.bb +++
> > > > b/meta-systemd/recipes-core/systemd/systemd-compat-units.bb @@ -3,7 +3,7
> > > > @@ DESCRIPTION = "Units to make systemd work better with existing
> > > > sysvinit scripts" LICENSE = "MIT" LIC_FILES_CHKSUM =
> > > > "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
> > > >
> > > > -PR = "r15" +PR = "r16"
> > > >
> > > > inherit allarch
> > > >
> > > > @@ -26,15 +26,24 @@ do_install() { chmod 0755 ${D}${bindir}/runlevel }
> > > >
> > > > +SYSTEMD_DISABLED_SYSV_SERVICES = " \ + busybox-udhcpc \ + dnsmasq \ +
> > > > hwclock \ + networking \ + syslog \ + syslog.busybox \ +" +
> > > > pkg_postinst_${PN} () { cd $D${sysconfdir}/init.d
> > > >
> > > > echo -n "Disabling the following sysv scripts: "
> > > >
> > > > -for i in busybox-udhcpc dnsmasq hwclock.sh networking syslog
> > > > syslog.busybox ; do - if [ -e $i ] ; then - echo -n "$i " ; ln -s
> > > > /dev/null $D${systemd_unitdir}/system/$i.service - fi +for i in
> > > > ${SYSTEMD_DISABLED_SYSV_SERVICES} ; do + if [ \( -e $i -o $i.sh \) -a
> > > > ! -e $D${base_libdir}/systemd/system/$i.service ] ; then + echo -n
> > > > "$i " ; ln -s /dev/null $D${base_libdir}/systemd/system/$i.service +
> > > > fi done ; echo }
> > >
> > > Doing something like this should work a bit better:
> > >
> > > for i in ${SYSTEMD_DISABLED_SYSV_SERVICES} ; do
> > > systemctl mask $i
> > > done
> >
> > Thanks for info.
> >
> > It needs .service suffis so
> > systemctl mask $i.service
> >
> > and I'll send v2 after testing if this works also in do_rootfs time.
>
> Doesn't seem to work in do_rootfs
> http://git.shr-project.org/git/?p=buildhistory.git;a=commitdiff;h=0a30b3b26081ab6f543d280874c2ecff43cbe0fa
> http://git.shr-project.org/git/?p=buildhistory.git;a=commitdiff;h=7b690a71c50e07a685fb31ef4a5295fdb5c2f853
> but no error in log.do_rootfs
>
> Configuring systemd-speed-hacks.
> Configuring systemd-compat-units.
> Configuring udev-extraconf.
>
> (even the line "Disabling the following sysv scripts:" is missing,
> weird)
Oh it was a lot above Configuring lines..
Disabling the following sysv scripts: Started
/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/systemctl mask
busybox-udhcpc.service
'mask' is an unkown option; exiting with error
Started /OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/systemctl
mask dnsmasq.service
'mask' is an unkown option; exiting with error
So it needs to extend
meta-openembedded/meta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl
to support mask operation first.. which would mean to move this "ln -s"
logic there, which would be better in follow-up patch IMHO.
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 1/2] systemd-systemctl-native: extend systemctl wrapper to support mask action
2012-08-06 16:19 ` Martin Jansa
@ 2012-08-06 22:12 ` Martin Jansa
2012-08-06 22:12 ` [PATCH 2/2] systemd-compat-units: use systemctl mask Martin Jansa
2012-08-06 22:26 ` [PATCHv2 1/2] systemd-systemctl-native: extend systemctl wrapper to support mask action Martin Jansa
0 siblings, 2 replies; 22+ messages in thread
From: Martin Jansa @ 2012-08-06 22:12 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../systemd/systemd-systemctl-native.bb | 2 +-
.../systemd/systemd-systemctl-native/systemctl | 18 ++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/meta-systemd/recipes-core/systemd/systemd-systemctl-native.bb b/meta-systemd/recipes-core/systemd/systemd-systemctl-native.bb
index 7ca77ae..5f23e98 100644
--- a/meta-systemd/recipes-core/systemd/systemd-systemctl-native.bb
+++ b/meta-systemd/recipes-core/systemd/systemd-systemctl-native.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Wrapper to enable of systemd services"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-PR = "r3"
+PR = "r4"
inherit native
diff --git a/meta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl b/meta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl
index ff9e6a7..bdd01ef 100755
--- a/meta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl
+++ b/meta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl
@@ -25,6 +25,14 @@ while [ $# != 0 ]; do
cmd_args="1"
shift
;;
+ mask)
+ shift
+
+ action="$opt"
+ services="$1"
+ cmd_args="1"
+ shift
+ ;;
--root=*)
ROOT=${opt##--root=}
cmd_args="0"
@@ -43,6 +51,16 @@ while [ $# != 0 ]; do
done
for service in $services; do
+ if [ "$action" = "mask" ]; then
+ if [ ! -d $ROOT/etc/systemd/system/ ]; then
+ mkdir -p $ROOT/etc/systemd/system/
+ fi
+ cmd="ln -s '/dev/null' '$ROOT/etc/systemd/system/$service'"
+ echo "$cmd"
+ $cmd
+ exit 0
+ fi
+
echo "Try to find location of $service..."
# find service file
for p in $ROOT/etc/systemd/system \
--
1.7.8.6
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 2/2] systemd-compat-units: use systemctl mask
2012-08-06 22:12 ` [PATCH 1/2] systemd-systemctl-native: extend systemctl wrapper to support mask action Martin Jansa
@ 2012-08-06 22:12 ` Martin Jansa
2012-08-06 22:26 ` [PATCHv2 1/2] systemd-systemctl-native: extend systemctl wrapper to support mask action Martin Jansa
1 sibling, 0 replies; 22+ messages in thread
From: Martin Jansa @ 2012-08-06 22:12 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../recipes-core/systemd/systemd-compat-units.bb | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/meta-systemd/recipes-core/systemd/systemd-compat-units.bb b/meta-systemd/recipes-core/systemd/systemd-compat-units.bb
index 2973208..aefd6a7 100644
--- a/meta-systemd/recipes-core/systemd/systemd-compat-units.bb
+++ b/meta-systemd/recipes-core/systemd/systemd-compat-units.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Units to make systemd work better with existing sysvinit scripts"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-PR = "r16"
+PR = "r17"
inherit allarch
@@ -38,11 +38,17 @@ SYSTEMD_DISABLED_SYSV_SERVICES = " \
pkg_postinst_${PN} () {
cd $D${sysconfdir}/init.d
-echo -n "Disabling the following sysv scripts: "
+echo "Disabling the following sysv scripts: "
+
+OPTS=""
+
+if [ -n "$D" ]; then
+ OPTS="--root=$D"
+fi
for i in ${SYSTEMD_DISABLED_SYSV_SERVICES} ; do
- if [ \( -e $i -o $i.sh \) -a ! -e $D${base_libdir}/systemd/system/$i.service ] ; then
- echo -n "$i " ; ln -s /dev/null $D${base_libdir}/systemd/system/$i.service
+ if [ \( -e $i -o $i.sh \) -a ! -e $D${sysconfdir}/systemd/system/$i.service ] ; then
+ echo -n "$i: " ; systemctl ${OPTS} mask $i.service
fi
done ; echo
}
--
1.7.8.6
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCHv2 1/2] systemd-systemctl-native: extend systemctl wrapper to support mask action
2012-08-06 22:12 ` [PATCH 1/2] systemd-systemctl-native: extend systemctl wrapper to support mask action Martin Jansa
2012-08-06 22:12 ` [PATCH 2/2] systemd-compat-units: use systemctl mask Martin Jansa
@ 2012-08-06 22:26 ` Martin Jansa
1 sibling, 0 replies; 22+ messages in thread
From: Martin Jansa @ 2012-08-06 22:26 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../systemd/systemd-systemctl-native.bb | 2 +-
.../systemd/systemd-systemctl-native/systemctl | 18 ++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/meta-systemd/recipes-core/systemd/systemd-systemctl-native.bb b/meta-systemd/recipes-core/systemd/systemd-systemctl-native.bb
index 7ca77ae..5f23e98 100644
--- a/meta-systemd/recipes-core/systemd/systemd-systemctl-native.bb
+++ b/meta-systemd/recipes-core/systemd/systemd-systemctl-native.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Wrapper to enable of systemd services"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-PR = "r3"
+PR = "r4"
inherit native
diff --git a/meta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl b/meta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl
index ff9e6a7..a5bd770 100755
--- a/meta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl
+++ b/meta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl
@@ -25,6 +25,14 @@ while [ $# != 0 ]; do
cmd_args="1"
shift
;;
+ mask)
+ shift
+
+ action="$opt"
+ services="$1"
+ cmd_args="1"
+ shift
+ ;;
--root=*)
ROOT=${opt##--root=}
cmd_args="0"
@@ -43,6 +51,16 @@ while [ $# != 0 ]; do
done
for service in $services; do
+ if [ "$action" = "mask" ]; then
+ if [ ! -d $ROOT/etc/systemd/system/ ]; then
+ mkdir -p $ROOT/etc/systemd/system/
+ fi
+ cmd="ln -s /dev/null $ROOT/etc/systemd/system/$service"
+ echo "$cmd"
+ $cmd
+ exit 0
+ fi
+
echo "Try to find location of $service..."
# find service file
for p in $ROOT/etc/systemd/system \
--
1.7.8.6
^ permalink raw reply related [flat|nested] 22+ messages in thread
end of thread, other threads:[~2012-08-06 22:38 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-01 22:20 [meta-oe][PATCH 0/8] Merge some recipes from oe-classic and smaller fixes Martin Jansa
2012-08-01 22:20 ` [meta-oe][PATCH 1/8] fbreader: drop machine overrides Martin Jansa
2012-08-01 22:20 ` [meta-oe][PATCH 2/8] emacs: rename TUTORIAL.ko to TUTORIAL.KO so it's not picked by package.bbclass for striping Martin Jansa
2012-08-01 22:21 ` [meta-oe][PATCH 3/8] emacs: copy only needed stuff to qemu-treedir, not whole sysroot Martin Jansa
2012-08-01 22:21 ` [meta-oe][PATCH 4/8] phonet-utils: simplify with inherit autotools Martin Jansa
2012-08-01 22:21 ` [meta-oe][PATCH 5/8] sip: import from oe-classic and upgrade to latest Martin Jansa
2012-08-01 22:21 ` [meta-oe][PATCH 6/8] python-sip: " Martin Jansa
2012-08-01 22:21 ` [meta-oe][PATCH 7/8] python-pyqt: import from oe-classic Martin Jansa
2012-08-01 22:21 ` [meta-oe][PATCH 8/8] anki: import from oe-classic and upgrade to latest Martin Jansa
2012-08-02 6:52 ` Martin Jansa
[not found] ` <cover.1343908599.git.Martin.Jansa@gmail.com>
2012-08-02 11:57 ` [meta-oe][PATCHv2 8/8] anki: import from oe-classic Martin Jansa
[not found] ` <cover.1344259248.git.Martin.Jansa@gmail.com>
2012-08-06 13:37 ` [meta-oe][PATCH 09/12] systemd-compat-units: move list of disabled services to variable, fix hwclock.sh and output Martin Jansa
2012-08-06 14:25 ` Koen Kooi
2012-08-06 14:33 ` Martin Jansa
2012-08-06 16:13 ` Martin Jansa
2012-08-06 16:19 ` Martin Jansa
2012-08-06 22:12 ` [PATCH 1/2] systemd-systemctl-native: extend systemctl wrapper to support mask action Martin Jansa
2012-08-06 22:12 ` [PATCH 2/2] systemd-compat-units: use systemctl mask Martin Jansa
2012-08-06 22:26 ` [PATCHv2 1/2] systemd-systemctl-native: extend systemctl wrapper to support mask action Martin Jansa
2012-08-06 13:37 ` [meta-oe][PATCH 10/12] mplayer2: enable speex Martin Jansa
2012-08-06 13:37 ` [meta-oe][PATCH 11/12] php: inherit pythonnative Martin Jansa
2012-08-06 13:37 ` [meta-oe][PATCH 12/12] php: add build-defs.h to SSTATE_SCAN_FILES it defines path to sysroot where pear.conf is later created Martin Jansa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.