4 files changed, 1 insertions, 18 deletions
diff --git a/recipes/squid/squid.inc b/recipes/squid/squid.inc
index 477335b152..daeeb55f98 100644
--- a/recipes/squid/squid.inc
+++ b/recipes/squid/squid.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"
-LICENSE = "GPLv2"
+LICENSE = "GPL"
 INC_PR = "r10"
 DEPENDS = "openssl openssl-native openldap"
 
diff --git a/recipes/squid/squid_2.6.STABLE14.bb b/recipes/squid/squid_2.6.STABLE14.bb
deleted file mode 100644
index 9707ccc6bb..0000000000
--- a/recipes/squid/squid_2.6.STABLE14.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-PR = "${INC_PR}.0"
-
-include squid.inc
-
-EXTRA_OECONF += "--enable-storeio=null,ufs"
-
-SRC_URI += "file://fix_epoll_check.patch \
-	   file://squidv2-build-cf_gen.patch"
-
-SRC_URI[squid-2.6.STABLE14.md5sum] = "eadb138d48320df8b99349121159c6bf"
-SRC_URI[squid-2.6.STABLE14.sha256sum] = "dcb0c10965430862721b675e2f9f6a30819880e03124b5e9403bfce2c7f3b69a"
diff --git a/recipes/squid/squid_2.7.STABLE8.bb b/recipes/squid/squid_2.7.STABLE8.bb
index 039f986b5d..26e0d556c0 100644
--- a/recipes/squid/squid_2.7.STABLE8.bb
+++ b/recipes/squid/squid_2.7.STABLE8.bb
@@ -2,9 +2,6 @@ PR = "${INC_PR}.0"
 
 include squid.inc
 
-# GPLv2+ since 2.6.STABLE18
-LICENSE = "GPL"
-
 EXTRA_OECONF += "--enable-epoll --enable-storeio=null,ufs"
 
 SRC_URI += "file://fix_epoll_check.patch \
diff --git a/recipes/squid/squid_3.1.7.bb b/recipes/squid/squid_3.1.7.bb
index de0ddcd0d6..3c831dfeae 100644
--- a/recipes/squid/squid_3.1.7.bb
+++ b/recipes/squid/squid_3.1.7.bb
@@ -2,9 +2,6 @@ PR = "${INC_PR}.0"
 
 include squid.inc
 
-# GPLv2+ since 2.6.STABLE18
-LICENSE = "GPL"
-
 EXTRA_OECONF += "--enable-epoll --enable-icap-client --with-dl --enable-linux-netfilter"
 
 EXTRA_OEMAKE += "DEFAULT_STYLESHEET=${sysconfdir}/squid/errorpage.css DEFAULT_CONFIG_DIR=${sysconfdir}/squid"