From 83e703f70646ab84a9ed4b2677da5e5f6ed38dbe Mon Sep 17 00:00:00 2001 From: Martin Panter Date: Fri, 24 Dec 2010 19:59:02 +0000 Subject: xmlrpc-c_1.06.41.bb: QA issue with staging (workdir) for .la files in xmlrpc-c package I think I've solved this problem. Half of my solution is to modify the xmlrpc-c package's Make file to pass the library file names directly instead of using the "-L -l" method. The other half is to force it to use the newer Libtool version instead of its own. See patch #1 attached, though I'm not really an expert on Libtool or Open embedded, so I can't say if it might break something else, and I haven't even tested out the packages I built yet. Adds a patch to avoid using -L link flags, and forces the Make files to use a newer external Libtool. Fix do_configure to bypass reconfigure but still generate libtool Fix below messages NOTE: Multiple libraries (libxmlrpc_server_cgi.so.3, libxmlrpc_util.so.3, libxmlrpc_client.so.3, libxmlrpc_abyss.so.3, libxmlrpc_server_abyss.so.3, libxmlrpc_server.so.3, libxmlrpc.so.3) found and LEAD_SONAME not defined ERROR: QA Issue with xmlrpc-c: No GNU_HASH in the elf binary: '/scratch/oe/work/armv7a-oe-linux-gnueabi/xmlrpc-c-1.06.41-r1/packages-split/xmlrpc-c/usr/lib/libxmlrpc_server_cgi.so.3.6.15' Signed-off-by: Khem Raj Signed-off-by: Martin Panter --- recipes/xmlrpc-c/xmlrpc-c-1.06.41/lib-path.patch | 58 ++++++++++++++++++++++++ recipes/xmlrpc-c/xmlrpc-c_1.06.41.bb | 21 +++++++-- 2 files changed, 74 insertions(+), 5 deletions(-) create mode 100644 recipes/xmlrpc-c/xmlrpc-c-1.06.41/lib-path.patch diff --git a/recipes/xmlrpc-c/xmlrpc-c-1.06.41/lib-path.patch b/recipes/xmlrpc-c/xmlrpc-c-1.06.41/lib-path.patch new file mode 100644 index 0000000000..1ec148b749 --- /dev/null +++ b/recipes/xmlrpc-c/xmlrpc-c-1.06.41/lib-path.patch @@ -0,0 +1,58 @@ +Don't use build directories in the library search path because it apparently +causes Libtool to hard-code the build directories inside installed .la files, +triggering "QA issues". Use with newer Libtool. +--- xmlrpc-c-1.06.41/src/Makefile ++++ xmlrpc-c-1.06.41/src/Makefile +@@ -7,8 +7,8 @@ VPATH = .:$(SRCDIR) + + include $(BUILDDIR)/Makefile.config + +-ABYSS_LIBDIR = $(BUILDDIR)/lib/abyss/src/.libs +-LIBUTIL_LIBDIR = $(BUILDDIR)/lib/libutil/.libs ++ABYSS_LIB = $(BUILDDIR)/lib/abyss/src/libxmlrpc_abyss.la ++LIBUTIL_LIB = $(BUILDDIR)/lib/libutil/libxmlrpc_util.la + + default: all + +@@ -70,17 +70,17 @@ endif + # may require the necessary -L options in addition. + + LIBXMLRPC_CLIENT_OBJS = xmlrpc_client.lo xmlrpc_client_global.lo +-LIBXMLRPC_CLIENT_LIBDEP = -lxmlrpc_util -lxmlrpc ++LIBXMLRPC_CLIENT_LIBDEP = $(LIBUTIL_LIB) libxmlrpc.la + + LIBXMLRPC_SERVER_OBJS = registry.lo system_method.lo +-LIBXMLRPC_SERVER_LIBDEP = -lxmlrpc_util -lxmlrpc ++LIBXMLRPC_SERVER_LIBDEP = $(LIBUTIL_LIB) libxmlrpc.la + + LIBXMLRPC_SERVER_ABYSS_OBJS = xmlrpc_server_abyss.lo + LIBXMLRPC_SERVER_ABYSS_LIBDEP = \ +- -lxmlrpc_util -lxmlrpc_server -L$(ABYSS_LIBDIR) -lxmlrpc_abyss -lxmlrpc ++ $(LIBUTIL_LIB) libxmlrpc_server.la $(ABYSS_LIB) libxmlrpc.la + + LIBXMLRPC_SERVER_CGI_OBJS = xmlrpc_server_cgi.lo +-LIBXMLRPC_SERVER_CGI_LIBDEP = -lxmlrpc_util -lxmlrpc_server -lxmlrpc ++LIBXMLRPC_SERVER_CGI_LIBDEP = $(LIBUTIL_LIB) libxmlrpc_server.la libxmlrpc.la + + LIBXMLRPC_OBJS = \ + trace.lo \ +@@ -96,7 +96,7 @@ LIBXMLRPC_OBJS = \ + xmlrpc_utf8.lo \ + xmlrpc_authcookie.lo \ + +-LIBXMLRPC_LIBDEP = -lxmlrpc_util $(LIBXML_LIBS) ++LIBXMLRPC_LIBDEP = $(LIBUTIL_LIB) $(LIBXML_LIBS) + + LIB_OBJS = $(LIBXMLRPC_CLIENT_OBJS) $(LIBXMLRPC_SERVER_OBJS) + +@@ -133,9 +133,7 @@ all: $(TARGET_LTLIBRARIES) $(SUBDIRS:%=% + + LDFLAGS = $(LADD) + +-LIBPATHS = -L.libs -L$(LIBUTIL_LIBDIR) +- +-LIBLDFLAGS = $(LDFLAGS_VERSINFO) -rpath $(LIBINST_DIR) $(LIBPATHS) $(LADD) ++LIBLDFLAGS = $(LDFLAGS_VERSINFO) -rpath $(LIBINST_DIR) $(LADD) + + + libxmlrpc.la: $(LIBXMLRPC_OBJS) diff --git a/recipes/xmlrpc-c/xmlrpc-c_1.06.41.bb b/recipes/xmlrpc-c/xmlrpc-c_1.06.41.bb index e9bbc312e8..3cd817920f 100644 --- a/recipes/xmlrpc-c/xmlrpc-c_1.06.41.bb +++ b/recipes/xmlrpc-c/xmlrpc-c_1.06.41.bb @@ -2,24 +2,35 @@ DESCRIPTION = "XML-RPC for C/C++ is programming libraries and related tools to h write an XML-RPC server or client in C or C++." LICENSE = "GPLv2+" DEPENDS = "curl libxml2" -PR = "r1" - +PR = "r2" +LEAD_SONAME = "libxmlrpc.so.3" # note: this is version 1.06.47 # there seems to be versions with higher numbers (e.g. 1.11.00) # but these are actually not newer EXTRA_OECONF = " --enable-libxml2-backend -disable-libwww-client" +TARGET_CC_ARCH += "${LDFLAGS}" + PARALLEL_MAKE = "" inherit autotools binconfig -do_configure () { - gnu-configize +do_configure() { + # no autoreconf please + aclocal + autoconf + libtoolize --force + gnu-configize --force oe_runconf } +do_compile_prepend () { + (cd ${S}; ln -s ${HOST_SYS}-libtool libtool) +} -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tgz" +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tgz \ + file://lib-path.patch \ +" SRC_URI[md5sum] = "02c6b89b8ff911341b6b6d4a6c621ea9" SRC_URI[sha256sum] = "a13f5ef40ed75d89543b9cd086185121dead9fc7de850ca4d2edd9a0cec12205" -- cgit 1.2.3-korg From fb05130c3b94773a93851284385894a9976650ff Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sat, 25 Dec 2010 14:21:31 -0600 Subject: SlugOS: expand features list to keep pace with changes to recipes, also bump SlugOS release number. --- conf/distro/include/slugos.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index c2a380dcd2..bbfd907768 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -16,7 +16,7 @@ #TARGET_OS "linux" or "linux-uclibc" # The following may be overridden to make sub-versions -SLUGOS_VERSION = "5.5" +SLUGOS_VERSION = "5.6" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): @@ -30,7 +30,9 @@ THUMB_INTERWORK = "yes" # arm system and vice versa. It is strongly recommended that DISTROs not # turn this off - the actual cost is very small. # We want images supporting the following features (for task-base) -DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbgadget usbhost pci" +DISTRO_FEATURES = "largefile ipv4 ipv6 nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbhost pci" +# We may also wish to enable raid support at some point (space permitting) +#DISTRO_FEATURES += " raid" # Add thumb-interwork to feature list if selected machine supports it. DISTRO_FEATURES += ' ${@["", "thumb-interwork"][bb.data.getVar('THUMB_INTERWORK', d, 1) == "yes"]}' -- cgit 1.2.3-korg From c1085f71fcbdf5a07f5e6493e7425716c6013459 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sat, 25 Dec 2010 14:23:26 -0600 Subject: SlugOS: task-slugos-toolchain-target - restructure for eglibc and fix to avoid package conflicts. (Note that the result is not tested yet; this change seeks only to make it build and package cleanly.) --- recipes/tasks/task-slugos-toolchain-target.bb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/recipes/tasks/task-slugos-toolchain-target.bb b/recipes/tasks/task-slugos-toolchain-target.bb index fb0418fe29..06b3b61e5f 100644 --- a/recipes/tasks/task-slugos-toolchain-target.bb +++ b/recipes/tasks/task-slugos-toolchain-target.bb @@ -2,19 +2,17 @@ DESCRIPTION = "Packages for a standalone SDK or external toolchain" LICENSE = "MIT" ALLOW_EMPTY = "1" -PR = "r3" +PR = "r3.2" PACKAGES = "${PN}" -DEPENDS = "task-sdk-bare" - # This is a starting point, and nothing more at present -- please fill # this out with a reasonable set of development tools for a SlugOS image. # Also feel free to remove stuff that's silly. RDEPENDS_${PN} = "\ - task-sdk-bare \ - linux-libc-headers-dev \ + eglibc eglibc-dbg eglibc-utils eglibc-dev eglibc-thread-db libsegfault \ + libgcc libstdc++ libstdc++-dev \ libssl \ libcrypto \ openssl-dev \ -- cgit 1.2.3-korg From f27ed804ca22aaee28c0995fa1fdd15306e0471e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 24 Dec 2010 19:37:13 +0100 Subject: sip-native: add 4.12 Signed-off-by: Koen Kooi --- recipes/sip/sip-native_4.12.bb | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 recipes/sip/sip-native_4.12.bb diff --git a/recipes/sip/sip-native_4.12.bb b/recipes/sip/sip-native_4.12.bb new file mode 100644 index 0000000000..47e870864b --- /dev/null +++ b/recipes/sip/sip-native_4.12.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "SIP is a C++/Python Wrapper Generator" +AUTHOR = "Phil Thompson" +HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip" +SECTION = "devel" +PRIORITY = "optional" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/sip-${PV}.tar.gz" +SRC_URI[md5sum] = "8a0998fbaf34bdab2c15af3d4fa3bc0e" +SRC_URI[sha256sum] = "9a0d24aec5328fd038be13f94de5c710b767caeb1dfd869e52c69d98b8656168" + +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 + cd ${WORKDIR}/sip-${PV} && python configure.py + install -d ${D}${PYTHON_SITEPACKAGES_DIR} + install -m 0755 sip*.py ${D}${PYTHON_SITEPACKAGES_DIR} +} + +DEFAULT_PREFERENCE = "-1" +NATIVE_INSTALL_WORKS = "1" -- cgit 1.2.3-korg From 8a44e2b59d3616a99b6c827ee042807fd8ab4ed8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 25 Dec 2010 15:28:18 +0100 Subject: qmake2: also define OE_QMAKE_AR in the environment files Signed-off-by: Koen Kooi --- recipes/qmake/qmake2.inc | 2 +- recipes/qmake/qmake2_2.10a.bb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/qmake/qmake2.inc b/recipes/qmake/qmake2.inc index 2e78a44281..f2631b5f7e 100644 --- a/recipes/qmake/qmake2.inc +++ b/recipes/qmake/qmake2.inc @@ -3,7 +3,7 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" SECTION = "devel" LICENSE = "GPL" -PR = "r11" +PR = "r12" # We call 'moc' during the build DEPENDS = "qt4-tools-native" diff --git a/recipes/qmake/qmake2_2.10a.bb b/recipes/qmake/qmake2_2.10a.bb index d07f68baa5..77d909f8eb 100644 --- a/recipes/qmake/qmake2_2.10a.bb +++ b/recipes/qmake/qmake2_2.10a.bb @@ -18,6 +18,7 @@ do_install() { touch $script echo 'export QT_DIR_NAME=qtopia' >> $script echo 'export QT_LIBINFIX=E' >> $script + echo 'export OE_QMAKE_AR=ar' >> $script echo 'export OE_QMAKE_CC=gcc' >> $script echo 'export OE_QMAKE_CXX=g++' >> $script echo 'export OE_QMAKE_LINK=g++' >> $script @@ -34,6 +35,7 @@ do_install() { script="${D}/${datadir}/qt4/environment-setup" touch $script + echo 'export OE_QMAKE_AR=ar' >> $script echo 'export OE_QMAKE_CC=gcc' >> $script echo 'export OE_QMAKE_CXX=g++' >> $script echo 'export OE_QMAKE_LINK=g++' >> $script -- cgit 1.2.3-korg From f118388495185c9469b69e68a6f9b7a2ebef17ef Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 25 Dec 2010 21:35:17 +0100 Subject: minimal: enable QA (as discussed on irc with Mickey) Signed-off-by: Frans Meulenbroeks --- conf/distro/minimal.conf | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index 5b92a3652b..c935080295 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -93,6 +93,17 @@ LIBC ?= "eglibc" require conf/distro/include/sane-toolchain.inc require conf/distro/include/arm-thumb.inc +############################################################################# +# QA +############################################################################# + +#run QA tests on builds and packages and log them +INHERIT += "insane" +QA_LOG = "1" + +#run QA tests on recipes +INHERIT += "recipe_sanity" + ############################################################################# # PREFERRED VERSIONS ############################################################################# -- cgit 1.2.3-korg From 8493126b6ec7027e8e4029c86f40f210213abe55 Mon Sep 17 00:00:00 2001 From: Marc Reilly Date: Wed, 22 Dec 2010 10:50:54 +0000 Subject: qextserialport: Add qextserialport recipe. Signed-off-by: Marc Reilly Signed-off-by: Khem Raj --- recipes/qextserialport/qextserialport-e_hg.bb | 4 ++++ recipes/qextserialport/qextserialport.inc | 18 ++++++++++++++++++ recipes/qextserialport/qextserialport_hg.bb | 4 ++++ 3 files changed, 26 insertions(+) create mode 100644 recipes/qextserialport/qextserialport-e_hg.bb create mode 100644 recipes/qextserialport/qextserialport.inc create mode 100644 recipes/qextserialport/qextserialport_hg.bb diff --git a/recipes/qextserialport/qextserialport-e_hg.bb b/recipes/qextserialport/qextserialport-e_hg.bb new file mode 100644 index 0000000000..f106ebd2a8 --- /dev/null +++ b/recipes/qextserialport/qextserialport-e_hg.bb @@ -0,0 +1,4 @@ +inherit qt4e + +require qextserialport.inc + diff --git a/recipes/qextserialport/qextserialport.inc b/recipes/qextserialport/qextserialport.inc new file mode 100644 index 0000000000..db82de3bf5 --- /dev/null +++ b/recipes/qextserialport/qextserialport.inc @@ -0,0 +1,18 @@ +DESCRIPTION = "Serial Port Library for Qt" +SECTION = "libs" +PRIORITY = "optional" + +PV = "0.0+${PR}+hg${SRCREV}" +PR = "r0" + +SRCREV = "default" +SRC_URI = "hg://qextserialport.googlecode.com/hg;rev=${SRCREV};module=qextserialport;proto=https" + +S = "${WORKDIR}/qextserialport" + +do_install() { + install -d ${D}${libdir} \ + ${D}${includedir} + oe_libinstall -so -C src/build libqextserialport ${D}${libdir} + cp -pPR src/*.h ${D}${includedir} +} diff --git a/recipes/qextserialport/qextserialport_hg.bb b/recipes/qextserialport/qextserialport_hg.bb new file mode 100644 index 0000000000..3464131a09 --- /dev/null +++ b/recipes/qextserialport/qextserialport_hg.bb @@ -0,0 +1,4 @@ +inherit qt4x11 + +require qextserialport.inc + -- cgit 1.2.3-korg From e2d3fd9d5518371366510c9f3115958e0d4d35db Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sun, 26 Dec 2010 09:47:56 +0100 Subject: vim:: elimiated applypatch task by renaming it to do_patch as patch was empty) Signed-off-by: Frans Meulenbroeks --- recipes/vim/vim_7.2.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/recipes/vim/vim_7.2.bb b/recipes/vim/vim_7.2.bb index 99a8e31fc1..6e1499197a 100644 --- a/recipes/vim/vim_7.2.bb +++ b/recipes/vim/vim_7.2.bb @@ -19,14 +19,12 @@ SRC_URI += "file://configure.in_remove_CC_quotes.patch;apply=no" SRC_URI += "file://vimrc" # we need to apply patches in other dir then ${S} -do_applypatch() { +do_patch() { cd ${WORKDIR}/vim${VIMVER} patch -p1 <${WORKDIR}/001-411.diff patch -p1 <${WORKDIR}/configure.in_remove_CC_quotes.patch } -addtask applypatch after do_unpack before do_patch - do_install_append() { install -m 0644 ${WORKDIR}/vimrc ${D}/${datadir}/vim } -- cgit 1.2.3-korg