From patchwork Thu Jul 26 23:00:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 142998 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp132616ljj; Thu, 26 Jul 2018 16:01:11 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfp5eLmfxK4MfrGZ0GeHx3/PwojHlc/eqjszrzznJdcO+nXno570HYo9/Auw4ZZ/jZgtmZk X-Received: by 2002:a63:4386:: with SMTP id q128-v6mr3638072pga.353.1532646071104; Thu, 26 Jul 2018 16:01:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532646071; cv=none; d=google.com; s=arc-20160816; b=Pd/Sn+aKsG5nLIzYMfEUwqxY1w7FihhEhFhLEBFL7U2XSyFPY0MeAQr5uSrcPo8qLf PbI37eCSF0CSS5iowVtIzriYjRUAjVdA08zF6rF42U3YQisVqqZDqZrlMeVgVEMrnX7T /LmF9sAmm1ui3Kuc2AV0ndFuKzzeZodX+vOERKbGFoVTwHCW9HlVGo8nWT834arJjk4H L2j0Zyxyq8tdLVIqTgLvszOoD9w9xewC7DHurAwIZvGAzOPosJ+mwhkegVqePBicWFny KHuzVUUFErFoVwQ0zWWkTnHMPf56bKvCTgOKMQn0v3G9FH6vWpIUPv7b2A4vSFey7iwV 0/LA== 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=DnWzMn4O3J3TUvqoUjOPgLCtHJt88urCXjIX8fE5BTE=; b=s/yeDWlqKwVwjouZcAZDGiJQynNJNhOykvjVNV/t3+5nyg4i2LxWoa65hsacF1ASAh tNpzT2uEHLGQlUvfZnar3D4J7MoR4WkDLPoDFEOuorrnFnBeOYQSpxr4YpcnEZUK2zXD KtNJS/elzhx+Q+bt++kGPbcMh7JDCVbNPyT1FALB7ZwmAAkfhHdoXz7181W3ZMW/bvtx d0unJigZBrzr17Xdj0pn1oRE1bn7hQZQuDcyu/SIGa55pmYDhliTPlErp0Ij+NUmHBIz EUNMRXqZrc4+laQDbZhcLy9naL7pYW132QKzhKeb3LtlEiyCwtKXy7NTP8RAtsJd3sbE gN5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=TX1SHKxm; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id d10-v6si2117597pla.140.2018.07.26.16.01.10; Thu, 26 Jul 2018 16:01:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-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=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=TX1SHKxm; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id A8C7578C7C; Thu, 26 Jul 2018 23:01:07 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com [74.125.82.49]) by mail.openembedded.org (Postfix) with ESMTP id 2019378C59 for ; Thu, 26 Jul 2018 23:01:06 +0000 (UTC) Received: by mail-wm0-f49.google.com with SMTP id t25-v6so3540575wmi.3 for ; Thu, 26 Jul 2018 16:01:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=HQEi36EIQuLlIhRO25KRyY0L6ha9fDFAvvN9Xi2YS/o=; b=TX1SHKxmbdNpsIf5Rgtq6fMjtLOhbJGIAb/zNXv4aKLcRn87SDqfy2MFj/M+GKdED7 NIFrtGyg/f88Za35VAhPyWxqa6+1k80+hl/h32BvKB41/8wqijrKiRfoEp0Iho2SeLAL 2SjQ4wHBjavWLy34eL3L1cFnWhf8nWCOphGCBdPr+3O2w4GO9jYIGhPuJB08o1cPQKOW FAn8Jit+CD/T4jRQhZdVGZVztd3+kLrIoOQUk1MoTybCtuo9ycaGHgCsTIBToxY+b6wM u733BLUZFAXas/NNc5OIjPDIuqJFhH8UY6REYIk2Ld0hPKIEdOyRBWQeFyYgWpycfaSH 6lsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=HQEi36EIQuLlIhRO25KRyY0L6ha9fDFAvvN9Xi2YS/o=; b=mTqBwy74WWkoAI4OorI3dKJUPeQGmQmIIZhTr0ZXPuZB9V06j5xE9hMPRDRCqepo97 KWjmAZVA4hlUPR2RUOrOTHcfztXDZDJ9cBnX+xXEBYo6m16mb9OTdiDiUgHaHnnnldd7 wZjZ4uRnJDorM7HVAm/D0jijKvp92ja7DXV7hQCW7T5bsA2VjwHZxiOV6rhiIyVhzOAX /JUHm/PoajrvdvUAhGZvIOFU+xbX8hwh3MyYL187XDgtXYUfNcnZIjchEj79P0IwNrVh YGPHwS2O6bQ6qRSl8TASX59ybUTscUwHA5Br2D7mb7BhUFNxXsOiv0VAYkraOo/YumgN zU5Q== X-Gm-Message-State: AOUpUlGQNbTEjNbMg5sBZ5pkMWl7EPrmi5lpPE5xLqBP7FvlaXTS4aV4 BCKSWc9xZnLiB/V2YgYuhzB5vGTjCPk= X-Received: by 2002:a1c:5c93:: with SMTP id q141-v6mr2723357wmb.133.1532646066492; Thu, 26 Jul 2018 16:01:06 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id h7-v6sm1948532wmb.48.2018.07.26.16.01.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jul 2018 16:01:05 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 27 Jul 2018 00:00:56 +0100 Message-Id: <20180726230100.6629-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH 1/5] ovmf: remove ossp-util from DEPENDS X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org This was added back in the meta-luv days[1] presumably under the impression that it needs ossp-uuid but in reality we rename ossp-uuid's library and uuid.h comes from util-linux. [1] https://github.com/intel/luv-yocto/commit/e08817342b9ea7381944e6c10c555d1c5c62aa6e Signed-off-by: Ross Burton --- meta/recipes-core/ovmf/ovmf_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index e57fa097274..d2ecb619d99 100644 --- a/meta/recipes-core/ovmf/ovmf_git.bb +++ b/meta/recipes-core/ovmf/ovmf_git.bb @@ -43,7 +43,7 @@ PARALLEL_MAKE = "" S = "${WORKDIR}/git" -DEPENDS_class-native="util-linux-native iasl-native ossp-uuid-native qemu-native" +DEPENDS_class-native="util-linux-native iasl-native qemu-native" DEPENDS_class-target="ovmf-native" From patchwork Thu Jul 26 23:00:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 142999 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp132798ljj; Thu, 26 Jul 2018 16:01:21 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeyU4HSl5tCt4vGcrvf2sjCWG+YGmUTLMQf4dg+dFEzsOJ4GwtC3QYGBYNmftwAihhsV1pw X-Received: by 2002:a63:291:: with SMTP id 139-v6mr3652253pgc.365.1532646080929; Thu, 26 Jul 2018 16:01:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532646080; cv=none; d=google.com; s=arc-20160816; b=x+VBOhjfFNVglsTH1g6hVCOtEKQhjLwEmC0H6T4Xb5PwCV6WASzOC8Ee31xnKGa3wy QMhU09q7N9FxjJyx6v9AwtXM9Yirw+L7dQe15tVc4oA9Xv6h31TXb4luge8MHwvt2b40 WrmKKpu8Eb4TQbm9dRUzSBaOvyt3OtIr7SA95pZQiFaj4x2xBnd4US9xtSu+W9IM/3uK ronyBq0F6jGp1SJHyuXBmaD2BssmRh6i5r8CSJZJCP2MU58ikp+nVfAQtw55hl5szF0s MG0tSMp1wQLXtcKMwMVoVwCoPg0D35g1UgIKqUbgnmyqU9Dmkiw0orGSSqRV96ZtB8kc 4CEw== 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=Rgw5LwY6AUlirsBaBCcjqvMh//OcT2ehh6FHxmfx0vw=; b=0qcAGPr5wQvJQe2xgXuDH5kJQVfMhYKhANQTrVeMIX2D+b9qHk514B8+PpsSt9s/Qh DI2ydQ0M6z4v3wQfpCw/zKa7P11TR5bZsdcPUtTDXwg9SWP70Nc7jyK7XwZEUZ8KJDwD S8WHgSicKentriGDcvlmZG9R9gdfwiHEM7CSXDJ37UpANS9mkYP6B1AvHHidy/ABOu8F qkxmGBvgMbKzyfDaVj3+OgZrKrh+xjNubNwH6NuqLZ3pjA/AEdMljHiDcPu2R5zh4FwV 2S03FzfE8Y1TyvYQh2MUS0j2VCSsN2dLOYFBMZK6/m0LhpIr4e80tfL8q/+MO9Q2IQ9O jsAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=z3LNeOkJ; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id v12-v6si1895065plz.105.2018.07.26.16.01.20; Thu, 26 Jul 2018 16:01:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-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=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=z3LNeOkJ; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id A462778C6E; Thu, 26 Jul 2018 23:01:18 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by mail.openembedded.org (Postfix) with ESMTP id 3742878C7D for ; Thu, 26 Jul 2018 23:01:08 +0000 (UTC) Received: by mail-wm0-f53.google.com with SMTP id l2-v6so665279wme.1 for ; Thu, 26 Jul 2018 16:01:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=PnZfXzAqHDtHpJo2/HMvwQnkOzQYa3azaCsdAMUL/PA=; b=z3LNeOkJ7C8lZiyuWLimDZTfB5KzBIEER793StKK9N6fcGbdVIWR6eMmxjFCw9jBqJ 01MbvsNu3w7ED5vms+vYDVRoosTwWFu8d3nYM+jzfOIzDqvB7yhOfnHikJi2T88pAXjH ND+Lh1+EW0u+A78TX1OQ4z+SQW0t/Lds+gO+E2lkk+1mp9yLmc8bD3us05p6gknWOZQc sLlPcK8W0ZKqKanuxD/rE1q1/As0W02Vmadh+qvRQLFCBUWhnl02NUIRjX3TvsquxP8y TIwMxwVEgtGfzfW71DyH6LHTIlwhxSv1AHf9hz+sbnFxR5/f//r8O6JV/Gj+hacUHKeg ZRHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=PnZfXzAqHDtHpJo2/HMvwQnkOzQYa3azaCsdAMUL/PA=; b=NmnDEuijLyAHR9Rhhmdu6hGoLbPukgR5111wYn9JAFTeJhyJUIZxByJ6C7HNsxS3Ax Yt7p7vUZRoiWDhN7KEr/R1IfrvjdcwNzBD9/5jnAm5UAcXlN0dM6EWsTG4eBkOWMviYe LW32tFtZVmy47Grf1cLNVpLskqnG6jhtsDHxHUmS+dKmqPaVjkOaytdlh8qa8i9Lnq32 DW6Twgfn1pHSzXF6CsMbkdhcA9stwD5iwCgBVPrJJmvH82EzWrUjRpXAwZGBFfMyf+fx y8bKnzefWvtoh1wWS1pdN+As20IuPsZ5EydbTIodNO9aaDfY7g+21LqnljgixXj0Xo5c 6DNw== X-Gm-Message-State: AOUpUlGiM42JnoJa4NHKCzXws/DsjqVda8hx0vUFoOXlzRiwFu7Uyen3 EZ4P902SvBnTXyeTH289YbEDACwFPAw= X-Received: by 2002:a1c:2dc8:: with SMTP id t191-v6mr2814480wmt.94.1532646067980; Thu, 26 Jul 2018 16:01:07 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id h7-v6sm1948532wmb.48.2018.07.26.16.01.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jul 2018 16:01:07 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 27 Jul 2018 00:00:57 +0100 Message-Id: <20180726230100.6629-2-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180726230100.6629-1-ross.burton@intel.com> References: <20180726230100.6629-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 2/5] ossp-uuid: remove X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org This project is dead (upstream website doesn't respond anymore) and can mostly be replaced with the uuid.h in util-linux. Signed-off-by: Ross Burton --- meta/conf/distro/include/maintainers.inc | 1 - .../ossp-uuid/0001-Change-library-name.patch | 119 --------------------- ...erve-m-option-status-in-v-option-handling.patch | 62 ----------- .../ossp-uuid/0003-Fix-whatis-entries.patch | 58 ---------- .../ossp-uuid/0004-fix-data-uuid-from-string.patch | 43 -------- .../ossp-uuid/ossp-uuid/install-pc.patch | 19 ---- .../ossp-uuid/ossp-uuid/ldflags.patch | 26 ----- .../ossp-uuid/ossp-uuid/libtool-tag.patch | 21 ---- .../ossp-uuid/ossp-uuid/uuid-libtool.patch | 27 ----- .../ossp-uuid/ossp-uuid/uuid-nostrip.patch | 19 ---- meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb | 66 ------------ 11 files changed, 461 deletions(-) delete mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch delete mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch delete mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch delete mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch delete mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/install-pc.patch delete mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch delete mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/libtool-tag.patch delete mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch delete mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch delete mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 4d58766451e..6e7efd12752 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -509,7 +509,6 @@ RECIPE_MAINTAINER_pn-opkg-keyrings = "Alejandro del Castillo -Date: Wed, 27 Jan 2010 16:53:11 +0100 -Subject: [PATCH] Change library name - -The soname was changed to ossp-uuid to prevend the name clash with e2fsprogs's -uuid library. ---- - Makefile.in | 6 +++--- - perl/Makefile.PL | 12 ++++++------ - php/config.m4 | 2 +- - uuid-config.in | 2 +- - uuid.pc.in | 4 ++-- - 5 files changed, 13 insertions(+), 13 deletions(-) - ----- -Upstream-Status: Inappropriate [not author] - -This patch is from debian ossp-uuid 1.6.2 integration. - -Signed-off-by: Mark Hatle - -diff --git a/Makefile.in b/Makefile.in -index d28f4be..c2ba99d 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -62,13 +62,13 @@ PERL = @PERL@ - PHP = @PHP@ - PG_CONFIG = @PG_CONFIG@ - --LIB_NAME = libuuid.la -+LIB_NAME = libossp-uuid.la - LIB_OBJS = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_time.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo - --DCE_NAME = libuuid_dce.la -+DCE_NAME = libossp-uuid_dce.la - DCE_OBJS = uuid_dce.lo $(LIB_OBJS) - --CXX_NAME = libuuid++.la -+CXX_NAME = libossp-uuid++.la - CXX_OBJS = uuid++.lo $(LIB_OBJS) - - PRG_NAME = uuid -diff --git a/perl/Makefile.PL b/perl/Makefile.PL -index 92f4494..9c6fee6 100644 ---- a/perl/Makefile.PL -+++ b/perl/Makefile.PL -@@ -33,9 +33,9 @@ use Config; - use ExtUtils::MakeMaker; - - # determine source directory --my ($srcdir) = map { my $d = $_; $d =~ s/\/libuuid\.la$//; $d } -- grep { -f $_ } ("../libuuid.la", glob("../*/libuuid.la")) -- or die "no source directory found (where libuuid.la is located)"; -+my ($srcdir) = map { my $d = $_; $d =~ s/\/libossp-uuid\.la$//; $d } -+ grep { -f $_ } ("../libossp-uuid.la", glob("../*/libossp-uuid.la")) -+ or die "no source directory found (where libossp-uuid.la is located)"; - - # determine extra build options - my $compat = 0; -@@ -47,15 +47,15 @@ WriteMakefile( - VERSION_FROM => 'uuid.pm', - ABSTRACT_FROM => 'uuid.pod', - PREREQ_PM => {}, -- LIBS => [ "-L$srcdir/.libs -L$srcdir -luuid" ], -+ LIBS => [ "-L$srcdir/.libs -L$srcdir -lossp-uuid" ], - DEFINE => '', - INC => "-I. -I$srcdir", - PM => { 'uuid.pm' => '$(INST_LIBDIR)/uuid.pm', - 'uuid.pod' => '$(INST_LIBDIR)/uuid.pod', - ($compat ? ('uuid_compat.pm' => '$(INST_LIBDIR)/../Data/UUID.pm') : ()), - ($compat ? ('uuid_compat.pod' => '$(INST_LIBDIR)/../Data/UUID.pod') : ()), }, -- MAN3PODS => { 'uuid.pod' => '$(INST_MAN3DIR)/OSSP::uuid.3', -- ($compat ? ('uuid_compat.pod' => '$(INST_MAN3DIR)/Data::UUID.3') : ()), }, -+ MAN3PODS => { 'uuid.pod' => '$(INST_MAN3DIR)/OSSP::uuid.3pm', -+ ($compat ? ('uuid_compat.pod' => '$(INST_MAN3DIR)/Data::UUID.3pm') : ()), }, - TYPEMAPS => [ 'uuid.tm' ], - test => { TESTS => 'uuid.ts' . ($compat ? ' uuid_compat.ts' : '') }, - NO_META => 1, -diff --git a/php/config.m4 b/php/config.m4 -index 5091b96..969b457 100644 ---- a/php/config.m4 -+++ b/php/config.m4 -@@ -34,7 +34,7 @@ if test "$PHP_UUID" != "no"; then - PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared) - AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library]) - PHP_ADD_LIBPATH([..], ) -- PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD) -+ PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD) - PHP_ADD_INCLUDE([..]) - PHP_SUBST(UUID_SHARED_LIBADD) - -diff --git a/uuid-config.in b/uuid-config.in -index 8d2a063..5b58812 100644 ---- a/uuid-config.in -+++ b/uuid-config.in -@@ -121,7 +121,7 @@ do - output_extra="$output_extra $uuid_ldflags" - ;; - --libs) -- output="$output -luuid" -+ output="$output -lossp-uuid" - output_extra="$output_extra $uuid_libs" - ;; - * ) -diff --git a/uuid.pc.in b/uuid.pc.in -index c76ad1e..de00c2f 100644 ---- a/uuid.pc.in -+++ b/uuid.pc.in -@@ -36,7 +36,7 @@ Name: OSSP uuid - Description: Universally Unique Identifier (UUID) Library - Version: @UUID_VERSION_RAW@ - URL: http://www.ossp.org/pkg/lib/uuid/ --Cflags: -I${includedir} --Libs: -L${libdir} -luuid -+Cflags: -I${includedir}/ossp -+Libs: -L${libdir} -lossp-uuid - Libs.private: @LIBS@ - --- diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch deleted file mode 100644 index 804a62731df..00000000000 --- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch +++ /dev/null @@ -1,62 +0,0 @@ -From: Marco Nenciarini -Date: Wed, 27 Jan 2010 19:46:21 +0100 -Subject: [PATCH] uuid: preserve -m option status in -v option handling - -Bug: 531396 ---- - uuid_cli.c | 19 ++++++++++--------- - 1 files changed, 10 insertions(+), 9 deletions(-) - ----- -Upstream-Status: Inappropriate [not author] - -This patch is from debian ossp-uuid 1.6.2 integration. - -Signed-off-by: Mark Hatle - -diff --git a/uuid_cli.c b/uuid_cli.c -index d1b0b11..14a67fe 100644 ---- a/uuid_cli.c -+++ b/uuid_cli.c -@@ -140,11 +140,12 @@ int main(int argc, char *argv[]) - i = strtol(optarg, &p, 10); - if (*p != '\0') - usage("invalid argument to option 'v'"); -+ version &= ~(UUID_MAKE_V1|UUID_MAKE_V3|UUID_MAKE_V4|UUID_MAKE_V5); - switch (i) { -- case 1: version = UUID_MAKE_V1; break; -- case 3: version = UUID_MAKE_V3; break; -- case 4: version = UUID_MAKE_V4; break; -- case 5: version = UUID_MAKE_V5; break; -+ case 1: version |= UUID_MAKE_V1; break; -+ case 3: version |= UUID_MAKE_V3; break; -+ case 4: version |= UUID_MAKE_V4; break; -+ case 5: version |= UUID_MAKE_V5; break; - default: - usage("invalid version on option 'v'"); - break; -@@ -213,10 +214,10 @@ int main(int argc, char *argv[]) - } - else { - /* encoding */ -- if ( (version == UUID_MAKE_V1 && argc != 0) -- || (version == UUID_MAKE_V3 && argc != 2) -- || (version == UUID_MAKE_V4 && argc != 0) -- || (version == UUID_MAKE_V5 && argc != 2)) -+ if ( (version & UUID_MAKE_V1 && argc != 0) -+ || (version & UUID_MAKE_V3 && argc != 2) -+ || (version & UUID_MAKE_V4 && argc != 0) -+ || (version & UUID_MAKE_V5 && argc != 2)) - usage("invalid number of arguments"); - if ((rc = uuid_create(&uuid)) != UUID_RC_OK) - error(1, "uuid_create: %s", uuid_error(rc)); -@@ -232,7 +233,7 @@ int main(int argc, char *argv[]) - if ((rc = uuid_load(uuid, "nil")) != UUID_RC_OK) - error(1, "uuid_load: %s", uuid_error(rc)); - } -- if (version == UUID_MAKE_V3 || version == UUID_MAKE_V5) { -+ if (version & UUID_MAKE_V3 || version & UUID_MAKE_V5) { - if ((rc = uuid_create(&uuid_ns)) != UUID_RC_OK) - error(1, "uuid_create: %s", uuid_error(rc)); - if ((rc = uuid_load(uuid_ns, argv[0])) != UUID_RC_OK) { --- diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch deleted file mode 100644 index 13cbb598964..00000000000 --- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch +++ /dev/null @@ -1,58 +0,0 @@ -From: Marco Nenciarini -Date: Tue, 2 Feb 2010 12:16:49 +0100 -Subject: [PATCH] Fix whatis entries - -Fix whatis entry of uuid.1, uuid.3ossp and uuid++.3ossp manpages ---- - uuid++.pod | 2 +- - uuid.pod | 2 +- - uuid_cli.pod | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - ----- -Upstream-Status: Inappropriate [not author] - -This patch is from debian ossp-uuid 1.6.2 integration. - -Signed-off-by: Mark Hatle - -diff --git a/uuid++.pod b/uuid++.pod -index 8b5a4b1..89c5efb 100644 ---- a/uuid++.pod -+++ b/uuid++.pod -@@ -31,7 +31,7 @@ - - =head1 NAME - --B - B (C++ API) -+B - B (C++ API) - - =head1 VERSION - -diff --git a/uuid.pod b/uuid.pod -index 4ad3742..0179a46 100644 ---- a/uuid.pod -+++ b/uuid.pod -@@ -31,7 +31,7 @@ - - =head1 NAME - --B - B -+B - B - - =head1 VERSION - -diff --git a/uuid_cli.pod b/uuid_cli.pod -index ddec6bb..df9dc83 100644 ---- a/uuid_cli.pod -+++ b/uuid_cli.pod -@@ -31,7 +31,7 @@ - - =head1 NAME - --B - B -+B - B - - =head1 VERSION - --- diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch deleted file mode 100644 index bc5e111ee54..00000000000 --- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch +++ /dev/null @@ -1,43 +0,0 @@ -Description: Support dash-less args to from_string. -Author: Tim Retout -Bug-Debian: http://bugs.debian.org/635607 - -The module Data::GUID depends on Data::UUID supporting this behaviour. - ----- -Upstream-Status: Inappropriate [not author] - -This patch is from debian ossp-uuid 1.6.2 integration. - -Signed-off-by: Mark Hatle - ---- a/perl/uuid_compat.pm -+++ b/perl/uuid_compat.pm -@@ -93,7 +93,9 @@ - $uuid->import('str', - $str =~ /^0x/ - ? join '-', unpack('x2 a8 a4 a4 a4 a12', $str) -- : $str -+ : $str =~ /-/ -+ ? $str -+ : join '-', unpack('A8 A4 A4 A4 A12', $str) - ); - return $uuid->export('bin'); - } ---- a/perl/uuid_compat.ts -+++ b/perl/uuid_compat.ts -@@ -28,7 +28,7 @@ - ## uuid_compat.ts: Data::UUID Backward Compatibility Perl API (Perl test suite part) - ## - --use Test::More tests => 14; -+use Test::More tests => 16; - - BEGIN { - use_ok('Data::UUID'); -@@ -53,3 +53,5 @@ - ok($uuid8 = $ug->from_string("6ba7b811-9dad-11d1-80b4-00c04fd430c8")); - ok($ug->compare($uuid7, $uuid8) == 0); - -+ok($uuid9 = $ug->from_string("6ba7b8119dad11d180b400c04fd430c8")); -+ok($ug->compare($uuid7, $uuid9) == 0); diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/install-pc.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/install-pc.patch deleted file mode 100644 index 63b80f6a14f..00000000000 --- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/install-pc.patch +++ /dev/null @@ -1,19 +0,0 @@ -uuid.pc is generated at build time so should be installed from the current -directory, and not $S. - -Upstream-Status: Pending [should be submitted] -Signed-off-by: Ross Burton - -Index: uuid-1.6.2/Makefile.in -=================================================================== ---- uuid-1.6.2.orig/Makefile.in 2012-11-13 16:58:28.624156000 +0000 -+++ uuid-1.6.2/Makefile.in 2012-11-13 17:05:24.224158670 +0000 -@@ -232,7 +232,7 @@ - $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1 - $(SHTOOL) install -c -m 755 uuid-config $(DESTDIR)$(bindir)/ - $(SHTOOL) install -c -m 644 $(S)/uuid-config.1 $(DESTDIR)$(mandir)/man1/ -- $(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/ -+ $(SHTOOL) install -c -m 644 uuid.pc $(DESTDIR)$(libdir)/pkgconfig/ - $(SHTOOL) install -c -m 644 uuid.h $(DESTDIR)$(includedir)/ - -@if [ ".$(WITH_DCE)" = .yes ]; then \ - echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/"; \ diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch deleted file mode 100644 index 4dfc1370c18..00000000000 --- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch +++ /dev/null @@ -1,26 +0,0 @@ -Obey LDFLAGS - -Signed-off-by: Christopher Larson -Upstream-Status: Pending - ---- uuid-1.6.2.orig/Makefile.in -+++ uuid-1.6.2/Makefile.in -@@ -113,15 +113,15 @@ all: $(TARGETS) - @$(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< - - $(LIB_NAME): $(LIB_OBJS) -- @$(LIBTOOL) --mode=link $(CC) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \ -+ @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \ - -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` - - $(DCE_NAME): $(DCE_OBJS) -- @$(LIBTOOL) --mode=link $(CC) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \ -+ @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \ - -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` - - $(CXX_NAME): $(CXX_OBJS) -- @$(LIBTOOL) --mode=link $(CXX) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \ -+ @$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \ - -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` - - $(PRG_NAME): $(PRG_OBJS) $(LIB_NAME) diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/libtool-tag.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/libtool-tag.patch deleted file mode 100644 index 7f601afab59..00000000000 --- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/libtool-tag.patch +++ /dev/null @@ -1,21 +0,0 @@ -Repect LIBTOOLFLAGS - -This add a knob that can be controlled from env to set generic options -for libtool - -Upstream-Status: Pending -Signed-off-by: Khem Raj - -Index: uuid-1.6.2/Makefile.in -=================================================================== ---- uuid-1.6.2.orig/Makefile.in -+++ uuid-1.6.2/Makefile.in -@@ -56,7 +56,7 @@ RM = rm -f - CP = cp - RMDIR = rmdir - SHTOOL = $(S)/shtool --LIBTOOL = @LIBTOOL@ -+LIBTOOL = @LIBTOOL@ $(LIBTOOLFLAGS) - TRUE = true - POD2MAN = pod2man - PERL = @PERL@ diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch deleted file mode 100644 index 4bc91b86ee5..00000000000 --- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch +++ /dev/null @@ -1,27 +0,0 @@ -Remove hardcoded libtool name, fall back to generated name - -Upstream-Status: Inappropriate [no upstream] -The project appears to no longer be accepting changes. - -Signed-off-by: Mark Hatle - -diff -ur uuid-1.6.2.orig/Makefile.in uuid-1.6.2/Makefile.in ---- uuid-1.6.2.orig/Makefile.in 2012-05-14 14:37:19.579672930 -0500 -+++ uuid-1.6.2/Makefile.in 2012-05-14 14:37:49.112733787 -0500 -@@ -32,6 +32,7 @@ - VPATH = @srcdir@ - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ -+top_builddir = @top_builddir@ - S = $(srcdir) - C = . - -@@ -55,7 +56,7 @@ - CP = cp - RMDIR = rmdir - SHTOOL = $(S)/shtool --LIBTOOL = $(C)/libtool -+LIBTOOL = @LIBTOOL@ - TRUE = true - POD2MAN = pod2man - PERL = @PERL@ diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch deleted file mode 100644 index d806b5fb70b..00000000000 --- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch +++ /dev/null @@ -1,19 +0,0 @@ -We don't want anything stripped - -Upstream-Status: Inappropriate [no upstream] -The project appears to no longer be accepting changes. - -Signed-off-by: Mark Hatle - -diff -ur uuid-1.6.2.orig/Makefile.in uuid-1.6.2/Makefile.in ---- uuid-1.6.2.orig/Makefile.in 2012-05-14 14:42:42.225789456 -0500 -+++ uuid-1.6.2/Makefile.in 2012-05-14 15:03:03.119733400 -0500 -@@ -254,7 +254,7 @@ - -@if [ ".$(WITH_CXX)" = .yes ]; then \ - $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(CXX_NAME) $(DESTDIR)$(libdir)/; \ - fi -- @$(LIBTOOL) --mode=install $(SHTOOL) install -c -s -m 755 uuid $(DESTDIR)$(bindir)/ -+ @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 755 uuid $(DESTDIR)$(bindir)/ - $(SHTOOL) install -c -m 644 $(S)/uuid.1 $(DESTDIR)$(mandir)/man1/ - -@if [ ".$(WITH_PERL)" = .yes ]; then \ - (cd $(S)/perl && $(MAKE) $(MFLAGS) install DESTDIR=$(DESTDIR)); \ diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb b/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb deleted file mode 100644 index 5d9ca790e98..00000000000 --- a/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb +++ /dev/null @@ -1,66 +0,0 @@ -SUMMARY = "Universally Unique Identifier (UUID) library" -DESCRIPTION = "OSSP uuid is a ISO-C:1999 application programming interface \ -(API) and corresponding command line interface (CLI) for the generation of \ -DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant Universally Unique \ -Identifier (UUID). It supports DCE 1.1 variant UUIDs of version 1 (time \ -and node based), version 3 (name based, MD5), version 4 (random number \ -based) and version 5 (name based, SHA-1)." -DESCRIPTION_uuid = "This package contains a tool to create Universally \ -Unique Identifiers (UUID) from the command-line." - -HOMEPAGE = "http://www.ossp.org/pkg/lib/uuid/" -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://README;beginline=30;endline=55;md5=b394fadb039bbfca6ad9d9d769ee960e \ - file://uuid_md5.c;beginline=1;endline=28;md5=9c1f4b2218546deae24c91be1dcf00dd" - -PR = "r2" -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/o/ossp-uuid/" - -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/o/${BPN}/${BPN}_${PV}.orig.tar.gz \ - file://0001-Change-library-name.patch \ - file://0002-uuid-preserve-m-option-status-in-v-option-handling.patch \ - file://0003-Fix-whatis-entries.patch \ - file://0004-fix-data-uuid-from-string.patch \ - file://uuid-libtool.patch \ - file://uuid-nostrip.patch \ - file://install-pc.patch \ - file://ldflags.patch \ - file://libtool-tag.patch \ - " -SRC_URI[md5sum] = "5db0d43a9022a6ebbbc25337ae28942f" -SRC_URI[sha256sum] = "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0" - -S = "${WORKDIR}/uuid-${PV}" - -inherit autotools update-alternatives - -EXTRA_OECONF = "--without-dce --without-cxx --without-perl --without-perl-compat --without-php --without-pgsql" -EXTRA_OECONF = "--includedir=${includedir}/ossp" -EXTRA_OEMAKE_class-target = "LIBTOOLFLAGS='--tag=CC'" - -do_configure_prepend() { - # This package has a completely custom aclocal.m4, which should be acinclude.m4. - if [ ! -e ${S}/acinclude.m4 ]; then - mv ${S}/aclocal.m4 ${S}/acinclude.m4 - fi - - rm -f ${S}/libtool.m4 -} - -do_install_append() { - mkdir -p ${D}${includedir}/ossp - mv ${D}${libdir}/pkgconfig/uuid.pc ${D}${libdir}/pkgconfig/ossp-uuid.pc -} - -PACKAGES =+ "uuid" -FILES_uuid = "${bindir}/uuid" -FILES_${PN} = "${libdir}/libossp-uuid.so.16*" -FILES_${PN}-dev += "${bindir}/uuid-config" - -BBCLASSEXTEND = "native nativesdk" - -ALTERNATIVE_${PN}-doc = "uuid.3" -ALTERNATIVE_PRIORITY_${PN}-doc = "200" -ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3" From patchwork Thu Jul 26 23:00:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 143000 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp132902ljj; Thu, 26 Jul 2018 16:01:27 -0700 (PDT) X-Google-Smtp-Source: AAOMgpei34nMHh2mckeGqBMwigE5VZBiUEe4St4PJNa6hu0vayY7ltXO3YFZMY5siGQhqe6UB29/ X-Received: by 2002:a65:4587:: with SMTP id o7-v6mr3699212pgq.317.1532646086924; Thu, 26 Jul 2018 16:01:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532646086; cv=none; d=google.com; s=arc-20160816; b=upfmQmtGLUXAHVLFLezmKkVOqWR68UO3mOfXw6SL3i7oRWH9QqLVA4GJik9ePGS5ij 56pu7y/HuoSYmxWUMJiZCHz8L+s1C5vqPzpwhxwuFjNvhRu1imqEwS5cdnWzfD6wCx7a D6NEsdBZ2ybvtxZFtjLoFoljxWxIzHs9HqaTcqGvStJDk5sm5Vk3hey+Blk/ACXKY87c F5Urlm1UBBsZSBRiMSeGJFsI31yxek7y6uw78kC+snpxIlWjIimZrLeuGK8qIidUXxfH dMWQRMpfugWfwl0zmyx4YVvknMURhUoRE55TRh+FBSR7X+65vTb+9ztAzTeOfqhGmxkz RX3A== 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=YnZDx1Q79oj92N4Wq5nylWuHChqLRcuA2CdTNj/ybMw=; b=J0y6fvPolbJnkwAiw4puiU00pLG6Iji5idjQ/yZRgEI1c20LJZlj69OWpSx08i7S5p 1qBqP/E8+XRL8+T7nYIpZeZIdWcEviYtAynMZnnN2b9v5krYUnUypOlQezelboiWCVY2 YcNvdfDmsfg1RklcacHML97CqD5f45dkT1EyAyfXkv7NTGtHqoQRGqby2Bw26qXeImnh OofVoeOYNZKSO1RjY4FJskGmuK6QILcVYrvVOUl2zvA1gi0M36gMHQUSwcIPFGy0GpLt G5ZV3L0LnPxMU/278Vn+UY4tCRoHp2ent7IscIVPes5BSIcs7v6iDWwj2Z52qZSX4MGb NwvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b="sR/CZ3sM"; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id r69-v6si2487575pfl.260.2018.07.26.16.01.26; Thu, 26 Jul 2018 16:01:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-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=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b="sR/CZ3sM"; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 09CA578C8A; Thu, 26 Jul 2018 23:01:20 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mail.openembedded.org (Postfix) with ESMTP id 7F6BA78C59 for ; Thu, 26 Jul 2018 23:01:08 +0000 (UTC) Received: by mail-wr1-f43.google.com with SMTP id t13-v6so3227748wrv.12 for ; Thu, 26 Jul 2018 16:01:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=s7ks5XYQ7YszFmygcEhckksWvk7UvligqFoJ3Bpgeig=; b=sR/CZ3sM0jPYA70MuA/V0Kc9Ps0m7JT7dRU8QxRDJkaWV1tD4XO6vm00H3Sa5FYS/3 CNFdNyJ47z10pIWj7OQe7VAGLk56lzrLSwLtDAX55xo6bquUSUgIAyY9p+Gvkc6AOGV8 e+O1marn6CfjppWnHiu7QeedlaVivjQga+XMSexVRS5rdRLxL0iqtdRnatNdAFP4KgUl 1CdYIUZt9WBQjlr6lMYAPyl6p4N/VbTXXJBSRqi/o+eQWRP/1J5rDqc9pFYOM+1cGi5o fZ4merZjiWBzCmuvgl+qr+O/MviXcgB7Bh8MbHD5KA1eGshqepXjSOqfSMlnhV/tchGu naKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=s7ks5XYQ7YszFmygcEhckksWvk7UvligqFoJ3Bpgeig=; b=JkabmqER1eY/JjUbbqbZMIAHgYM/3UnllbCpqkuhLvVkUWE9Lpa2u2aSoVmRQG6tT1 e4VrN+dNsPElh+CJRB/2N1jAUASWkLmXlXrCXIcNz5nzZaI59Da3fki/YJxZoiyOxRYp /f4EzHjeFgugHh3tleMsE0ZUOla1fZxxJxz9k04KHBiINyFsW8zjasFStYC/fjvTvO2o mbr4gXZdjOcHWbzKQW/HpFxbCr7/4Z7v+pKsTPmfn/6oKP/S9V2TCXYV04BB8hejHa9C J7Dw6zi2u4M7SekhGperdDqv4y6W/TGi4HHD7u5wGfYjyKkNWE9tJ+2QbUT1YFyMKpMU nPww== X-Gm-Message-State: AOUpUlE/UGw8CQe1kBrMZKR54J+9O6yAbu5zFjaZGMPB+i4p7W12oOMR dDUHHYvyvtkWIC9CbJSdPRApbAVpwcQ= X-Received: by 2002:a5d:494c:: with SMTP id r12-v6mr2948582wrs.66.1532646068925; Thu, 26 Jul 2018 16:01:08 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id h7-v6sm1948532wmb.48.2018.07.26.16.01.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jul 2018 16:01:08 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 27 Jul 2018 00:00:58 +0100 Message-Id: <20180726230100.6629-3-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180726230100.6629-1-ross.burton@intel.com> References: <20180726230100.6629-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 3/5] dbus-glib: merge bb and inc X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Signed-off-by: Ross Burton --- meta/recipes-core/dbus/dbus-glib.inc | 37 ------------------------------- meta/recipes-core/dbus/dbus-glib_0.110.bb | 37 ++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 38 deletions(-) delete mode 100644 meta/recipes-core/dbus/dbus-glib.inc -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc deleted file mode 100644 index 16dbf4f08a1..00000000000 --- a/meta/recipes-core/dbus/dbus-glib.inc +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "High level language (GLib) binding for D-Bus" -DESCRIPTION = "GLib bindings for the D-Bus message bus that integrate \ -the D-Bus library with the GLib thread abstraction and main loop." -HOMEPAGE = "http://www.freedesktop.org/Software/dbus" -LICENSE = "AFL-2 | GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=cf5b3a2f7083750d504333114e738656 \ - file://dbus/dbus-glib.h;beginline=7;endline=21;md5=7755c9d7abccd5dbd25a6a974538bb3c" -SECTION = "base" - -DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus" -DEPENDS_class-native = "glib-2.0-native dbus-native" - -SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ - file://no-examples.patch \ - file://test-install-makefile.patch \ -" - -inherit autotools pkgconfig gettext bash-completion gtk-doc - -#default disable regression tests, some unit test code in non testing code -#PACKAGECONFIG_pn-${PN} = "tests" enable regression tests local.conf -PACKAGECONFIG ??= "" -PACKAGECONFIG[tests] = "--enable-tests,,," - -EXTRA_OECONF_class-target = "--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool" - -PACKAGES += "${PN}-tests" - -FILES_${PN} = "${libdir}/lib*${SOLIBS}" -FILES_${PN}-bash-completion += "${libexecdir}/dbus-bash-completion-helper" -FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" -FILES_${PN}-dev += "${bindir}/dbus-binding-tool" - -RDEPENDS_${PN}-tests += "dbus-x11" -FILES_${PN}-tests = "${datadir}/${BPN}/tests" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-core/dbus/dbus-glib_0.110.bb b/meta/recipes-core/dbus/dbus-glib_0.110.bb index 81205050105..b7383bd2a6b 100644 --- a/meta/recipes-core/dbus/dbus-glib_0.110.bb +++ b/meta/recipes-core/dbus/dbus-glib_0.110.bb @@ -1,4 +1,39 @@ -require dbus-glib.inc +SUMMARY = "High level language (GLib) binding for D-Bus" +DESCRIPTION = "GLib bindings for the D-Bus message bus that integrate \ +the D-Bus library with the GLib thread abstraction and main loop." +HOMEPAGE = "http://www.freedesktop.org/Software/dbus" +LICENSE = "AFL-2 | GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=cf5b3a2f7083750d504333114e738656 \ + file://dbus/dbus-glib.h;beginline=7;endline=21;md5=7755c9d7abccd5dbd25a6a974538bb3c" +SECTION = "base" +DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus" +DEPENDS_class-native = "glib-2.0-native dbus-native" + +SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ + file://no-examples.patch \ + file://test-install-makefile.patch \ +" SRC_URI[md5sum] = "d7cebf1d69445cbd28b4983392145192" SRC_URI[sha256sum] = "7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825" + +inherit autotools pkgconfig gettext bash-completion gtk-doc + +#default disable regression tests, some unit test code in non testing code +#PACKAGECONFIG_pn-${PN} = "tests" enable regression tests local.conf +PACKAGECONFIG ??= "" +PACKAGECONFIG[tests] = "--enable-tests,,," + +EXTRA_OECONF_class-target = "--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool" + +PACKAGES += "${PN}-tests" + +FILES_${PN} = "${libdir}/lib*${SOLIBS}" +FILES_${PN}-bash-completion += "${libexecdir}/dbus-bash-completion-helper" +FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" +FILES_${PN}-dev += "${bindir}/dbus-binding-tool" + +RDEPENDS_${PN}-tests += "dbus-x11" +FILES_${PN}-tests = "${datadir}/${BPN}/tests" + +BBCLASSEXTEND = "native" From patchwork Thu Jul 26 23:00:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 143001 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp133012ljj; Thu, 26 Jul 2018 16:01:33 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfJpbCOk1JqDyzV8QBUfxhD2sKS5KnImwNWDLGpQm7UqatpUVuo0W7z9hOVs/q2xjptSzg5 X-Received: by 2002:a65:6292:: with SMTP id f18-v6mr3642477pgv.85.1532646093120; Thu, 26 Jul 2018 16:01:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532646093; cv=none; d=google.com; s=arc-20160816; b=JuvDSGIGOjGUncDlIMlJsqjSYcWgCTEiTxmVClbREXpOMGfbbh018xeiO/Es19I+AY V+wml3sn/NY4Ko2OdcXDUdWBvpDhyo+9ngW9vpI0byIdsR4cK1Cunenw8D6zkyOEbESv UEJXdtRZ2xLuK+jJO82R7lUMBC99KQToRy4OGPcIvV5Jd5qLUWF4nDjGDFiw1khsxsA0 ACR25rFMGyHSIOV/gRiEDc0fCyZNLOEd07Aivmpf02l1M2z7+NXb4qA6Cqfbmu+kZlN7 vra4mCz68JLn6rRlj4VaftfL8RvYTE4bO0kuQ2WILm/Cj7H8VgwvuDI8F8BiQvFs2gjf lE/A== 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=VPCO35GjcFTpyKhFV43HW/78eUzaksPeE/vPU+apQxo=; b=iMnvCNpCM9+DvU+0Yvs/5rHrfqRKFsNbSoIjBCSpp0/cxlH8+Pr9IG/rfaLWm6YRTj 16DXrPUbZUG7h1DBj1XcJjPnJQEdnCc/kPL+JO1e22owXlM0SlEXqrg2sYNUSIHllG8b diJmTzHrDaHJuHrIj+x+8gbQ2S/S+9/O/SMtUxjdpPClqVKTwUdFDgMLG1HZ2Idz9Uj3 lXoIRlC7c80frSpOgj7VOoePcqiHqlbkW/6zFr32srEVaxBfqSejZA0AjiuCHrKRskb/ OBKlU6mzO/YDF3fvVvU/JTUKFXSYCJmdv5EHSmz9f2AUiEScbrboOP46wTC0A0o4n7e0 NPVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=WqBgsHY7; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id y14-v6si2258546pgg.76.2018.07.26.16.01.32; Thu, 26 Jul 2018 16:01:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-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=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=WqBgsHY7; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 2B8AA78C8D; Thu, 26 Jul 2018 23:01:21 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by mail.openembedded.org (Postfix) with ESMTP id 9185278C83 for ; Thu, 26 Jul 2018 23:01:09 +0000 (UTC) Received: by mail-wm0-f45.google.com with SMTP id y2-v6so3455455wma.1 for ; Thu, 26 Jul 2018 16:01:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=dPHTfVuKiPP5pVPFxkAza7lg4uPIM65KeEZI5tXp95Y=; b=WqBgsHY7QdqPudoL/EgY/lkhBUifKrRB1Q7Vv5Cb+NE17Cu9H3czuw12njRP0kY855 7sjzviaNz0CDvMW2Cw9TXtSczASGgSZ4TMys6N6AaFG/rhDu66orxJew1mmrniqAHKAK xcKm5jBSv210phZgxkq0O4fwhqfH9BEAD3fEtxy94hcUyZoJl19CK2x/Ye36xISzKXUq DRn+vvJKw9QtavtSaNOgNdwBTOvgTbfAXFC48vLCG8kjsi6NDzmLhJBwIb2wvIkABbur naw9LIw1zwVYp1k4VgXgTKAp2e6kDM6rlZN/K8ZV+4T9mffNoqqdrx8fP9rGv1wFcXXU RluQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=dPHTfVuKiPP5pVPFxkAza7lg4uPIM65KeEZI5tXp95Y=; b=unHyc+kZJmBVlVBTaEzZf85ptLd61oj5HrVXCW5ikuohl4GBbWVhF7dpJoy+LDzPAo QPIv1fA71GpW11xt9ypoESjjhZgmLdwy2UAWfSYh8hbwyLui2vwTreqCsCcfLKgIQWX1 oHpDEeYkRKNCyHm8//Bnvf2nIDAPkAwmWRZT7nwh+/dyhVJnOllF2siTXj7AoQChQPPc bg/4aFiyqX6kSvIcZhMt8Uw++5fVmqkGJiwA7Bbo4XU/5RnoaXEydl3xxydAOSiq3lVH g52bq7hpRE3rXKdFHfKyelWNVlzsHHVQqAuZ0TQ+KLHZB3C7nm4t5pLdPRSnn0nsmpPt veJg== X-Gm-Message-State: AOUpUlHJqgYKC7ZK+wtVJeMw/f7UqqG/gmDkP/ix9RNS08/F0BuFbyXU Mb3RWKNMhpxeimfr8ayC3iwCmHOr6G0= X-Received: by 2002:a1c:6b90:: with SMTP id a16-v6mr2625539wmi.74.1532646070010; Thu, 26 Jul 2018 16:01:10 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id h7-v6sm1948532wmb.48.2018.07.26.16.01.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jul 2018 16:01:09 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 27 Jul 2018 00:00:59 +0100 Message-Id: <20180726230100.6629-4-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180726230100.6629-1-ross.burton@intel.com> References: <20180726230100.6629-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 4/5] update-rc.d: move to git.yoctoproject.org X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org The update-rc.d repository is now on git.yoctoproject.org, and has merged all of the patches we were carrying. Signed-off-by: Ross Burton --- .../update-rc.d/update-rc.d/add-verbose.patch | 49 ------------------ .../update-rc.d/check-if-symlinks-are-valid.patch | 59 ---------------------- .../fix-to-handle-priority-numbers-correctly.patch | 28 ---------- .../{update-rc.d_0.7.bb => update-rc.d_0.8.bb} | 11 +--- 4 files changed, 2 insertions(+), 145 deletions(-) delete mode 100644 meta/recipes-core/update-rc.d/update-rc.d/add-verbose.patch delete mode 100644 meta/recipes-core/update-rc.d/update-rc.d/check-if-symlinks-are-valid.patch delete mode 100644 meta/recipes-core/update-rc.d/update-rc.d/fix-to-handle-priority-numbers-correctly.patch rename meta/recipes-core/update-rc.d/{update-rc.d_0.7.bb => update-rc.d_0.8.bb} (64%) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/update-rc.d/update-rc.d/add-verbose.patch b/meta/recipes-core/update-rc.d/update-rc.d/add-verbose.patch deleted file mode 100644 index fb443ff15e6..00000000000 --- a/meta/recipes-core/update-rc.d/update-rc.d/add-verbose.patch +++ /dev/null @@ -1,49 +0,0 @@ -Upstream-Status: Pending - ---- update-rc.d/update-rc.d.org 2005-01-03 00:30:47.000000000 +0200 -+++ update-rc.d/update-rc.d 2007-12-01 19:41:08.000000000 +0200 -@@ -19,6 +19,7 @@ - notreally=0 - force=0 - dostart=0 -+verbose=0 - - usage() - { -@@ -28,6 +29,7 @@ - update-rc.d [-n] [-r ] [-s] start|stop NN runlvl [runlvl] [...] . - -n: not really - -f: force -+ -v: verbose - -r: alternate root path (default is /) - -s: invoke start methods if appropriate to current runlevel - EOF -@@ -69,7 +71,7 @@ - lev=`echo $2 | cut -d/ -f1` - nn=`echo $2 | cut -d/ -f2` - fn="${etcd}${lev}.d/${startstop}${nn}${bn}" -- echo " $fn -> ../init.d/$bn" -+ [ $verbose -eq 1 ] && echo " $fn -> ../init.d/$bn" - if [ $notreally -eq 0 ]; then - mkdir -p `dirname $fn` - ln -s ../init.d/$bn $fn -@@ -89,7 +91,7 @@ - exit 0 - fi - -- echo " Adding system startup for $initd/$bn ..." -+ echo " Adding system startup for $initd/$bn." - - for i in $startlinks; do - dolink S $i -@@ -105,6 +107,10 @@ - shift - continue - ;; -+ -v) verbose=1 -+ shift -+ continue -+ ;; - -f) force=1 - shift - continue diff --git a/meta/recipes-core/update-rc.d/update-rc.d/check-if-symlinks-are-valid.patch b/meta/recipes-core/update-rc.d/update-rc.d/check-if-symlinks-are-valid.patch deleted file mode 100644 index 075171a5a38..00000000000 --- a/meta/recipes-core/update-rc.d/update-rc.d/check-if-symlinks-are-valid.patch +++ /dev/null @@ -1,59 +0,0 @@ -Check if symlinks are valid - -When using root option and $initd/$bn is a symlink, the script would fail because -the symlink points to a path on target. For example: - -/path/to/target/rootfs/etc/init.d/syslog -> /etc/init.d/syslog.busybox - -Hence, [ -f /path/to/target/rootfs/etc/init.d/syslog ] condition would return -false. - -This patch adds the posibility to check whether the file the symlink points to -actually exists in rootfs path and then continue. - -Upstream-Status: Pending - -Signed-off-by: Laurentiu Palcu -Signed-off-by: Christopher Larson - -Index: git/update-rc.d -=================================================================== ---- git.orig/update-rc.d -+++ git/update-rc.d -@@ -147,13 +147,34 @@ fi - bn=$1 - shift - -+sn=$initd/$bn -+if [ -L "$sn" -a -n "$root" ]; then -+ if which readlink >/dev/null; then -+ while true; do -+ linksn="$(readlink "$sn")" -+ if [ -z "$linksn" ]; then -+ break -+ fi -+ -+ sn="$linksn" -+ case "$sn" in -+ /*) sn="$root$sn" ;; -+ *) sn="$initd/$sn" ;; -+ esac -+ done -+ else -+ echo "update-rc.d: readlink tool not present, cannot check whether \ -+ $sn symlink points to a valid file." >&2 -+ fi -+fi -+ - if [ $1 != "remove" ]; then -- if [ ! -f "$initd/$bn" ]; then -+ if [ ! -f "$sn" ]; then - echo "update-rc.d: $initd/$bn: file does not exist" >&2 - exit 1 - fi - else -- if [ -f "$initd/$bn" ]; then -+ if [ -f "$sn" ]; then - if [ $force -eq 1 ]; then - echo "update-rc.d: $initd/$bn exists during rc.d purge (continuing)" >&2 - else diff --git a/meta/recipes-core/update-rc.d/update-rc.d/fix-to-handle-priority-numbers-correctly.patch b/meta/recipes-core/update-rc.d/update-rc.d/fix-to-handle-priority-numbers-correctly.patch deleted file mode 100644 index 85bc234a275..00000000000 --- a/meta/recipes-core/update-rc.d/update-rc.d/fix-to-handle-priority-numbers-correctly.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream-Status: Pending - -Fix to handle priority numbers correctly. -Previously, if the priority number is '08' or '09', for example, -the script cannot handle them correctly as these numbers are treated -as octal numbers. - -Signed-off-by: Chen Qi ---- - update-rc.d | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/update-rc.d b/update-rc.d -index ec50d15..c70b859 100644 ---- a/update-rc.d -+++ b/update-rc.d -@@ -205,7 +205,7 @@ case $1 in - exit 1 - fi - shift -- NN=`printf %02d $1` -+ NN=`printf %02d $(expr $1 + 0)` - shift - while [ "x$1" != "x." ]; do - if [ $# -eq 0 ]; then --- -1.7.9.5 - diff --git a/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb b/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb similarity index 64% rename from meta/recipes-core/update-rc.d/update-rc.d_0.7.bb rename to meta/recipes-core/update-rc.d/update-rc.d_0.8.bb index d3d3e2f2377..baa21aeae13 100644 --- a/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb +++ b/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb @@ -6,16 +6,9 @@ SECTION = "base" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://update-rc.d;beginline=5;endline=15;md5=148a48321b10eb37c1fa3ee02b940a75" -PR = "r5" +SRC_URI = "git://git.yoctoproject.org/update-rc.d" +SRCREV = "22e0692898c3e7ceedc8eb5ff4ec8e0b9c340b2d" -# Revision corresponding to tag update-rc.d_0.7 -SRCREV = "eca680ddf28d024954895f59a241a622dd575c11" - -SRC_URI = "git://github.com/philb/update-rc.d.git \ - file://add-verbose.patch \ - file://check-if-symlinks-are-valid.patch \ - file://fix-to-handle-priority-numbers-correctly.patch \ - " UPSTREAM_CHECK_COMMITS = "1" S = "${WORKDIR}/git" From patchwork Thu Jul 26 23:01:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 143002 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp133122ljj; Thu, 26 Jul 2018 16:01:39 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcKIzrowAzTb7qmo5xaVJlJA3dOHXykADP/h0SZMRlP6lPrL45Z3f3mI4+skO5Phm3HmL8h X-Received: by 2002:a63:9802:: with SMTP id q2-v6mr3672967pgd.70.1532646099306; Thu, 26 Jul 2018 16:01:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532646099; cv=none; d=google.com; s=arc-20160816; b=n6wk7XqfvgMX/qHRit4hgOb5+vCAs8QdUgyu63KpCGKGLKQe8MJ6jrlj/Y2T7RaoPV hgGsNGVvAjp5WnreamlTai8UcNQLxg1LdTZNKkzY/3C/d8oqvnxt0u8ijnPt28aahqHZ s2czlP9CKKFoNdvD5Ga/kgDds+XEf3opTLOKOOQIU7g6soFAVV7mrs/14xmkNlHjpQwN Imx7zbu6VTAkEMattqRRPslhHbhrmWpXT19Ag3BtY5PoN2IRUjjer4dGqA8tVfnMjagc Ffpe/3//oyZSxyUFIhT7EovtylZnXTjvX7oayFmLtCIGs0TaS6afcdOGXN5euY/lzGW8 gxYg== 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=7S6Izl8zlxw/bXxZG92aNvZhhqAnkdL0LLCrkd7z5/E=; b=vpaZf8l7DbTgNzSrIqpndBSHemQMvhScLFHa/bz/jK0nvCfWB339+4Op7y/WgkzKU6 7W/ykPk5Vt2PuQuz6AoO6SpVGKKrPrF5xPidwOATczhAk3joAloA4EI9WjEWTzeyZ9aY vDF71v4goFaYbTerRcIHqn91yvFsPaX9D7lSlqOv61MtjvqTvdXO8BAIQ/FKYHeyHWWS 56Q5gwuwqwm55/EI5jMiFaIaUAwwpfWBkPj2V0ofQDknNQNjyWhQpPo/eb1prGF8kR7H P98CJyHvr+g+6r/OIGiMRREpVK9GvvaOq8AxxSdY2GTfPz1hIQdHkINDJ37laJMdUAu7 R2QQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=uV6qaE7m; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id h189-v6si2202730pge.66.2018.07.26.16.01.39; Thu, 26 Jul 2018 16:01:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-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=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=uV6qaE7m; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 4365C78C94; Thu, 26 Jul 2018 23:01:22 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mail.openembedded.org (Postfix) with ESMTP id D6AD778C59 for ; Thu, 26 Jul 2018 23:01:10 +0000 (UTC) Received: by mail-wr1-f46.google.com with SMTP id h15-v6so3231504wrs.7 for ; Thu, 26 Jul 2018 16:01:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=Q9x2j5h00tIxOYpax3r0mxin0zXOEoHtXVPcOjOUKQo=; b=uV6qaE7m+m25Pr4KWlQb2LJ6QIGdLeuebg1TM+zOF+/KMsHczz7y2GWPtEh2m9BzGD 54SUR4AMecwhvzl0xgp0c0akizFyPB1bD4Zlbq0zNPomr3DX+t618EJRaO/I0iGV8YeT KNY5kuMXOMouZ0BBTZkfBOX5F7Axdvrh+ocEDebvxfwxkBezWlKOpfg6qhEDjgCEQ8fu I26808I3unUQHMvNFji+6633xc+pVEN3Ek6AmJTtHOtORKjpxObknPKme1tK+25NSu3g s8fuE0t5MNGWFiQ/44ydyAXolL92ttOjG/dpGYeOvRA3IB7tQC1JnZN28JP03ZltBOQb qv9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=Q9x2j5h00tIxOYpax3r0mxin0zXOEoHtXVPcOjOUKQo=; b=P3isDeGJoyKZjrmFTFMUI6soJybPR5Qsg51N+O1K6PICtmqD+1iiozIk02TvUD9+JV FxCAimLUG4ghKbhSropm6h61ydgTRutx+QRZhCa8LbvR4fG6trM2rJgnMRoXaMDBIiNM SNGw4srF5q8KraYDwAfeV1y3dXFQKaYjo1yLKVVY12FrG7hzSbCvGWRIHGUowVCTPjwk H5sVrO/0mOFjqC4sp687Ge5WIqgzvJVvM7tiCNcCBVD/DvuJB/FxxrRG/XMej++uv50J 4TSqr81fr/48XN68IyFipBtfjhChc3LrhrkesHKZxgBBwgBfrUZrFke8LHma1Ul1ZT+4 vRMA== X-Gm-Message-State: AOUpUlFe54qxJqkoDG5oXJ6Iuet2XFJ/tef9SEHhjyFEmmPNM3gtupNU U3ZdMjfI4jk9cHD8wHf0+v546PZvJ6k= X-Received: by 2002:adf:ad38:: with SMTP id p53-v6mr3022186wrc.10.1532646071038; Thu, 26 Jul 2018 16:01:11 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id h7-v6sm1948532wmb.48.2018.07.26.16.01.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jul 2018 16:01:10 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 27 Jul 2018 00:01:00 +0100 Message-Id: <20180726230100.6629-5-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180726230100.6629-1-ross.burton@intel.com> References: <20180726230100.6629-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 5/5] unzip: fix symlink problem X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Signed-off-by: Ross Burton --- meta/recipes-extended/unzip/unzip/symlink.patch | 26 +++++++++++++++++++++++++ meta/recipes-extended/unzip/unzip_6.0.bb | 1 + 2 files changed, 27 insertions(+) create mode 100644 meta/recipes-extended/unzip/unzip/symlink.patch -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-extended/unzip/unzip/symlink.patch b/meta/recipes-extended/unzip/unzip/symlink.patch new file mode 100644 index 00000000000..a38f6f16123 --- /dev/null +++ b/meta/recipes-extended/unzip/unzip/symlink.patch @@ -0,0 +1,26 @@ +Unzip doesn't handle large zip files well and crashes: + +"This only happens if you have more then 16k entries and when one of +the 16k entry infos is reused it happend to be previously used for +a symlink entry." + +This patch is taken from Fedora (https://bugzilla.redhat.com/show_bug.cgi?id=972427) + +Upstream-Status: Pending (upstream is dead) +Signed-off-by: Ross Burton + +--- unzip60/process.c.sav 2013-06-09 12:08:57.070392264 +0200 ++++ unzip60/process.c 2013-06-09 12:10:08.641696988 +0200 +@@ -1751,6 +1751,12 @@ + = (G.crec.general_purpose_bit_flag & (1 << 11)) == (1 << 11); + #endif + ++#ifdef SYMLINKS ++ /* Initialize the symlink flag, may be set by the platform-specific ++ mapattr function. */ ++ G.pInfo->symlink = 0; ++#endif ++ + return PK_COOL; + + } /* end function process_cdir_file_hdr() */ diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb b/meta/recipes-extended/unzip/unzip_6.0.bb index 105d048f55b..dbf4112a4c6 100644 --- a/meta/recipes-extended/unzip/unzip_6.0.bb +++ b/meta/recipes-extended/unzip/unzip_6.0.bb @@ -19,6 +19,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/ file://fix-security-format.patch \ file://18-cve-2014-9913-unzip-buffer-overflow.patch \ file://19-cve-2016-9844-zipinfo-buffer-overflow.patch \ + file://symlink.patch \ " UPSTREAM_VERSION_UNKNOWN = "1"