Merge some recipes from oe-classic and smaller fixes

PATCH In review Martin Jansa 2 participants 22 messages Aug 1, 2012 – Aug 6, 2012

lore

Share & tools

lore

Martin Jansa

author

2012-08-01 22:32 UTC #0 lore raw

cover Merge some recipes from oe-classic and smaller fixes

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

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-08-01 22:33 UTC #1 lore raw

PATCH 1/8 fbreader: drop machine overrides

* sorry forgot to move them to .bbappend before merging to meta-oe

Signed-off-by Martin Jansa <[email protected]>

---
 .../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(-)

meta-oe/recipes-support/fbreader/fbreader_0.12.10.bb +0 -5

index 40fc631..4786846 100644
@@ -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/"

meta-oe/recipes-support/fbreader/fbreader_git.bb +0 -4

index 8baec79..937bdc8 100644
@@ -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/"

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-08-01 22:33 UTC #2 lore raw

PATCH 2/8 emacs: rename TUTORIAL.ko to TUTORIAL.KO so it's not picked by package.bbclass for striping

In reply to Martin Jansa

* with http://patchwork.openembedded.org/patch/33365/ it's not fatal but still anoying

Signed-off-by Martin Jansa <[email protected]>

---
 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(-)

meta-oe/recipes-support/emacs/emacs.inc +6 -0

index f6cd461..150658e 100644
@@ -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}"'

meta-oe/recipes-support/emacs/emacs_23.4.bb +2 -0

index 625a4b9..65cc3a3 100644
@@ -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 \

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-08-01 22:33 UTC #3 lore raw

PATCH 3/8 emacs: copy only needed stuff to qemu-treedir, not whole sysroot

In reply to Martin Jansa

* 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 <[email protected]>

---
 meta-oe/recipes-support/emacs/emacs.inc |   74 ++++++++++++++++++++++++++----
 1 files changed, 64 insertions(+), 10 deletions(-)

meta-oe/recipes-support/emacs/emacs.inc +64 ~~-10~~

index 150658e..61761e8 100644
@@ -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
 }

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-08-01 22:33 UTC #4 lore raw

PATCH 4/8 phonet-utils: simplify with inherit autotools

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 .../phonet-utils/phonet-utils_git.bb               |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

meta-oe/recipes-connectivity/phonet-utils/phonet-utils_git.bb +2 -8

index 9a3310e..f5bd1cf 100644
@@ -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"

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-08-01 22:33 UTC #5 lore raw

PATCH 5/8 sip: import from oe-classic and upgrade to latest

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 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

meta-oe/recipes-extended/sip/sip-native_4.13.3.bb new file +33 -0

new file mode 100644
index 0000000..2ef10bf
@@ -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}
+}

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-08-01 22:33 UTC #6 lore raw

PATCH 6/8 python-sip: import from oe-classic and upgrade to latest

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 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

meta-oe/recipes-devtools/python/python-sip.inc new file +42 -0

new file mode 100644
index 0000000..19abbba
@@ -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"
+

meta-oe/recipes-devtools/python/python-sip_4.13.3.bb new file +1 -0

new file mode 100644
index 0000000..b1bda92
@@ -0,0 +1 @@
+require python-sip.inc

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-08-01 22:33 UTC #7 lore raw

PATCH 7/8 python-pyqt: import from oe-classic

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 .../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

meta-oe/recipes-devtools/python/python-pyqt-4.8.4/assistantclient-fix.patch new file +13 -0

new file mode 100644
index 0000000..15f83d2
@@ -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

meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_qthelp_ftbfs.diff new file +15 -0

new file mode 100644
index 0000000..e7a6882
@@ -0,0 +1,15 @@
+Description: Fix QtHelp FTBFS with ld --no-add-needed.
+Author: Felix Geyer <[email protected]>
+
+--- 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()")

meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_the_QAssitant_ftbfs.diff new file +29 -0

new file mode 100644
index 0000000..96e3062
@@ -0,0 +1,29 @@
+From aa85ab2be6be7cb3c4df68139a8271fc4c8c11c8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <[email protected]>
+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
+

meta-oe/recipes-devtools/python/python-pyqt-4.8.4/pyqt-generated.patch new file +24 -0

new file mode 100644
index 0000000..0af5549
@@ -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

meta-oe/recipes-devtools/python/python-pyqt-4.8.4/qreal_float_support.diff new file +248 -0

248 lines not on this page · raw message

meta-oe/recipes-devtools/python/python-pyqt_4.8.4.bb new file +115 -0

