From patchwork Thu Apr 4 22:16:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 161810 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp2140930jan; Thu, 4 Apr 2019 15:17:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqz9LNBlDA73k9mobhIJHX/1hxi4t1qmKRLdWsd8O3pf/Q9KDndynx+6Ueym33JZ8y/x4cDq X-Received: by 2002:a62:1a0d:: with SMTP id a13mr8691616pfa.198.1554416246304; Thu, 04 Apr 2019 15:17:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554416246; cv=none; d=google.com; s=arc-20160816; b=jmiXKWh89gbPRvrLgu7g6d2R5/E29E5MGB8Y/eqlmBWkptR8HMnlAk87mpy6lFpUeq JQGmNhC36Uh2+A9nToDECBfkXDQhHIIJHd6ecedgC5e5UMKIgc9DeG15tFsMeAeAz5KL rLx43wnSTkyVXkHNd/T7Qb8QtejOGJNpifRVrfWta+VbaIKxx+UuJ6Ow3y78BJ4uVAII N92Q8paknJUEALDAj/SlgKpGhe443VokdG1grBx8GnyqwIQQkVOY5vFfrZl8C5cNw6Q9 S3PRgO0wjohCpq/orYAQ1E0jtnsZ0WCtLzARGKZ2IkDPxP+9OLYfKwRhPpJAO3liPUvv M12A== 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; bh=aW7Mt0+0mRdRVGNYNJCTvX93MiVCrhg+os47D5SuZHs=; b=OLXVTB4P1vBwnlP4RZ3/lqyF22s1Bu3eL2Qt/xLqzlLQnQJAg6HuzS1O6/Q0GzZDgm AVLyKyhkcP4a6FuzzVqU9pK4CVsEhZIkVCkuqZL4muWX+TtojNnwKq1MDw0j2HvRUIi0 c1/ftKM4mSguUVPB4ZhJ0QuRotKmQR0pPIf7YSaEu/J4QqJM2Y0M9S2QN9XMXVJ+ds5Z evhdDcZj95Jd1RSi4yb5fHRLpf31nBidWeDolyWeXBUASCYwFiMCFMMrDRCTlXFs/sva vtdAu3pjFFZ5rhHVIqNisaKPkds/wnG1W0yieU4z7t7fmIf/3YBSB1/0IcJN7uhrYsA3 UWbw== 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=kekp7Ua5; 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 f8si4714975pfd.105.2019.04.04.15.17.25; Thu, 04 Apr 2019 15:17: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=kekp7Ua5; 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 ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 715FA7D503; Thu, 4 Apr 2019 22:17:10 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mail.openembedded.org (Postfix) with ESMTP id E6D847D45D for ; Thu, 4 Apr 2019 22:16:56 +0000 (UTC) Received: by mail-wm1-f50.google.com with SMTP id 4so4738189wmf.1 for ; Thu, 04 Apr 2019 15:16:58 -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=i1z15cK+pxeM88okhoBfO8Cc9buWEeDOQ639wSWAEgY=; b=kekp7Ua5olx6kb5shv8lOhHmpSMkliRBhc1TVzv/0RK/J21d/b8bZ/jLeYlGFuhrbf s8NXOQ+/00yMeN/CWTWxpSio5NM4WRd5jueb9egvNVx/Ns2We5T4DO2JVs9kos7GDLSL Dj9Cc4zoKlqioV9Quji7W+3G52W52nUnw6dulbg8kkOC/zWmpTvny+nVTy+yrF/rVY+q OGibVQ9c0xWuE17AL4H3Vic7Ek3ECL/XXdrPJkLixYb0gkKVNakWGFt0NZZnWDlOcMUL po4vHmKlqhOFfUGyM6IdTr3dQFHVvMn8PQ0a18a0Zq7LShrZBuym4aPQBR09vGtzgFbO Qb5w== 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=i1z15cK+pxeM88okhoBfO8Cc9buWEeDOQ639wSWAEgY=; b=jUMyn3vqdutnOETYgNdNaoSuP41IZRbTahgpF6MdvIdZbieFrK8Z6F0txUHsbHQlMA 1UUfMfLDI3z5nOcxe++N77UyOxUG6SxmC6/zhsQkcsS5ZRdsl/1CSUHrJdHXascZST+2 Myo6PX6kKuaDomcF4osTvLG/pdt7kP7MvC22gkDgORkdLgkDH+HebzG7ep6TmLIGlGkI 6ZZv+xUVZtsDgC2zLgD0JdrjNakp2v5IW4Q8HVOmbfDlwPurNuIyhonYauZx8kzFaVhQ dBhFApyg+LQRRYsIhQRQ8SzGEr4LE6DNUGPG6O1wYswn7eAbHH7NSEarIBZ+DNemXRcg R+cQ== X-Gm-Message-State: APjAAAV4jfcymbO1ktJ9HQwZf47xObnxrOpwnogVmdBJkIfeU8lLj+1Y 46Eo8b+fLwNJR8QHMn2FAx+xMk2WOdE= X-Received: by 2002:a1c:6588:: with SMTP id z130mr5689040wmb.39.1554416217511; Thu, 04 Apr 2019 15:16:57 -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 d3sm305565wmf.46.2019.04.04.15.16.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Apr 2019 15:16:56 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Thu, 4 Apr 2019 23:16:40 +0100 Message-Id: <20190404221644.20496-5-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190404221644.20496-1-ross.burton@intel.com> References: <20190404221644.20496-1-ross.burton@intel.com> Subject: [OE-core] [PATCH v2 5/9] libxslt: update for new catalog path 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 XML catalogue is now at the canonical path, ${sysconfdir}/xml/catalog. Signed-off-by: Ross Burton --- meta/recipes-support/libxslt/libxslt_1.1.33.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 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-support/libxslt/libxslt_1.1.33.bb b/meta/recipes-support/libxslt/libxslt_1.1.33.bb index fd442d44f72..28d404ca779 100644 --- a/meta/recipes-support/libxslt/libxslt_1.1.33.bb +++ b/meta/recipes-support/libxslt/libxslt_1.1.33.bb @@ -36,9 +36,9 @@ RPROVIDES_${PN}-bin += "${PN}-utils" RCONFLICTS_${PN}-bin += "${PN}-utils" RREPLACES_${PN}-bin += "${PN}-utils" - +# This is only needed until libxml can load the relocated catalog itself do_install_append_class-native () { - create_wrapper ${D}/${bindir}/xsltproc XML_CATALOG_FILES=${sysconfdir}/xml/catalog.xml + create_wrapper ${D}/${bindir}/xsltproc XML_CATALOG_FILES=${sysconfdir}/xml/catalog } FILES_${PN} += "${libdir}/libxslt-plugins"