diff options
Diffstat (limited to 'poky/meta/recipes-extended/cups')
4 files changed, 30 insertions, 8 deletions
diff --git a/poky/meta/recipes-extended/cups/cups.inc b/poky/meta/recipes-extended/cups/cups.inc index ac4d225c1..c142a4d99 100644 --- a/poky/meta/recipes-extended/cups/cups.inc +++ b/poky/meta/recipes-extended/cups/cups.inc @@ -2,13 +2,14 @@ SUMMARY = "An Internet printing system for Unix" HOMEPAGE = "https://www.cups.org/" SECTION = "console/utils" LICENSE = "GPLv2 & LGPLv2" -DEPENDS = "gnutls libpng jpeg dbus dbus-glib zlib libusb" +DEPENDS = "gnutls libpng jpeg dbus dbus-glib zlib libusb1" SRC_URI = "https://github.com/apple/cups/releases/download/v${PV}/${BP}-source.tar.gz \ file://use_echo_only_in_init.patch \ file://0001-don-t-try-to-run-generated-binaries.patch \ file://cups_serverbin.patch \ - " + file://cups-avoid-install-file-conflicts.patch \ + " UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases" UPSTREAM_CHECK_REGEX = "cups-(?P<pver>\d+\.\d+(\.\d+)?)-source.tar" diff --git a/poky/meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch b/poky/meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch new file mode 100644 index 000000000..68885fa4d --- /dev/null +++ b/poky/meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch @@ -0,0 +1,21 @@ +@CUPS_SERVERBIN@ is ${libdir} related that causes multilib install file +conflict. Remove @CUPS_SERVERBIN@ from the comment line of cups-files.conf to +avoid the conflict. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in +index 4a78ba6..03c6582 100644 +--- a/conf/cups-files.conf.in ++++ b/conf/cups-files.conf.in +@@ -73,7 +73,7 @@ PageLog @CUPS_LOGDIR@/page_log + #RequestRoot @CUPS_REQUESTS@ + + # Location of helper programs... +-#ServerBin @CUPS_SERVERBIN@ ++#ServerBin + + # SSL/TLS keychain for the scheduler... + #ServerKeychain @CUPS_SERVERKEYCHAIN@ diff --git a/poky/meta/recipes-extended/cups/cups_2.2.6.bb b/poky/meta/recipes-extended/cups/cups_2.2.6.bb deleted file mode 100644 index 3aa934bc0..000000000 --- a/poky/meta/recipes-extended/cups/cups_2.2.6.bb +++ /dev/null @@ -1,6 +0,0 @@ -require cups.inc - -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f212b4338db0da8cb892e94bf2949460" - -SRC_URI[md5sum] = "e91c26d8d97b5a1630a962f530f02192" -SRC_URI[sha256sum] = "40385778c2b3bdf55030d1c999734e22774c79e3425d91339ce677825620169b" diff --git a/poky/meta/recipes-extended/cups/cups_2.2.8.bb b/poky/meta/recipes-extended/cups/cups_2.2.8.bb new file mode 100644 index 000000000..de1bd84bf --- /dev/null +++ b/poky/meta/recipes-extended/cups/cups_2.2.8.bb @@ -0,0 +1,6 @@ +require cups.inc + +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f212b4338db0da8cb892e94bf2949460" + +SRC_URI[md5sum] = "33150d08993a04c8e22176e93805a051" +SRC_URI[sha256sum] = "3968fc1d26fc48727508db1c1380e36c6694ab90177fd6920aec5f6cc73af9e4" |