From patchwork Fri Jun 2 06:50:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 100983 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp244196qge; Thu, 1 Jun 2017 23:50:37 -0700 (PDT) X-Received: by 10.99.113.90 with SMTP id b26mr5489769pgn.173.1496386237443; Thu, 01 Jun 2017 23:50:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496386237; cv=none; d=google.com; s=arc-20160816; b=on1MfStQzKMzER9BW3/Qj7OVNWQX5KTdIN+rapIMu4KxOrUhdpVr/37PlY5qMstqQ4 FMg/RYDHgweDkoOrMVOs26Vqw6UR92hCGQ9NgwN/iJRALJZVIA0UtTEjjkZ5tY2KCiZC oMJZSX3I1AKGEGDg1k4oeb9GdcGYc9Awvho5UjNsMsUh3yBZPZ/X/p6w2ov1sBXPiNXX ugfEe7CagHjvqatugLutOw1R5qORvU9Y8B6E0bvtXVQcXfMXq255jy5sRApP5EGbaqOf lKdcImnF6S2zOs6e7NU23cyRXEFvwhfzXS78Qluk4POjMeBL71wYyLjP5UWfYEvH+DPe Zjvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=UOaAnGfiTMRSUHZhqp1Oii/dtmQdlwaYwO5YPrAiRW0=; b=LqPnL0q6bOMxdif3NiSZqBNIZVAM4pyLs7tqCsOeCyIfaVD1UK8zz+rYN1olR0Lmm7 WJ+0KDTNa1BA0drmo3xwfSk/XYll0dO8bAhlgyleJ65JopSm1fKZ8MMnae/km4wFuDoK sMfH66Yhnhsu8KNjIZT+WdHw9U5EQODPHOK7nDcOkZ+A7y1W6LY2TOjL4PTSaiASZu9l dSPfOhuC+bt4Z90pGT2eYUXc9c4AZQOgBcx6byeX+QsKhmSNthaOY+DLn92vfSpYjtrs Kj+F4io91ow7ZYmfAcLkS8LWNC2QYVODBO57z5ivi/nhX7MR2iCr7zxXf3OlTZFvw1Pu t4WA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id x9si20269107pge.123.2017.06.01.23.50.37; Thu, 01 Jun 2017 23:50:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 5AC9E77E61; Fri, 2 Jun 2017 06:50:31 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by mail.openembedded.org (Postfix) with ESMTP id DDF9D77794 for ; Fri, 2 Jun 2017 06:50:27 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id u26so11733900pfd.2 for ; Thu, 01 Jun 2017 23:50:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=x/dXdV2cAk98dDy4PAzTIztc2SiM4YHj4iKIhs34XPU=; b=YLTQCAhLZd6oKDj8kDcOVE38bVpIjzy5sUb+7OoFPqe1azm/UHhRtMjh32P4o0B+E+ YcDZjH6Pc9pHmjP8nZJXBKv/8agjYbNKZBvgnZ3i5mI9kxC83Uuq5BQ8V9OA6HtDzjm4 epfNPz0ADD99jX1pLl6+J+05dJh3mpJE2kNNE27fIy4XwlQR7xTzW4oRIp2bqm+PDfq/ BVOE8oZGKaqMf2FJ1f/jxDpWMdJl3CctKYmJvf78gGKJbc7LPMNhm5+yGos7JRIphyl6 F/PuzaSnn44Q8X+T9oqBJSmSE7wXNkWKNFYgPdYs4bfAEXmXuPyqMGzbEy4h8ksglB0R VUXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=x/dXdV2cAk98dDy4PAzTIztc2SiM4YHj4iKIhs34XPU=; b=bOFM/LcUfsu14u/MT4uOxx5g8zhzDCJmMo+muMt4uNbe1z3dmb6UlCtQC5+b/tpZvY wz0TYtYX+8mGtP4Gf3P3r4YH3Gy35xbdMr8+Xlq6WoIW2rrQErSgyTlLPRlTtsSwEXOb gkMWMLvYpRGaVjb90XJ9PqTOQUur+krMn08J2DYeVToJWHWXVR1a2o0sLj9WIqiWsoCj yWdXcU7eEz6vPTrVgmcLIJmThuYWe/J9ogjbkwU85lXPvn65XRLP6ZhklZao0r6yQD7L yaQRzJx1/FL5qdqu6WT4Dbe1yxn8GsQIFUII4cocg5eWR3w0Eo9c938lRJrEBVJB1nb2 DnhA== X-Gm-Message-State: AODbwcDBP+N3OrLVH1wB9HX2UDexdpNM0gUkTZCb467BFBRRFC4huxiu 493YNWNTAkKptA== X-Received: by 10.84.164.106 with SMTP id m39mr43697706plg.58.1496386228959; Thu, 01 Jun 2017 23:50:28 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::cf4]) by smtp.gmail.com with ESMTPSA id a78sm43177369pfk.122.2017.06.01.23.50.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Jun 2017 23:50:27 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 1 Jun 2017 23:50:13 -0700 Message-Id: <20170602065016.27954-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.0 Subject: [oe] [meta-gnome][PATCH 1/4] onboard: Upgrade to 1.4.1 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../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%) -- 2.13.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-gnome/recipes-support/onboard/onboard_1.3.0.bb b/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb similarity index 72% rename from meta-gnome/recipes-support/onboard/onboard_1.3.0.bb rename to meta-gnome/recipes-support/onboard/onboard_1.4.1.bb index bdf0a4eb9..3a4f18971 100644 --- a/meta-gnome/recipes-support/onboard/onboard_1.3.0.bb +++ b/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb @@ -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 From patchwork Fri Jun 2 06:50:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 100984 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp244315qge; Thu, 1 Jun 2017 23:51:00 -0700 (PDT) X-Received: by 10.84.232.206 with SMTP id x14mr2700522plm.7.1496386260111; Thu, 01 Jun 2017 23:51:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496386260; cv=none; d=google.com; s=arc-20160816; b=rkJvAYaHa3TT3VRes5Cr1fMdNHBPq1pdH4ZFBQFMkxO0KIZcMBDWYppB8OO2yUwTuf jMG8fzHzUtvDOg1vTp8OCDZ8HGaRIXE1j8FgSQ0HrPVfvuH5q9qs/T9X7Ssiifhy6eO5 7vM6RCw8Lfb0GRuBxGJz/nLNxE8aLOmU+Ww+omBE+0ZsWf7mkEx9dnLcY1Er6cpcVY+D Ybuhi5kb36Iw78SMmD8WLsmTRc+LFVpLx2BxEZJ87f8l2rUdYFwufkiyc3UJ2tSn0/tC 5BI7KUgixbdDJsEw4RuTl6fl+XrDAsZVB3hoj+p8rrHzVXTjVikAD2TzR01/OT8HZ1N5 Sx3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=jZ3nxIryUOa2IgmXO9eBYUt/MCHaeAoC4HEjLxmazRE=; b=l6Yf26cb0ZVJOUgXeDRLUJnih1COQPAPEtO96OYjtllVMMU+4XO6cjos6Lviqr2nf0 4E6hAC18ltiirOlD9A0jTQulBmTgtELUL0pcrOCvGAiuz2yhGtmEr37xAL4M07Fg39+Y E0hogmnkHey66I/UKx6zm6I8cusOnbLae7CsvwAcs2VfGQDvvzsN5r52JGBU1KJkOyNL zYEn726qUX6ZZQ2Dy9oQBiYZbr4BfBZFPVg5h0UuV11XRI9JytjboJpKE25kKzvk0hS7 OFSju/wlz+QGYrSjJHpGPmyTeSupA1Np6Iq+6AtTItD33sc9NLj/QpKdH3OpRxh9CgqQ Dliw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id k26si588066pgf.36.2017.06.01.23.50.59; Thu, 01 Jun 2017 23:51:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id B0D9577E8D; Fri, 2 Jun 2017 06:50:56 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f173.google.com (mail-pf0-f173.google.com [209.85.192.173]) by mail.openembedded.org (Postfix) with ESMTP id 8E37D77794 for ; Fri, 2 Jun 2017 06:50:29 +0000 (UTC) Received: by mail-pf0-f173.google.com with SMTP id e193so48728202pfh.0 for ; Thu, 01 Jun 2017 23:50:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oq0iVMLePYcJ0qOJgw+CQH7fhbUloSG6RCUbhzm19PA=; b=PLwuyS87+ADe26631aZaSENJFhS8bFWfoLXDw24srJdTb84x3TQxzlTFB9sz4gMcY4 52ed/gOF7+WOthGqkgUE4Zt6SVjJL8R3gTGQHQ8hve+rai83z8EVZPs04CEcYcqO/3wN SpoRvTB5jMg0tzLTEuEz63Ta74xC63cgfMGs0tRyNkbL1gcB/ykwWdHpWFQ6JltcE1sa OEgdpdn6hntVBP1EndFPvdTgbaGa1Arcb4p79K42p98QlW5fbjhnf1dsBSEFwuHQh4fb 95bMxtD2YOZTzPYx92hOdDl9G6KwUup5du6gZ2xjiwnvRtrrffsXYoNia2OHsiVXRfiZ A/ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=oq0iVMLePYcJ0qOJgw+CQH7fhbUloSG6RCUbhzm19PA=; b=KkV2laJlpUTn0U9G5YAEIuBxC6NCz6odECvP88jgGyYzEOOv2F0mija/9JOgNsXGOP q4kwg6y5NzTlNO9rUfqDVtuVFosV2ClHa6VOOAcgea72YZicb04e495tE/TU68WvCo5h CmIRyuGDTDMhFpVBnOnhg5AV+x3tOKyVXdSjbBZoEJHzl0W/CaHNduyqWlbCxd5OZoVw hNZtFw8lP2mR0eahsNEot/z2MPtG3aI8/S56bFFKif82dcjIMDRNbo0zLjBCcG7nhfCu Whk/PG2PxVdpfH4/pmU0xg6OSdNJq9nIeReOkRdJg7FtVbdSRvWI8c3c8foLrmVbtZsJ GfXg== X-Gm-Message-State: AODbwcDDW1NXeoehebCACesZgT4AF47cBcIvC+KpVzyGkMNhFIV65xa+ FI3QMRzF3AGh1bvm X-Received: by 10.99.2.84 with SMTP id 81mr5534899pgc.19.1496386230291; Thu, 01 Jun 2017 23:50:30 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::cf4]) by smtp.gmail.com with ESMTPSA id a78sm43177369pfk.122.2017.06.01.23.50.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Jun 2017 23:50:29 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 1 Jun 2017 23:50:14 -0700 Message-Id: <20170602065016.27954-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170602065016.27954-1-raj.khem@gmail.com> References: <20170602065016.27954-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 2/4] leveldb: Update to 1.20 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org package tests into a seprate package package static libs as well Update also fixes build with musl Signed-off-by: Khem Raj --- .../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 -- 2.13.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/leveldb/leveldb/0001-Explicitly-disable-tcmalloc.patch b/meta-oe/recipes-extended/leveldb/leveldb/0001-Explicitly-disable-tcmalloc.patch deleted file mode 100644 index 4b76dd0c3..000000000 --- a/meta-oe/recipes-extended/leveldb/leveldb/0001-Explicitly-disable-tcmalloc.patch +++ /dev/null @@ -1,48 +0,0 @@ -From d6daac04dab4b3acf4b88f16742d1b402cdc3d83 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -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 ---- - 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 </dev/null </dev/null -+ rm -f $CXXOUTPUT 2>/dev/null -+ fi - fi - - PLATFORM_CCFLAGS="$PLATFORM_CCFLAGS $COMMON_FLAGS" --- -2.1.1 - diff --git a/meta-oe/recipes-extended/leveldb/leveldb_git.bb b/meta-oe/recipes-extended/leveldb/leveldb_git.bb index a6a302430..d44aa14d2 100644 --- a/meta-oe/recipes-extended/leveldb/leveldb_git.bb +++ b/meta-oe/recipes-extended/leveldb/leveldb_git.bb @@ -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}" From patchwork Fri Jun 2 06:50:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 100985 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp244365qge; Thu, 1 Jun 2017 23:51:07 -0700 (PDT) X-Received: by 10.84.232.76 with SMTP id f12mr6366604pln.87.1496386267271; Thu, 01 Jun 2017 23:51:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496386267; cv=none; d=google.com; s=arc-20160816; b=ck+6sBNbugAzEeaWUso1ZVZ3h+KpfrQ/0OuOvDY7jewL+eIIWn9UmM29qDTkUPNChF t8xUlB7ue5QB8AWYa3ue7FCwUsFEN6/hxc3yebVB1Udp77jp7NA4Z45tyn9o+UoTeyrv FOAwgtA2QoYlmPgZmY6JgkbHuLHSnKCTrAaqlM4wWkGkHTwVsGF3sTURi9x2RfG9K+mi OdsJDNJpccGecPQlRUwYnD+9V99tT5n1CfCD5PG6iw8DDxBEsPoOhGhZ52yS4q9e+Pdg cj8Kka6VMGGoR1G9Irg1ppRSk5Mq9aIvyu3OjAolewPPZadpZvUI6P0FATd+RSBrbQ4W /gHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=aGlc2HEqNDqtsBL9Evcz/yFS0a8rBvCj/+SnkmikO4s=; b=CKLa8WxczyJu+3VfekHM0EB1sXIJLIwzqmjSgD018M6AHztfWSA40uo/cIRMdNfOW0 k4zsLZNBtA7HulOmE8mG3X50kHXennoxSHFsiXoFAMN0vnDyN4UxeL9pRuSTgO2cyxIP o1bXauQjL/xS7P6FzagppoWHPI6qHeM5ZW4/tOGkD6VycB6k7AQAbDZXqeioL7o4dANn NS9rxagzsWG7BiKDe0XMKlFYXl4ORYEn5dk8kfaaUAZuFaiy9HdCqaul9A31z4xbbLwQ q/4XAvhKgMxyfFR2ZhbVl1nOCu7Q9efuaeB8eNa0VNzkJey5Qa+ME+lD1cdkLe/L2fNf cMIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id c20si713058pfl.274.2017.06.01.23.51.06; Thu, 01 Jun 2017 23:51:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 5F61C77E95; Fri, 2 Jun 2017 06:50:58 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by mail.openembedded.org (Postfix) with ESMTP id D873B77E55 for ; Fri, 2 Jun 2017 06:50:30 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id u26so11734167pfd.2 for ; Thu, 01 Jun 2017 23:50:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HFicugR7mOo4QbE1SPu4YUYiUyHt1bpLt8tv+mW7lik=; b=s10rGlCbpxo5e2T8efwMC3O0oUdQ8Bwk3YjSH4uEfZwJk5Ak8/0cKJjHbhQfEZxrLo HabQuGR2mOvt6Lm4QWRFOonuiuN4TR4u/kIekMYrXHNjFpICn4pH9kVHwImGn/fLxGRr sHSY1xsNhe+aeY+xUoOYdVQbdGnr8ia6q+ay6lr6KSEwpQLGxFw/HLL1RKqUbG6LO2N5 weQCku9dfizrw31E8HzWa9dSLIaZi8NXw1KqqZEHspgInrKiYJ+psZwputqepctor1eJ aAyx/Wp4ETltqLjL99aWMx2cnKthdHCx6DztR3MJhoI7uQfqo+oLwSyg/qNP5YIWjR37 yB4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HFicugR7mOo4QbE1SPu4YUYiUyHt1bpLt8tv+mW7lik=; b=ObJWYCBEHmj68epsz9I1wJTroMVTkqh5nVD0dVeoY7fMrAXZo6oQX5m3NLpfUEPWqz y8htcYmQy/Pab8BIwvUd3vTrUnH2EetUBlsT8W/kLepNeUwqRC+1wSF5xqua66eYwONj tuTK01KVIiUJffbC/3+yZsIn39GuZlQ2SbJJXT5V4tBepsOd2eX2WVU4s6w590nER9ek bgwPZU8cX1GLoZV6xrmOTESWh/EjM69iH2ag62sZDRF70SoFIstWPOwgz2QKKnZkaGqx cmCsfWsDfSwwwHKVEnrWBDheL8HxSHsdt7brygw80lIPB1uo2kWYMahI9d2Jexp7umeG xj4Q== X-Gm-Message-State: AODbwcCQJ0mm+7xxaNUZgTi5JoGlQ8sLScf/EOZ0RL7CaDdLXLwtqn+z YCaAGkX+zkOxxAjn X-Received: by 10.98.192.80 with SMTP id x77mr5398639pff.1.1496386231656; Thu, 01 Jun 2017 23:50:31 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::cf4]) by smtp.gmail.com with ESMTPSA id a78sm43177369pfk.122.2017.06.01.23.50.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Jun 2017 23:50:30 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 1 Jun 2017 23:50:15 -0700 Message-Id: <20170602065016.27954-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170602065016.27954-1-raj.khem@gmail.com> References: <20170602065016.27954-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 3/4] konkretcmpi: Update and fix build with latest oe-core X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Drop already upstreamed patch Signed-off-by: Khem Raj --- .../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 -- 2.13.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-drop-including-rpath-cmake-module.patch b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-drop-including-rpath-cmake-module.patch new file mode 100644 index 000000000..342017bed --- /dev/null +++ b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-drop-including-rpath-cmake-module.patch @@ -0,0 +1,38 @@ +From 45e1c4c04a126d2386446775f99084bd603016af Mon Sep 17 00:00:00 2001 +From: Khem Raj +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 +--- + 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 + diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/konkretcmpi-0.9.2-fix-returning-instance-from-method.patch b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/konkretcmpi-0.9.2-fix-returning-instance-from-method.patch deleted file mode 100644 index b54d09159..000000000 --- a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/konkretcmpi-0.9.2-fix-returning-instance-from-method.patch +++ /dev/null @@ -1,38 +0,0 @@ -Port from Fedora20 - - | commit aca6c7f910ffe9930b5789969f0adfadd668bb46 - | Author: Michal Minar - | Date: Fri Jun 20 10:50:45 2014 +0200 - | - | Fix returning instance as an output argument from method - | - | Submitted By: Radek Novacek - -Upstream-Status: Pending -Signed-off-by: Qian Lei - -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& 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 diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb index 1d8b0dbd4..4e4aa6cde 100644 --- a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb +++ b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb @@ -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 From patchwork Fri Jun 2 06:50:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 100986 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp244400qge; Thu, 1 Jun 2017 23:51:13 -0700 (PDT) X-Received: by 10.84.198.35 with SMTP id o32mr49156020pld.67.1496386273672; Thu, 01 Jun 2017 23:51:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496386273; cv=none; d=google.com; s=arc-20160816; b=wuGO9PkKA3cxOPFRIz/x3VbfWwi61Hw0CUra7pj3auGy6WjnuLrPke91B1ZMi+cSO9 YWED9aMTXiup8C0PGKVvT4b7Vs72cJPaffUAeRxvD2wglniApjAUhgz5+NeMcZqbghLg XzldErKVQSyqWm2RZ01t84bglqdeT4IXaZunF+Q8kjnIjqXsDmR2oa94FRpZG0hpJUkI 4UDp7sxTBObK+743YRbDfgRF7/ki+/lD5S6+NKjH+euBH+AjHV7OgZRWVEYi49z5vtYs LqV4ElSMiHBQIwYLs2GjES2qNb2qsGLSmBmzAVAJy9PobdTF0crQZY6C/rjLEUREZ2AM qu2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=WiQpzdItfyRk5mSFQgCunq8kY983TrpmlT/+kchSMtg=; b=sTKhSd7IPLMDOar8sXsgZaE5sM9iqhmktO+xH0mI+jcC22WR3rDUJp16j7C9pcpaRA Ok7OhCFLDz8dDls6ApdUTpYYGh/+i5x5ipBwWl5/PHjw6T+yiQ/XcgR8It+KazeyGgAq FZxx6HppMcD+yxe8Jb7GywiWCJLXml/EJR+vUrWfKBbobXl/N0tD3GQ5/8Gmlis4vZU1 Dt7/2ZaChAIMeAyq0toltRcG+7MVmMFgbNu4lufeYCUyIYFtjCWAo6Kgho24Zd094kYR LYiDfoBRZHWIc05o96mTn6S6DjiOdsGyiGT39m6tG7sLbIYhKUppTzx7FlFNVQKgWMXP /dZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id o9si23075336pgq.20.2017.06.01.23.51.13; Thu, 01 Jun 2017 23:51:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 7882477E9C; Fri, 2 Jun 2017 06:50:59 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by mail.openembedded.org (Postfix) with ESMTP id 0CA8D77E76 for ; Fri, 2 Jun 2017 06:50:31 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id u26so11734264pfd.2 for ; Thu, 01 Jun 2017 23:50:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bddmCpugLOqf2yeQr9I89DwjyWZtBYaVXCRrK/h0diM=; b=YQ4CIH2tJTH6OauusRKrQeoucZsn0mD5EYXQmibhAy4UsYoF/CqY37rL6kAx+RVjqs VyS5fdKYjP010u57D6OFWVR3aFJCmWHc3SjdklaqzO7+hb89DYhxCormFh4rr6UDXwtX gEU8kQk4C7oMdkjYdyDFMyv+aoWYbbQXt4qRTIq/vPnxGZBYNmSlfTMSwnl6YOQZ4yqc jCLqb/pk8VjuK1kpM/+KLJeEPSZnnAWhmDo8hYXG15WI8nwnp4hG9opCeofN9/c5rYEn X4EU2Y3z3+r8MkO+1s6frD/qAUn7py4AV5VW8qO/9sHayAhQClm61LbnGnod8HhkoVd5 Zang== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bddmCpugLOqf2yeQr9I89DwjyWZtBYaVXCRrK/h0diM=; b=TMbrpYZxCzQbMWY6V55+nSDbSDCbPYpijBE/azulErDmTAccve58X/RDMpAiXn1Yb7 OIYAQGtVUsjUeGF1gMOzLc2AUWqKNgumkl7W1oa+605dsXowcX8+BD1FIwC+I6tS53Tw 8cxF7GPCadFwek6AIIGezEC+phxlmpT4MqotiEZgn91hLh3uHLIBwHACZFgtJ0tIS7T1 rnetEuQYoAGcnoz2Tn8C91hgnW9CVKdZd1M2ckLWoBQP8Mj5WmzsXxrdFrcYJNlHDbhd /zBOWFA63fKCCo3w/oDOmmVotYW+5/8q7ebqujtzBrCqXoN3thYMkp5mlcfQcHYJ47A2 EDOg== X-Gm-Message-State: AODbwcDtsiIf4UCq1GQDHhmqPAG2kVfG21bP7KMW6kSsjAcVe0wLDi/D 9hmXMbjrUQyHzaKZ X-Received: by 10.98.16.215 with SMTP id 84mr5292652pfq.210.1496386232940; Thu, 01 Jun 2017 23:50:32 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::cf4]) by smtp.gmail.com with ESMTPSA id a78sm43177369pfk.122.2017.06.01.23.50.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Jun 2017 23:50:32 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 1 Jun 2017 23:50:16 -0700 Message-Id: <20170602065016.27954-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170602065016.27954-1-raj.khem@gmail.com> References: <20170602065016.27954-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 4/4] proftpd: Update to 1.3.6 release X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Use the new gnu-config files for musl support Signed-off-by: Khem Raj --- .../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%) -- 2.13.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch b/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch index 19617a6bb..9816d4d22 100644 --- a/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch +++ b/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch @@ -9,11 +9,11 @@ redefine PR_RUN_DIR as ${localstatedir}/run Signed-off-By: Armin Kuster -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) diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5b.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb similarity index 94% rename from meta-networking/recipes-daemons/proftpd/proftpd_1.3.5b.bb rename to meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb index 73efac2fb..409947265 100644 --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5b.bb +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb @@ -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 }