From 373c69ed1c0c125e74c991d6fcc6aef27dcce1d3 Mon Sep 17 00:00:00 2001
From: Antia Puentes <apuentes@igalia.com>
Date: Tue, 18 Feb 2020 12:48:03 +0100
Subject: [PATCH] wam: bump revision, delete tinyproxy
Since the WAM revision this patch updates to, tinyproxy code is no
longer referenced by WAM, delete its recipe and references.
Bug-AGL: SPEC-3185
Change-Id: I6c3c241de2b7bc61be8a184c3c96397d478e04a5
Signed-off-by: Antia Puentes <apuentes@igalia.com>
---
.../recipes-wam/wam/wam-tinyproxy_git.bb | 20 --------------------
.../recipes-wam/wam/wam_git.bb | 3 +--
2 files changed, 1 insertion(+), 22 deletions(-)
delete mode 100644 meta-agl-profile-graphical-html5/recipes-wam/wam/wam-tinyproxy_git.bb
diff --git a/meta-agl-profile-graphical-html5/recipes-wam/wam/wam-tinyproxy_git.bb b/meta-agl-profile-graphical-html5/recipes-wam/wam/wam-tinyproxy_git.bb
deleted file mode 100644
index 25a6ed2d..00000000
--- a/meta-agl-profile-graphical-html5/recipes-wam/wam/wam-tinyproxy_git.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-SUMMARY = "Lightweight http(s) proxy daemon"
-HOMEPAGE = "https://tinyproxy.github.io/"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-
-SRC_URI = "git://github.com/Igalia/${PN}.git;branch=wam-proxy;protocol=https"
-S = "${WORKDIR}/git"
-SRCREV = "ab1b5c5a53960afd91d50b1f11e339f653602de8"
-
-EXTRA_OECONF += " \
- --enable-filter \
- --enable-transparent \
- --enable-reverse \
- --enable-upstream \
- --enable-xtinyproxy \
- "
-
-inherit autotools
-
-FILES_${PN} += "${datadir}/tinyproxy/*"
diff --git a/meta-agl-profile-graphical-html5/recipes-wam/wam/wam_git.bb b/meta-agl-profile-graphical-html5/recipes-wam/wam/wam_git.bb
index 1161359a..2ccd6e63 100644
--- a/meta-agl-profile-graphical-html5/recipes-wam/wam/wam_git.bb
+++ b/meta-agl-profile-graphical-html5/recipes-wam/wam/wam_git.bb
@@ -25,7 +25,7 @@ SRC_URI = "\
file://trunc-webapp-roles.patch \
"
S = "${WORKDIR}/git"
-SRCREV = "a9e009347be183b1b880243151a2242f2f6c59b9"
+SRCREV = "060043b40ffc9fafcf94eec832c2158e81c74f32"
do_install_append() {
install -d ${D}${sysconfdir}/wam
@@ -39,7 +39,6 @@ do_install_append() {
ln -sf ../WebAppMgr@.service ${D}${systemd_system_unitdir}/afm-user-session@.target.wants/
}
-RDEPENDS_${PN} += "wam-tinyproxy"
FILES_${PN} += "${sysconfdir}/init ${sysconfdir}/wam ${libdir}/webappmanager/plugins/*.so ${systemd_system_unitdir}"
CXXFLAGS_append_agl-devel = " -DAGL_DEVEL"
--
2.16.6