115 lines not on this page · raw message

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-08-01 22:33 UTC #8 lore raw

PATCH 8/8 anki: import from oe-classic and upgrade to latest

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 .../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

meta-oe/recipes-extended/anki/anki-1.2.11/no-need-for-pyqt-at-buildtime.patch new file +23 -0

new file mode 100644
index 0000000..b9f984b
@@ -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/*/*/*']},

meta-oe/recipes-extended/anki/anki.inc new file +16 -0

new file mode 100644
index 0000000..50db4db
@@ -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"

meta-oe/recipes-extended/anki/anki_1.2.11.bb new file +4 -0

new file mode 100644
index 0000000..6518da8
@@ -0,0 +1,4 @@
+require anki.inc
+
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"

meta-oe/recipes-extended/anki/libanki-1.2.11/no-need-for-pyqt-at-buildtime.patch new file +14 -0

new file mode 100644
index 0000000..fa90eb4
@@ -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

meta-oe/recipes-extended/anki/libanki_1.2.11.bb new file +6 -0

new file mode 100644
index 0000000..92c251b
@@ -0,0 +1,6 @@
+require anki.inc
+
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=070ca3b3ac381b278fa104643f2c858d"
+
+S = "${WORKDIR}/anki-${PV}/libanki"

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-08-02 07:04 UTC #9 lore raw

Re: [meta-oe][PATCH 8/8] anki: import from oe-classic and upgrade to latest

Quoted 13 lines · Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 .../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.

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Martin Jansa

author

2012-08-02 12:08 UTC #10 lore raw

PATCH v2 8/8 anki: import from oe-classic

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 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

meta-oe/recipes-extended/anki/anki-0.4.3.inc new file +8 -0

new file mode 100644
index 0000000..072e7f1
@@ -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"

meta-oe/recipes-extended/anki/anki.inc new file +9 -0

new file mode 100644
index 0000000..3092539
@@ -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

meta-oe/recipes-extended/anki/anki/no-need-for-pyqt-at-buildtime.patch new file +28 -0

new file mode 100644
index 0000000..9eac1dc
@@ -0,0 +1,28 @@
+#
+# (C) Michael 'Mickey' Lauer <[email protected]>
+#
+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/*/*/*']},

meta-oe/recipes-extended/anki/anki_0.4.3.bb new file +4 -0

new file mode 100644
index 0000000..7943ce8
@@ -0,0 +1,4 @@
+require ${PN}-${PV}.inc
+
+RDEPENDS_${PN} = "python-pyqt python-sip libanki"
+RRECOMMENDS_${PN} = "virtual-japanese-font"

meta-oe/recipes-extended/anki/libanki/no-need-for-pyqt-at-buildtime.patch new file +14 -0

new file mode 100644
index 0000000..92583e5
@@ -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

meta-oe/recipes-extended/anki/libanki_0.4.3.bb new file +3 -0

new file mode 100644
index 0000000..636932f
@@ -0,0 +1,3 @@
+require anki-${PV}.inc
+
+S = "${WORKDIR}/anki-${PV}/libanki"

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-08-06 13:48 UTC #11 lore raw

PATCH 9/12 systemd-compat-units: move list of disabled services to variable, fix hwclock.sh and output

In reply to Martin Jansa

* 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 <[email protected]>

---
 .../recipes-core/systemd/systemd-compat-units.bb   |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

meta-systemd/recipes-core/systemd/systemd-compat-units.bb +14 -5

index c9a6b67..2973208 100644
@@ -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
 }

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-08-06 13:49 UTC #12 lore raw

PATCH 10/12 mplayer2: enable speex

Signed-off-by Martin Jansa <[email protected]>

---
 meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb +5 -3

index 0b73d57..e2aadf5 100644
@@ -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 \

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-08-06 13:49 UTC #13 lore raw

PATCH 11/12 php: inherit pythonnative

In reply to Martin Jansa

* 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 <[email protected]>

---
 meta-oe/recipes-devtools/php/php.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta-oe/recipes-devtools/php/php.inc +1 -1

index 7f2dc45..7c03798 100644
@@ -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"

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-08-06 13:49 UTC #14 lore raw

PATCH 12/12 php: add build-defs.h to SSTATE_SCAN_FILES it defines path to sysroot where pear.conf is later created

In reply to Martin Jansa

* 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 <[email protected]>

---
 meta-oe/recipes-devtools/php/php.inc |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

meta-oe/recipes-devtools/php/php.inc +3 -1

index 7c03798..320696c 100644
@@ -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 \

Signature · 1 line

1.7.8.6

