summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/cups/cups.inc12
1 files changed, 5 insertions, 7 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index 714be4b26c..0acc5c575e 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -48,6 +48,7 @@ PACKAGECONFIG[gnutls] = "--with-tls=gnutls,--with-tls=no,gnutls"
48PACKAGECONFIG[pam] = "--enable-pam --with-pam-module=unix, --disable-pam, libpam" 48PACKAGECONFIG[pam] = "--enable-pam --with-pam-module=unix, --disable-pam, libpam"
49PACKAGECONFIG[systemd] = "--with-systemd=${systemd_system_unitdir},--without-systemd,systemd" 49PACKAGECONFIG[systemd] = "--with-systemd=${systemd_system_unitdir},--without-systemd,systemd"
50PACKAGECONFIG[xinetd] = "--with-xinetd=${sysconfdir}/xinetd.d,--without-xinetd,xinetd" 50PACKAGECONFIG[xinetd] = "--with-xinetd=${sysconfdir}/xinetd.d,--without-xinetd,xinetd"
51PACKAGECONFIG[webif] = "--enable-webif,--disable-webif"
51 52
52EXTRA_OECONF = " \ 53EXTRA_OECONF = " \
53 --enable-dbus \ 54 --enable-dbus \
@@ -93,7 +94,7 @@ do_install () {
93 fi 94 fi
94} 95}
95 96
96PACKAGES =+ "${PN}-lib ${PN}-libimage" 97PACKAGES =+ "${PN}-lib ${PN}-libimage ${PN}-webif"
97 98
98RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'procps', '', d)}" 99RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'procps', '', d)}"
99FILES:${PN} += "${libexecdir}/cups/" 100FILES:${PN} += "${libexecdir}/cups/"
@@ -102,13 +103,10 @@ FILES:${PN}-lib = "${libdir}/libcups.so.*"
102 103
103FILES:${PN}-libimage = "${libdir}/libcupsimage.so.*" 104FILES:${PN}-libimage = "${libdir}/libcupsimage.so.*"
104 105
105#package the html for the webgui inside the main packages (~1MB uncompressed) 106# put the html for the web interface into its own PACKAGE
107FILES:${PN}-webif += "${datadir}/doc/cups/ ${datadir}/icons/"
108RRECOMMENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'webif', '${PN}-webif', '', d)}"
106 109
107FILES:${PN} += "${datadir}/doc/cups/images \
108 ${datadir}/doc/cups/*html \
109 ${datadir}/doc/cups/*.css \
110 ${datadir}/icons/ \
111 "
112CONFFILES:${PN} += "${sysconfdir}/cups/cupsd.conf" 110CONFFILES:${PN} += "${sysconfdir}/cups/cupsd.conf"
113 111
114MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/cups-config" 112MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/cups-config"