Patchwork [meta-oe] recipe: Delete the duplicate recipes which are already in oe-core

login
register
mail settings
Submitter Khem Raj
Date Feb. 4, 2012, 6:02 p.m.
Message ID <1328378573-11998-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/20693/
State Accepted
Commit 3fdcb18dd6861f442f18c7c3a1638e9c8e158b83
Headers show

Comments

Khem Raj - Feb. 4, 2012, 6:02 p.m.
These recipes are either same or have small differences but
are superset of changes in oe-core. We can use them from oe-core
as it is without losing or adding any functionality by default

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../recipes-core/eglibc/ldconfig-native_2.12.1.bb  |   28 --------------------
 meta-oe/recipes-graphics/xorg-app/rgb_1.0.4.bb     |   10 -------
 meta-oe/recipes-support/cups/cups_1.4.6.bb         |   17 ------------
 3 files changed, 0 insertions(+), 55 deletions(-)
 delete mode 100644 meta-oe/recipes-core/eglibc/ldconfig-native_2.12.1.bb
 delete mode 100644 meta-oe/recipes-graphics/xorg-app/rgb_1.0.4.bb
 delete mode 100644 meta-oe/recipes-support/cups/cups_1.4.6.bb

Patch

diff --git a/meta-oe/recipes-core/eglibc/ldconfig-native_2.12.1.bb b/meta-oe/recipes-core/eglibc/ldconfig-native_2.12.1.bb
deleted file mode 100644
index 2a93913..0000000
--- a/meta-oe/recipes-core/eglibc/ldconfig-native_2.12.1.bb
+++ /dev/null
@@ -1,28 +0,0 @@ 
-DESCRIPTION = "A standalone native ldconfig build"
-
-LICENSE = "GPLv2+"
-
-LIC_FILES_CHKSUM = "file://${S}/ldconfig.c;endline=17;md5=1d15f20937c055cb5de2329a4c054399"
-
-SRC_URI = "file://ldconfig-native-2.12.1.tar.bz2 \
-           file://ldconfig.patch \
-           file://ldconfig_aux-cache_path_fix.patch \
-           file://32and64bit.patch \
-           file://endian-ness_handling.patch \
-           file://flag_fix.patch \
-           file://endianess-header.patch"
-
-PR = "r2"
-
-inherit native
-
-S = "${WORKDIR}/${PN}-${PV}"
-
-do_compile () {
-	$CC ldconfig.c -std=gnu99 chroot_canon.c xmalloc.c xstrdup.c cache.c readlib.c  -I. dl-cache.c -o ldconfig
-}
-
-do_install () {
-	install -d ${D}/${bindir}/
-	install ldconfig ${D}/${bindir}/
-}
diff --git a/meta-oe/recipes-graphics/xorg-app/rgb_1.0.4.bb b/meta-oe/recipes-graphics/xorg-app/rgb_1.0.4.bb
deleted file mode 100644
index d51e1e8..0000000
--- a/meta-oe/recipes-graphics/xorg-app/rgb_1.0.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@ 
-require recipes-graphics/xorg-app/xorg-app-common.inc
-DEPENDS += " xproto util-macros"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ef598adbe241bd0b0b9113831f6e249a"
-PE = "1"
-PR = "r6"
-
-SRC_URI[md5sum] = "35c6cccbf25a872bdd62bfcb1a73d951"
-SRC_URI[sha256sum] = "80887da011ad086fff88bfd16c6d9d5ac7da45ef1bc9d0c192a6f370423370f1"
-
-FILES_${PN} += "${datadir}/X11"
diff --git a/meta-oe/recipes-support/cups/cups_1.4.6.bb b/meta-oe/recipes-support/cups/cups_1.4.6.bb
deleted file mode 100644
index 783ecf6..0000000
--- a/meta-oe/recipes-support/cups/cups_1.4.6.bb
+++ /dev/null
@@ -1,17 +0,0 @@ 
-require cups14.inc
-
-DEPENDS += "virtual/libusb0"
-
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=956e7600195e6139f12de8c2a5bbefa9"
-
-SRC_URI += " \
-	file://use_echo_only_in_init.patch \
-    file://0001-don-t-try-to-run-generated-binaries.patch \
-	"
-
-SRC_URI[md5sum] = "de8fb5a29c36554925c0c6a6e2c0dae1"
-SRC_URI[sha256sum] = "f08711702a77b52c7150f96fe1f45482f6151cb95ef601268c528607fe6ad514"
-
-EXTRA_OECONF += " --disable-gssapi --enable-debug --disable-relro --enable-libusb"
-
-CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf"