summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuang Qiyu <huangqy.fnst@cn.fujitsu.com>2016-12-07 10:16:51 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-13 22:55:20 +0000
commit2b7abbb383aad1f7ce6d392756b0c1b7666db95a (patch)
treed43818b77b6266b1d5e91ffaf70d4b7f4cbb7d34
parent08c5de41da1810d8724c332e975ba1f31757ed2f (diff)
downloadpoky-2b7abbb383aad1f7ce6d392756b0c1b7666db95a.tar.gz
cups: 2.1.4 -> 2.2.1
Upgrade cups from 2.1.4 to 2.2.1. License checksum changes are not related to license changes. (From OE-Core rev: 1b4427483349d4653a0060b045a7df964a779870) Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/cups/cups.inc2
-rw-r--r--meta/recipes-extended/cups/cups_2.1.4.bb6
-rw-r--r--meta/recipes-extended/cups/cups_2.2.1.bb6
3 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index 02b6358afe..e18980bcca 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -3,7 +3,7 @@ SECTION = "console/utils"
3LICENSE = "GPLv2 & LGPLv2" 3LICENSE = "GPLv2 & LGPLv2"
4DEPENDS = "gnutls libpng jpeg dbus dbus-glib zlib libusb" 4DEPENDS = "gnutls libpng jpeg dbus dbus-glib zlib libusb"
5 5
6SRC_URI = "https://github.com/apple/cups/releases/download/release-${PV}/${BP}-source.tar.gz \ 6SRC_URI = "https://github.com/apple/cups/releases/download/v${PV}/${BP}-source.tar.gz \
7 file://use_echo_only_in_init.patch \ 7 file://use_echo_only_in_init.patch \
8 file://0001-don-t-try-to-run-generated-binaries.patch \ 8 file://0001-don-t-try-to-run-generated-binaries.patch \
9 file://cups_serverbin.patch \ 9 file://cups_serverbin.patch \
diff --git a/meta/recipes-extended/cups/cups_2.1.4.bb b/meta/recipes-extended/cups/cups_2.1.4.bb
deleted file mode 100644
index 0fab806f99..0000000000
--- a/meta/recipes-extended/cups/cups_2.1.4.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require cups.inc
2
3LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=6c5a350596fba02754bd96eb6df3afd0"
4
5SRC_URI[md5sum] = "9f9bf6e3b9c20a3519b4dc409666d6e7"
6SRC_URI[sha256sum] = "4b14fd833180ac529ebebea766a09094c2568bf8426e219cb3a1715304ef728d"
diff --git a/meta/recipes-extended/cups/cups_2.2.1.bb b/meta/recipes-extended/cups/cups_2.2.1.bb
new file mode 100644
index 0000000000..7c5e776eae
--- /dev/null
+++ b/meta/recipes-extended/cups/cups_2.2.1.bb
@@ -0,0 +1,6 @@
1require cups.inc
2
3LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f212b4338db0da8cb892e94bf2949460"
4
5SRC_URI[md5sum] = "a94da2a1e9dbdccb4f3836a38a431931"
6SRC_URI[sha256sum] = "83b8730aa977cc055e7410df6a3a682548994c113994ca630a16513017e419d5"