diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-02-24 10:12:36 +0000 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-02-24 13:07:43 +0100 |
commit | a04e14f407ccff319280edab69ffd8dfd4b206cc (patch) | |
tree | 035038ffbf0b895308e2c33a2aa55e325461a7a7 /meta-oe/recipes-support | |
parent | 10fa697e2782143be775646c5015fff7461d66d9 (diff) | |
download | meta-openembedded-a04e14f407ccff319280edab69ffd8dfd4b206cc.tar.gz |
Tidy up unused files
In 3fdcb18dd6861f442f18c7c3a1638e9c8e158b83 the cups and ldconfig-native
recipes were removed but the associated files weren't, so remove those
as well.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-support')
3 files changed, 0 insertions, 163 deletions
diff --git a/meta-oe/recipes-support/cups/cups-1.4.6/0001-don-t-try-to-run-generated-binaries.patch b/meta-oe/recipes-support/cups/cups-1.4.6/0001-don-t-try-to-run-generated-binaries.patch deleted file mode 100644 index 7b544ca0e3..0000000000 --- a/meta-oe/recipes-support/cups/cups-1.4.6/0001-don-t-try-to-run-generated-binaries.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 90069586167b930befce7303aea57078f04b4ed8 Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Sun, 30 Jan 2011 16:37:27 +0100 -Subject: [PATCH] don't try to run generated binaries - -Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> ---- - ppdc/Makefile | 30 +++++++++++++++--------------- - 1 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/ppdc/Makefile b/ppdc/Makefile -index 0288d47..fc87f1b 100644 ---- a/ppdc/Makefile -+++ b/ppdc/Makefile -@@ -243,8 +243,8 @@ genstrings: genstrings.o libcupsppdc.a ../cups/libcups.a \ - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ - libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \ - $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) -- echo Generating localization strings... -- ./genstrings >sample.c -+# echo Generating localization strings... -+# ./genstrings >sample.c - - - # -@@ -261,9 +261,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cups/libcups.a foo.drv foo-fr.po - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ - ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ - $(COMMONLIBS) $(LIBZ) -- echo Testing PPD compiler... -- ./ppdc-static -l en,fr -I ../data foo.drv -- ./ppdc-static -l en,fr -z -I ../data foo.drv -+# echo Testing PPD compiler... -+# ./ppdc-static -l en,fr -I ../data foo.drv -+# ./ppdc-static -l en,fr -z -I ../data foo.drv - - - # -@@ -290,16 +290,16 @@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/libcups.a - ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ - $(COMMONLIBS) $(LIBZ) - echo Testing PPD importer... -- $(RM) -r ppd ppd2 sample-import.drv -- ./ppdc-static -I ../data sample.drv -- ./ppdi-static -I ../data -o sample-import.drv ppd/* -- ./ppdc-static -I ../data -d ppd2 sample-import.drv -- if diff -r ppd ppd2 >/dev/null; then \ -- echo PPD import OK; \ -- else \ -- echo PPD import FAILED; \ -- exit 1; \ -- fi -+# $(RM) -r ppd ppd2 sample-import.drv -+# ./ppdc-static -I ../data sample.drv -+# ./ppdi-static -I ../data -o sample-import.drv ppd/* -+# ./ppdc-static -I ../data -d ppd2 sample-import.drv -+# if diff -r ppd ppd2 >/dev/null; then \ -+# echo PPD import OK; \ -+# else \ -+# echo PPD import FAILED; \ -+# exit 1; \ -+# fi - - - # --- -1.6.6.1 - diff --git a/meta-oe/recipes-support/cups/cups-1.4.6/use_echo_only_in_init.patch b/meta-oe/recipes-support/cups/cups-1.4.6/use_echo_only_in_init.patch deleted file mode 100644 index 21ff0e535b..0000000000 --- a/meta-oe/recipes-support/cups/cups-1.4.6/use_echo_only_in_init.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/init/cups.sh.in.orig 2008-10-04 16:50:46.000000000 -0300 -+++ b/init/cups.sh.in 2008-10-04 16:51:39.000000000 -0300 -@@ -68,7 +68,7 @@ - ECHO_ERROR=: - ;; - -- Linux*) -+ DISABLELinux*) - IS_ON=/bin/true - if test -f /etc/init.d/functions; then - . /etc/init.d/functions diff --git a/meta-oe/recipes-support/cups/cups14.inc b/meta-oe/recipes-support/cups/cups14.inc deleted file mode 100644 index 430d3ab5b5..0000000000 --- a/meta-oe/recipes-support/cups/cups14.inc +++ /dev/null @@ -1,84 +0,0 @@ -DESCRIPTION = "An Internet printing system for Unix." -SECTION = "console/utils" -LICENSE = "GPLv2 LGPLv2" -DEPENDS = "gnutls libpng jpeg dbus dbus-glib zlib" -PROVIDES = "cups14" - -SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2" - -LEAD_SONAME = "libcupsdriver.so" - -inherit autotools binconfig - -EXTRA_OECONF = " \ - --enable-gnutls \ - --enable-dbus \ - --enable-browsing \ - --disable-openssl \ - --disable-tiff \ - --without-php \ - --without-perl \ - --without-python \ - --without-java \ - " - - -do_configure() { - gnu-configize - libtoolize --force - DSOFLAGS="${LDFLAGS}" oe_runconf -} - -do_compile () { - sed -i s:STRIP:NOSTRIP: Makedefs - sed -i s:serial:: backend/Makefile - - echo "all:" > man/Makefile - echo "libs:" >> man/Makefile - echo "install:" >> man/Makefile - echo "install-data:" >> man/Makefile - echo "install-exec:" >> man/Makefile - echo "install-headers:" >> man/Makefile - echo "install-libs:" >> man/Makefile - - oe_runmake "SSLLIBS=-lgnutls -L${STAGING_LIBDIR}" \ - "LIBPNG=-lpng -lm -L${STAGING_LIBDIR}" \ - "LIBJPEG=-ljpeg -L${STAGING_LIBDIR}" \ - "LIBZ=-lz -L${STAGING_LIBDIR}" \ - "-I." -} - -fakeroot do_install () { - oe_runmake "DSTROOT=${D}" install - - # This directory gets installed with perms 511, which makes packaging fail - chmod 0711 "${D}/${localstatedir}/run/cups/certs" -} - -python do_package_append() { - # Change permissions back the way they were, they probably had a reason... - workdir = bb.data.getVar('WORKDIR', d, 1) - os.system('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir) -} - -PACKAGES =+ "${PN}-lib ${PN}-libimage" - -FILES_${PN}-lib = "${libdir}/libcups.so.*" - -FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*" - -FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \ - ${libdir}/cups/cgi-bin/.debug \ - ${libdir}/cups/filter/.debug \ - ${libdir}/cups/monitor/.debug \ - ${libdir}/cups/notifier/.debug \ - ${libdir}/cups/daemon/.debug \ - " - -#package the html for the webgui inside the main packages (~1MB uncompressed) - -FILES_${PN} += "${datadir}/doc/cups/images \ - ${datadir}/doc/cups/*html \ - ${datadir}/doc/cups/*.css \ - ${datadir}/icons/ \ - " |