onboard: Upgrade to 1.4.1
PATCH 1/4 onboard: Upgrade to 1.4.1
Signed-off-by Khem Raj <[email protected]>
---
.../recipes-support/onboard/{onboard_1.3.0.bb => onboard_1.4.1.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-gnome/recipes-support/onboard/{onboard_1.3.0.bb => onboard_1.4.1.bb} (72%)meta-gnome/recipes-support/onboard/onboard_1.4.1.bb renamed from meta-gnome/recipes-support/onboard/onboard_1.3.0.bb +3 -3
@@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING.GPL3;md5=8521fa4dd51909b407c5150498d34f4e" DEPENDS += "gtk+3 hunspell libcanberra libxkbfile dconf python3-distutils-extra-native intltool-native" -SRC_URI = "https://launchpad.net/onboard/1.3/${PV}/+download/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "8000df3e789512a90fcb227580fd60ff" -SRC_URI[sha256sum] = "fd74b54b8bd7a075cf5f6e1a8ca3e6de5cd2663507adb690d7b1a85e71afa2e4" +SRC_URI = "https://launchpad.net/onboard/1.4/${PV}/+download/${BPN}-${PV}.tar.gz" +SRC_URI[md5sum] = "1a2fbe82e934f5b37841d17ff51e80e8" +SRC_URI[sha256sum] = "01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865" inherit setuptools3 pkgconfig gtk-icon-cache gsettings
Signature · 1 line
2.13.0
PATCH 2/4 leveldb: Update to 1.20
package tests into a seprate package
package static libs as well
Update also fixes build with musl
Signed-off-by Khem Raj <[email protected]>
--- .../leveldb/0001-Explicitly-disable-tcmalloc.patch | 48 ---------------------- meta-oe/recipes-extended/leveldb/leveldb_git.bb | 19 ++++++--- 2 files changed, 13 insertions(+), 54 deletions(-) delete mode 100644 meta-oe/recipes-extended/leveldb/leveldb/0001-Explicitly-disable-tcmalloc.patch
meta-oe/recipes-extended/leveldb/leveldb/0001-Explicitly-disable-tcmalloc.patch deleted +0 -48
@@ -1,48 +0,0 @@ -From d6daac04dab4b3acf4b88f16742d1b402cdc3d83 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <[email protected]> -Date: Wed, 1 Oct 2014 18:54:04 +0200 -Subject: [PATCH] Explicitly disable tcmalloc - -Without this change leveldb autodetects tcmalloc from sysroot and -sometimes became dependant on gperftools - -Disable autodetection without TCMALLOC_ENABLED=true pased to make - -Upstream-Status: Pending -Signed-off-by: Martin Jansa <[email protected]> ---- - build_detect_platform | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) - -diff --git a/build_detect_platform b/build_detect_platform -index bb76c4f..a586364 100755 ---- a/build_detect_platform -+++ b/build_detect_platform -@@ -201,15 +201,17 @@ EOF - PLATFORM_LIBS="$PLATFORM_LIBS -lsnappy" - fi - -- # Test whether tcmalloc is available -- $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -ltcmalloc 2>/dev/null <<EOF -- int main() {} -+ if [ "$TCMALLOC_ENABLED" = "true" ]; then -+ # Test whether tcmalloc is available -+ $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -ltcmalloc 2>/dev/null <<EOF -+ int main() {} - EOF -- if [ "$?" = 0 ]; then -- PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc" -- fi -+ if [ "$?" = 0 ]; then -+ PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc" -+ fi - -- rm -f $CXXOUTPUT 2>/dev/null -+ rm -f $CXXOUTPUT 2>/dev/null -+ fi - fi - - PLATFORM_CCFLAGS="$PLATFORM_CCFLAGS $COMMON_FLAGS" --- -2.1.1 -
meta-oe/recipes-extended/leveldb/leveldb_git.bb +13 -6
@@ -4,15 +4,16 @@ HOMEPAGE = "http://leveldb.googlecode.com" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=92d1b128950b11ba8495b64938fc164d" -SRCREV = "803d69203a62faf50f1b77897310a3a1fcae712b" -PV = "1.18+git${SRCPV}" +SRCREV = "a53934a3ae1244679f812d998a4f16f2c7f309a6" +PV = "1.20+git${SRCPV}" SRC_URI = "git://github.com/google/${BPN}.git \ - file://0001-Explicitly-disable-tcmalloc.patch \ " S = "${WORKDIR}/git" +inherit utils + do_compile() { # do not use oe_runmake. oe_runmake pass to make compilation arguments and override # leveldb makefile variable CFLAGS and broke leveldb build.
@@ -20,8 +21,14 @@ do_compile() { } do_install() { - install -d ${D}${libdir} - oe_libinstall -C ${S} -so libleveldb ${D}${libdir} - install -d ${D}${includedir}/leveldb + install -d ${D}${libdir} ${D}${bindir} ${D}${includedir}/leveldb + oe_libinstall -C ${B}/out-shared libleveldb ${D}${libdir} + oe_libinstall -C ${S}/out-static libleveldb ${D}${libdir} + oe_libinstall -C ${S}/out-static libmemenv ${D}${libdir} + install -m 0755 ${B}/out-shared/db_bench ${D}${bindir} + install -m 0755 ${B}/out-static/*_test ${D}${bindir} install -m 644 ${S}/include/leveldb/*.h ${D}${includedir}/leveldb/ } + +PACKAGES =+ "${PN}-ptest" +FILES_${PN}-ptest = "${bindir}"
Signature · 1 line
2.13.0
PATCH 3/4 konkretcmpi: Update and fix build with latest oe-core
In reply to Khem RajDrop already upstreamed patch
Signed-off-by Khem Raj <[email protected]>
--- .../0001-drop-including-rpath-cmake-module.patch | 38 ++++++++++++++++++++++ ...-0.9.2-fix-returning-instance-from-method.patch | 38 ---------------------- .../konkretcmpi/konkretcmpi_0.9.2.bb | 4 +-- 3 files changed, 40 insertions(+), 40 deletions(-) create mode 100644 meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-drop-including-rpath-cmake-module.patch delete mode 100644 meta-oe/recipes-extended/konkretcmpi/konkretcmpi/konkretcmpi-0.9.2-fix-returning-instance-from-method.patch
meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-drop-including-rpath-cmake-module.patch new file +38 -0
@@ -0,0 +1,38 @@ +From 45e1c4c04a126d2386446775f99084bd603016af Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 1 Jun 2017 23:10:59 -0700 +Subject: [PATCH] drop including rpath cmake module + +Fixes cross compilation QA errors e.g. +/usr/lib/libkonkret.so.0.0.1 contains probably-redundant RPATH /usr/lib [useless-rpaths] + +Signed-off-by: Khem Raj <[email protected]> +--- + src/konkret/CMakeLists.txt | 1 - + src/program/CMakeLists.txt | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/src/konkret/CMakeLists.txt b/src/konkret/CMakeLists.txt +index c2faa40..df49e11 100644 +--- a/src/konkret/CMakeLists.txt ++++ b/src/konkret/CMakeLists.txt +@@ -8,7 +8,6 @@ set(konkret_SRCS + kstr.c + print.c + ) +-include(rpath) + include_directories(${CMPI_INCLUDE_DIR}) + + add_library(libkonkret SHARED ${konkret_SRCS}) +diff --git a/src/program/CMakeLists.txt b/src/program/CMakeLists.txt +index afcefe5..8a4646c 100644 +--- a/src/program/CMakeLists.txt ++++ b/src/program/CMakeLists.txt +@@ -1,4 +1,3 @@ +-include (rpath) + include_directories(${CMPI_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/src) + + add_executable(konkret main.cpp) +-- +2.13.0 +
meta-oe/recipes-extended/konkretcmpi/konkretcmpi/konkretcmpi-0.9.2-fix-returning-instance-from-method.patch deleted +0 -38
@@ -1,38 +0,0 @@ -Port from Fedora20 - - | commit aca6c7f910ffe9930b5789969f0adfadd668bb46 - | Author: Michal Minar <[email protected]> - | Date: Fri Jun 20 10:50:45 2014 +0200 - | - | Fix returning instance as an output argument from method - | - | Submitted By: Radek Novacek <[email protected]> - -Upstream-Status: Pending -Signed-off-by: Qian Lei <[email protected]> - -diff --git a/src/program/main.cpp b/src/program/main.cpp -index 885dc12..9e7108a 100644 ---- a/src/program/main.cpp -+++ b/src/program/main.cpp -@@ -506,7 +506,11 @@ static void gen_feature_decls( - - // Add sig entry [type][length][name][zero-terminator] - -- KTag tag = _ktag(pd->data_type, pd->array_index, key, false, false); -+ KTag tag; -+ if (pd->qualifiers->has_key("EmbeddedInstance")) -+ tag = _ktag(TOK_INSTANCE, pd->array_index, key, false, false); -+ else -+ tag = _ktag(pd->data_type, pd->array_index, key, false, false); - pack_tag(sig, tag); - pack_name(sig, pd->name); - count++; -@@ -640,6 +644,7 @@ static void gen_param(FILE* os, MOF_Parameter* p, vector<unsigned char>& sig) - const char* ktn = _ktype_name(p->data_type); - - if (p->qualifiers->has_key("EmbeddedInstance")) { -+ tag = _ktag(TOK_INSTANCE, p->array_index, false, in, out); - if (p->array_index) - put(os, " KInstanceA $0;\n", p->name, NULL); - else
meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb +2 -2
@@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f673270bfc350d9ce1efc8724c6c1873" DEPENDS = "swig-native sblim-cmpi-devel python" SRC_URI = "git://github.com/rnovacek/konkretcmpi.git \ - file://konkretcmpi-0.9.2-fix-returning-instance-from-method.patch \ file://0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch \ + file://0001-drop-including-rpath-cmake-module.patch \ " -SRCREV = "460e6421c16a8216d29ccd1b7490f814dab8b769" +SRCREV = "ad28225e6eceff88417a60c1ba8896c8e40f21a7" S = "${WORKDIR}/git" inherit cmake
Signature · 1 line
2.13.0
PATCH 4/4 proftpd: Update to 1.3.6 release
In reply to Khem RajUse the new gnu-config files for musl support
Signed-off-by Khem Raj <[email protected]>
---
.../proftpd/files/build_fixup.patch | 54 +++++++++++-----------
.../{proftpd_1.3.5b.bb => proftpd_1.3.6.bb} | 7 +--
2 files changed, 31 insertions(+), 30 deletions(-)
rename meta-networking/recipes-daemons/proftpd/{proftpd_1.3.5b.bb => proftpd_1.3.6.bb} (94%)meta-networking/recipes-daemons/proftpd/files/build_fixup.patch +27 -27
@@ -9,11 +9,11 @@ redefine PR_RUN_DIR as ${localstatedir}/run Signed-off-By: Armin Kuster <[email protected]> -Index: proftpd-1.3.5/Make.rules.in +Index: proftpd-1.3.6/Make.rules.in =================================================================== ---- proftpd-1.3.5.orig/Make.rules.in -+++ proftpd-1.3.5/Make.rules.in -@@ -29,9 +29,9 @@ INSTALL=@INSTALL@ +--- proftpd-1.3.6.orig/Make.rules.in ++++ proftpd-1.3.6/Make.rules.in +@@ -30,9 +30,9 @@ INSTALL=@INSTALL@ INSTALL_STRIP=@INSTALL_STRIP@ INSTALL_USER=@install_user@ INSTALL_GROUP=@install_group@
@@ -26,10 +26,10 @@ Index: proftpd-1.3.5/Make.rules.in RM=rm -f SHELL=@CONFIG_SHELL@ -Index: proftpd-1.3.5/Makefile.in +Index: proftpd-1.3.6/Makefile.in =================================================================== ---- proftpd-1.3.5.orig/Makefile.in -+++ proftpd-1.3.5/Makefile.in +--- proftpd-1.3.6.orig/Makefile.in ++++ proftpd-1.3.6/Makefile.in @@ -105,7 +105,6 @@ check: proftpd$(EXEEXT) $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libdir)/proftpd $(DESTDIR)$(libexecdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8: @if [ ! -d $@ ]; then \
@@ -60,11 +60,11 @@ Index: proftpd-1.3.5/Makefile.in $(top_srcdir)/sample-configurations/basic.conf \ $(DESTDIR)$(sysconfdir)/proftpd.conf ; \ fi -Index: proftpd-1.3.5/configure +Index: proftpd-1.3.6/configure =================================================================== ---- proftpd-1.3.5.orig/configure -+++ proftpd-1.3.5/configure -@@ -38255,7 +38255,7 @@ _ACEOF +--- proftpd-1.3.6.orig/configure ++++ proftpd-1.3.6/configure +@@ -41777,7 +41777,7 @@ _ACEOF cat >>confdefs.h <<_ACEOF
@@ -72,9 +72,9 @@ Index: proftpd-1.3.5/configure +#define PR_RUN_DIR "`eval echo "${localstatedir}"/run/`" _ACEOF - cat >>confdefs.h <<_ACEOF -@@ -38263,7 +38263,7 @@ cat >>confdefs.h <<_ACEOF - _ACEOF + +@@ -41787,7 +41787,7 @@ _ACEOF + cat >>confdefs.h <<_ACEOF -#define PR_PID_FILE_PATH "`eval echo "${localstatedir}/proftpd.pid"`"
@@ -82,25 +82,25 @@ Index: proftpd-1.3.5/configure _ACEOF -Index: proftpd-1.3.5/configure.in +Index: proftpd-1.3.6/configure.in =================================================================== ---- proftpd-1.3.5.orig/configure.in -+++ proftpd-1.3.5/configure.in -@@ -2971,8 +2971,8 @@ locale_dir="`eval echo ${locale_dir}`" - AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`") +--- proftpd-1.3.6.orig/configure.in ++++ proftpd-1.3.6/configure.in +@@ -3833,8 +3833,8 @@ locale_dir="`eval echo ${locale_dir}`" + AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`", [Define the locale directory]) - AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`") --AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`") --AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`") -+AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/run/proftpd.conf"`") -+AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/run/proftpd.pid"`") + AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`", [Define the run directory]) +-AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`", [Define the configuration file path]) +-AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`", [Define the PID file path]) ++AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/run/proftpd.conf"`", [Define the configuration file path]) ++AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/run/proftpd.pid"`", [Define the PID file path]) prefix="$pr_saved_prefix" exec_prefix="$pr_saved_exec_prefix" -Index: proftpd-1.3.5/lib/libcap/Makefile +Index: proftpd-1.3.6/lib/libcap/Makefile =================================================================== ---- proftpd-1.3.5.orig/lib/libcap/Makefile -+++ proftpd-1.3.5/lib/libcap/Makefile +--- proftpd-1.3.6.orig/lib/libcap/Makefile ++++ proftpd-1.3.6/lib/libcap/Makefile @@ -26,7 +26,7 @@ OBJS=$(addsuffix .o, $(FILES)) all: $(LIBNAME)
meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb renamed from meta-networking/recipes-daemons/proftpd/proftpd_1.3.5b.bb +4 -3
@@ -13,9 +13,8 @@ SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \ file://build_fixup.patch \ file://proftpd.service \ " - -SRC_URI[md5sum] = "f7b8e3a383b34a894c2502db74ccccde" -SRC_URI[sha256sum] = "afc1789f2478acf88dfdc7d70da90a4fa2786d628218e9574273295d044b4fc8" +iSRC_URI[md5sum] = "13270911c42aac842435f18205546a1b" +SRC_URI[sha256sum] = "91ef74b143495d5ff97c4d4770c6804072a8c8eb1ad1ecc8cc541b40e152ecaf" inherit autotools-brokensep useradd update-rc.d systemd
@@ -63,6 +62,8 @@ PACKAGECONFIG[auth] = "--enable-auth-file, --disable-auth-file" # proftpd uses libltdl which currently makes configuring using # autotools.bbclass a pain... do_configure () { + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} oe_runconf cp ${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool ${S}/libtool }
Signature · 1 line
2.13.0