From b2f192faabe412adce79534e22efe9fb69ee40e2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 21 Jul 2006 10:10:31 +0000 Subject: Rename /openembedded/ -> /meta/ git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../pcmciautils/pcmciautils-013/makefile_fix.patch | 20 ------------- .../pcmciautils-013/version_workaround.patch | 16 ----------- .../packages/pcmciautils/pcmciautils_010.bb | 31 -------------------- .../packages/pcmciautils/pcmciautils_013.bb | 33 ---------------------- 4 files changed, 100 deletions(-) delete mode 100644 openembedded/packages/pcmciautils/pcmciautils-013/makefile_fix.patch delete mode 100644 openembedded/packages/pcmciautils/pcmciautils-013/version_workaround.patch delete mode 100644 openembedded/packages/pcmciautils/pcmciautils_010.bb delete mode 100644 openembedded/packages/pcmciautils/pcmciautils_013.bb (limited to 'openembedded/packages/pcmciautils') diff --git a/openembedded/packages/pcmciautils/pcmciautils-013/makefile_fix.patch b/openembedded/packages/pcmciautils/pcmciautils-013/makefile_fix.patch deleted file mode 100644 index a45f9e20e..000000000 --- a/openembedded/packages/pcmciautils/pcmciautils-013/makefile_fix.patch +++ /dev/null @@ -1,20 +0,0 @@ -Hardcoded paths are bad... - -Index: pcmciautils-013/Makefile -=================================================================== ---- pcmciautils-013.orig/Makefile 2006-03-26 11:56:41.000000000 +0100 -+++ pcmciautils-013/Makefile 2006-05-09 22:10:16.000000000 +0100 -@@ -69,11 +69,11 @@ - mandir = ${prefix}/usr/share/man - srcdir = . - --INSTALL = /usr/bin/install -c -+INSTALL = install -c - INSTALL_PROGRAM = ${INSTALL} - INSTALL_DATA = ${INSTALL} -m 644 - INSTALL_SCRIPT = ${INSTALL_PROGRAM} --SYMLINK = /usr/bin/ln -sf -+SYMLINK = ln -sf - - # place to put our hotplug scripts nodes - hotplugdir = ${etcdir}/hotplug diff --git a/openembedded/packages/pcmciautils/pcmciautils-013/version_workaround.patch b/openembedded/packages/pcmciautils/pcmciautils-013/version_workaround.patch deleted file mode 100644 index ff34e139b..000000000 --- a/openembedded/packages/pcmciautils/pcmciautils-013/version_workaround.patch +++ /dev/null @@ -1,16 +0,0 @@ -PCMCIAUTILS_VERSION is specified on the commandline but doesn't compile properly -under arm gcc 3.4.x so we work around it. - -Index: pcmciautils-013/src/pccardctl.c -=================================================================== ---- pcmciautils-013.orig/src/pccardctl.c 2006-03-26 11:56:41.000000000 +0100 -+++ pcmciautils-013/src/pccardctl.c 2006-05-09 22:11:09.000000000 +0100 -@@ -350,7 +350,7 @@ - } - - static void print_header(void) { -- printf("pcmciautils %s\n", PCMCIAUTILS_VERSION); -+ printf("pcmciautils 013\n"); - printf("Copyright (C) 2004-2005 Dominik Brodowski, (C) 1999 David A. Hinds\n"); - printf("Report errors and bugs to , please.\n"); - } diff --git a/openembedded/packages/pcmciautils/pcmciautils_010.bb b/openembedded/packages/pcmciautils/pcmciautils_010.bb deleted file mode 100644 index 8045a0e44..000000000 --- a/openembedded/packages/pcmciautils/pcmciautils_010.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "Linux Kernel 2.6 Userland Utilities for the PCMCIA Subsystem" -DEPENDS = "sysfsutils udev module-init-tools" -RDEPENDS = "udev module-init-tools" -HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" -SECTION = "kernel/userland" -PRIORITY = "optional" - -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2" -S = "${WORKDIR}/pcmciautils-${PV}" - -PR = "r3" - -export HOSTCC = "${BUILD_CC}" -export etcdir = "${sysconfdir}" -export sbindir = "${base_sbindir}" -export pcmciaconfdir = "${sysconfdir}/pcmcia" -export udevrulesdir = "${sysconfdir}/udev/rules.d" -export UDEV = 1 -LD = "${CC}" -CFLAGS =+ "-I${S}/src" -CFLAGS =+ '-DPCMCIAUTILS_VERSION=010' - -PARALLEL_MAKE = "" -EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs'" - -do_install () { - oe_runmake 'DESTDIR=${D}' install -} - -CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts" -RCONFLICTS_${PN} += "pcmcia-cs" diff --git a/openembedded/packages/pcmciautils/pcmciautils_013.bb b/openembedded/packages/pcmciautils/pcmciautils_013.bb deleted file mode 100644 index 3dde68301..000000000 --- a/openembedded/packages/pcmciautils/pcmciautils_013.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "Linux Kernel 2.6 Userland Utilities for the PCMCIA Subsystem" -DEPENDS = "sysfsutils udev module-init-tools" -RDEPENDS = "udev module-init-tools" -HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" -SECTION = "kernel/userland" -PRIORITY = "optional" - -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2 \ - file://makefile_fix.patch;patch=1 \ - file://version_workaround.patch;patch=1" -S = "${WORKDIR}/pcmciautils-${PV}" - -PR = "r0" - -export HOSTCC = "${BUILD_CC}" -export etcdir = "${sysconfdir}" -export sbindir = "${base_sbindir}" -export pcmciaconfdir = "${sysconfdir}/pcmcia" -export udevrulesdir = "${sysconfdir}/udev/rules.d" -export UDEV = 1 -LD = "${CC}" -CFLAGS =+ "-I${S}/src" -CFLAGS =+ '-DPCMCIAUTILS_VERSION=013' - -PARALLEL_MAKE = "" -EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs'" - -do_install () { - oe_runmake 'DESTDIR=${D}' install -} - -CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts" -RCONFLICTS_${PN} += "pcmcia-cs" -- cgit v1.2.3