diff options
author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/grep | |
parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/grep')
-rw-r--r-- | packages/grep/grep-2.5.1/uclibc-fix.patch | 52 | ||||
-rw-r--r-- | packages/grep/grep-2.5/install.patch | 15 | ||||
-rw-r--r-- | packages/grep/grep-native_2.5.1.bb | 13 | ||||
-rw-r--r-- | packages/grep/grep_2.5.1.bb | 37 | ||||
-rw-r--r-- | packages/grep/grep_2.5.bb | 15 |
5 files changed, 0 insertions, 132 deletions
diff --git a/packages/grep/grep-2.5.1/uclibc-fix.patch b/packages/grep/grep-2.5.1/uclibc-fix.patch deleted file mode 100644 index f67177f6ab..0000000000 --- a/packages/grep/grep-2.5.1/uclibc-fix.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix to use mempcpy instead of __mempcpy. This is needed for uclibc which -doesn't define __mempcpy only mempcpy. Since both uclibc and glibc have -mempcpy we'll just use that instead. - -Index: grep-2.5.1/intl/localealias.c -=================================================================== ---- grep-2.5.1.orig/intl/localealias.c 2002-03-14 00:39:06.000000000 +1100 -+++ grep-2.5.1/intl/localealias.c 2007-05-17 13:53:58.000000000 +1000 -@@ -65,7 +65,7 @@ - # define strcasecmp __strcasecmp - - # ifndef mempcpy --# define mempcpy __mempcpy -+# error "mempcpy not detected" - # endif - # define HAVE_MEMPCPY 1 - # define HAVE___FSETLOCKING 1 -Index: grep-2.5.1/lib/getopt.c -=================================================================== ---- grep-2.5.1.orig/lib/getopt.c 2001-03-04 16:33:12.000000000 +1100 -+++ grep-2.5.1/lib/getopt.c 2007-05-17 13:51:44.000000000 +1000 -@@ -326,7 +326,7 @@ - nonoption_flags_len = nonoption_flags_max_len = 0; - else - { -- memset (__mempcpy (new_str, __getopt_nonoption_flags, -+ memset (mempcpy (new_str, __getopt_nonoption_flags, - nonoption_flags_max_len), - '\0', top + 1 - nonoption_flags_max_len); - nonoption_flags_max_len = top + 1; -@@ -437,7 +437,7 @@ - if (__getopt_nonoption_flags == NULL) - nonoption_flags_max_len = -1; - else -- memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), -+ memset (mempcpy (__getopt_nonoption_flags, orig_str, len), - '\0', nonoption_flags_max_len - len); - } - } -Index: grep-2.5.1/lib/regex.c -=================================================================== ---- grep-2.5.1.orig/lib/regex.c 2001-04-03 04:04:45.000000000 +1000 -+++ grep-2.5.1/lib/regex.c 2007-05-17 13:51:48.000000000 +1000 -@@ -7842,7 +7842,7 @@ - if (msg_size > errbuf_size) - { - #if defined HAVE_MEMPCPY || defined _LIBC -- *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0'; -+ *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0'; - #else - memcpy (errbuf, msg, errbuf_size - 1); - errbuf[errbuf_size - 1] = 0; diff --git a/packages/grep/grep-2.5/install.patch b/packages/grep/grep-2.5/install.patch deleted file mode 100644 index cbb9229a8e..0000000000 --- a/packages/grep/grep-2.5/install.patch +++ /dev/null @@ -1,15 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- grep-2.5/src/Makefile.am~install -+++ grep-2.5/src/Makefile.am -@@ -18,5 +18,5 @@ - vms_fab.c vms_fab.h - - install-exec-local: -- @SYMLINK@ @SYMLINKFROM@ $(bindir)/egrep -- @SYMLINK@ @SYMLINKFROM@ $(bindir)/fgrep -+ @SYMLINK@ @SYMLINKFROM@ $(DESTDIR)$(bindir)/egrep -+ @SYMLINK@ @SYMLINKFROM@ $(DESTDIR)$(bindir)/fgrep diff --git a/packages/grep/grep-native_2.5.1.bb b/packages/grep/grep-native_2.5.1.bb deleted file mode 100644 index abc2ea46cb..0000000000 --- a/packages/grep/grep-native_2.5.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -require grep_${PV}.bb -inherit native - -S = "${WORKDIR}/grep-${PV}" - -do_stage () { - install -d ${STAGING_BINDIR} - install -m 755 src/grep ${STAGING_BINDIR} - install -m 755 src/egrep ${STAGING_BINDIR} - install -m 755 src/fgrep ${STAGING_BINDIR} -} - -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/grep-${PV}" diff --git a/packages/grep/grep_2.5.1.bb b/packages/grep/grep_2.5.1.bb deleted file mode 100644 index 6d184b8c4c..0000000000 --- a/packages/grep/grep_2.5.1.bb +++ /dev/null @@ -1,37 +0,0 @@ -LICENSE = "GPL" -SECTION = "console/utils" -DESCRIPTION = "grep GNU utility" -PR = "r2" - -SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \ - file://uclibc-fix.patch;patch=1" - -inherit autotools - -EXTRA_OECONF = "--disable-perl-regexp --disable-ncurses" - -do_configure () { - rm -f ${S}/m4/init.m4 - autotools_do_configure -} - -do_install () { - autotools_do_install - install -d ${D}${base_bindir} - mv ${D}${bindir}/grep ${D}${base_bindir}/grep.${PN} - mv ${D}${bindir}/egrep ${D}${base_bindir}/egrep.${PN} - mv ${D}${bindir}/fgrep ${D}${base_bindir}/fgrep.${PN} -} - - -pkg_postinst_${PN} () { - update-alternatives --install ${base_bindir}/grep grep grep.${PN} 100 - update-alternatives --install ${base_bindir}/egrep egrep egrep.${PN} 100 - update-alternatives --install ${base_bindir}/fgrep fgrep fgrep.${PN} 100 -} - -pkg_prerm_${PN} () { - update-alternatives --remove grep grep.${PN} - update-alternatives --remove egrep egrep.${PN} - update-alternatives --remove fgrep fgrep.${PN} -} diff --git a/packages/grep/grep_2.5.bb b/packages/grep/grep_2.5.bb deleted file mode 100644 index 6685cf70ac..0000000000 --- a/packages/grep/grep_2.5.bb +++ /dev/null @@ -1,15 +0,0 @@ -LICENSE = "GPL" -SECTION = "console/utils" -DESCRIPTION = "grep GNU utility" - -SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \ - file://install.patch;patch=1" - -inherit autotools - -EXTRA_OECONF = "--disable-perl-regexp --disable-ncurses" - -do_configure () { - rm -f ${S}/m4/init.m4 - autotools_do_configure -} |