Koen Kooi

2012-08-06 14:37 UTC #15 lore raw

Re: [meta-oe][PATCH 09/12] systemd-compat-units: move list of disabled services to variable, fix hwclock.sh and output

In reply to Martin Jansa

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 06-08-12 15:37, Martin Jansa schreef:

Quoted 29 lines

* 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 <[email protected]> ---
.../recipes-core/systemd/systemd-compat-units.bb | 19
++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-)
(quoted diff) +0 -0
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
(quoted diff) +1 -0
@@ -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: "

Quoted 7 lines

-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-----

Martin Jansa

author

2012-08-06 14:44 UTC #16 lore raw

Re: [meta-oe][PATCH 09/12] systemd-compat-units: move list of disabled services to variable, fix hwclock.sh and output

Quoted 43 lines · Koen Kooi

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 06-08-12 15:37, Martin Jansa schreef:
Quoted 29 lines
* 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 <[email protected]> ---
.../recipes-core/systemd/systemd-compat-units.bb | 19
++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-)
(quoted diff) +0 -0
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
(quoted diff) +1 -0
@@ -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: "
Quoted 7 lines
-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:

Quoted 3 lines

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,

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Martin Jansa

author

2012-08-06 16:25 UTC #17 lore raw

Re: [meta-oe][PATCH 09/12] systemd-compat-units: move list of disabled services to variable, fix hwclock.sh and output

Quoted 48 lines · Martin Jansa

Quoted 43 lines · Koen Kooi
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 06-08-12 15:37, Martin Jansa schreef:
Quoted 29 lines
* 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 <[email protected]> ---
.../recipes-core/systemd/systemd-compat-units.bb | 19
++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-)
(quoted diff) +0 -0
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
(quoted diff) +1 -0
@@ -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: "
Quoted 7 lines
-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:
Quoted 3 lines
for i in ${SYSTEMD_DISABLED_SYSV_SERVICES} ; do
systemctl mask $i
done

Quoted 6 lines

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,

Quoted 8 lines

Or you can merge this pull request and I'll send thich change as follow-up after testing.
Cheers,
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Martin Jansa

author

2012-08-06 16:31 UTC #18 lore raw

Re: [meta-oe][PATCH 09/12] systemd-compat-units: move list of disabled services to variable, fix hwclock.sh and output

Quoted 61 lines · Martin Jansa

Quoted 48 lines · Martin Jansa
Quoted 43 lines · Koen Kooi
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 06-08-12 15:37, Martin Jansa schreef:
Quoted 29 lines
* 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 <[email protected]> ---
.../recipes-core/systemd/systemd-compat-units.bb | 19
++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-)
(quoted diff) +0 -0
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
(quoted diff) +1 -0
@@ -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: "
Quoted 7 lines
-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:
Quoted 3 lines
for i in ${SYSTEMD_DISABLED_SYSV_SERVICES} ; do
systemctl mask $i
done
Quoted 6 lines
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

Quoted 6 lines

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.

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Martin Jansa

author

2012-08-06 22:24 UTC #19 lore raw

PATCH 1/2 systemd-systemctl-native: extend systemctl wrapper to support mask action

Signed-off-by Martin Jansa <[email protected]>

---
 .../systemd/systemd-systemctl-native.bb            |    2 +-
 .../systemd/systemd-systemctl-native/systemctl     |   18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)

meta-systemd/recipes-core/systemd/systemd-systemctl-native.bb +1 -1

index 7ca77ae..5f23e98 100644
@@ -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

meta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl +18 -0

index ff9e6a7..bdd01ef 100755
@@ -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 \

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-08-06 22:24 UTC #20 lore raw

PATCH 2/2 systemd-compat-units: use systemctl mask

Signed-off-by Martin Jansa <[email protected]>

---
 .../recipes-core/systemd/systemd-compat-units.bb   |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

meta-systemd/recipes-core/systemd/systemd-compat-units.bb +10 -4

index 2973208..aefd6a7 100644
@@ -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
 }

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-08-06 22:38 UTC #21 lore raw

PATCH v2 1/2 systemd-systemctl-native: extend systemctl wrapper to support mask action

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 .../systemd/systemd-systemctl-native.bb            |    2 +-
 .../systemd/systemd-systemctl-native/systemctl     |   18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)

meta-systemd/recipes-core/systemd/systemd-systemctl-native.bb +1 -1

index 7ca77ae..5f23e98 100644
@@ -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

meta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl +18 -0

index ff9e6a7..a5bd770 100755
@@ -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 \

Signature · 1 line

1.7.8.6