[meta-mentor] [PATCH 1/4] meta-mentor: remove changes that are accepted upstream
Fahad Usman
fahad_usman at mentor.com
Wed Feb 20 08:00:27 PST 2013
- remove local changes in tar, perf and libpcre recipes
- remove them from the "list of changes to be pushed upstream" in README file
Signed-off-by: Fahad Usman <fahad_usman at mentor.com>
---
README | 3 --
recipes/libpcre/files/pcre-cross.patch | 48 ------------------
recipes/libpcre/libpcre_8.32.bb | 58 ----------------------
recipes/perf/perf_3.4.bbappend | 24 ---------
.../tar/tar/tar-1.26-fortifysourcessigabrt.patch | 28 -----------
recipes/tar/tar_1.26.bbappend | 3 --
6 files changed, 164 deletions(-)
delete mode 100644 recipes/libpcre/files/pcre-cross.patch
delete mode 100644 recipes/libpcre/libpcre_8.32.bb
delete mode 100644 recipes/perf/perf_3.4.bbappend
delete mode 100644 recipes/tar/tar/tar-1.26-fortifysourcessigabrt.patch
delete mode 100644 recipes/tar/tar_1.26.bbappend
diff --git a/README b/README
index 0f28c53..d7713d8 100644
--- a/README
+++ b/README
@@ -96,11 +96,8 @@ To push upstream next
=====================
- samba
- - tar
- wireless-tools
- - perf
- blktrace
- - libpcre
- cml1 class: fix menuconfig terminal type issue. The fundamental issue
here is an ncurses-native relocation issue. The ncurses library is
diff --git a/recipes/libpcre/files/pcre-cross.patch b/recipes/libpcre/files/pcre-cross.patch
deleted file mode 100644
index 83880f7..0000000
--- a/recipes/libpcre/files/pcre-cross.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Upstream-Status: Pending
-
---- pcre-8.32.orig/Makefile.am
-+++ pcre-8.32/Makefile.am
-@@ -197,8 +197,18 @@ bin_SCRIPTS = pcre-config
-
-+CC_FOR_BUILD = @CC_FOR_BUILD@
-+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
-+CCLD_FOR_BUILD = @CCLD_FOR_BUILD@
-+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
-+
- if WITH_REBUILD_CHARTABLES
-
- noinst_PROGRAMS += dftables
- dftables_SOURCES = dftables.c
-+dftables_LINK = $(CCLD_FOR_BUILD) -o $@
-+dftables_LDFLAGS = $(LDFLAGS_FOR_BUILD)
-+
-+dftables.o: $(srcdir)/dftables.c
-+ $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) -o $@ $(srcdir)/dftables.c
-
- pcre_chartables.c: dftables$(EXEEXT)
- ./dftables$(EXEEXT) $@
---- pcre-8.32.orig/configure.ac
-+++ pcre-8.32/configure.ac
-@@ -72,6 +72,22 @@ then
- fi
- fi
-
-+if test x"$cross_compiling" = xyes; then
-+ CC_FOR_BUILD="${CC_FOR_BUILD-gcc}"
-+ CCLD_FOR_BUILD="${CCLD_FOR_BUILD-gcc}"
-+ CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD}"
-+ LDFLAGS_FOR_BUILD="${LDFLAGS_FOR_BUILD}"
-+else
-+ CC_FOR_BUILD="${CC_FOR_BUILD-\$(CC)}"
-+ CCLD_FOR_BUILD="${CCLD_FOR_BUILD-\$(CCLD)}"
-+ CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD-\$(CFLAGS)}"
-+ LDFLAGS_FOR_BUILD="${LDFLAGS_FOR_BUILD-\$(LDFLAGS)}"
-+fi
-+AC_ARG_VAR(CC_FOR_BUILD, [build system C compiler])
-+AC_ARG_VAR(CCLD_FOR_BUILD, [build system C linker frontend])
-+AC_ARG_VAR(CFLAGS_FOR_BUILD, [build system C compiler arguments])
-+AC_ARG_VAR(LDFLAGS_FOR_BUILD, [build system C linker frontend arguments])
-+
- # AC_PROG_CXX will return "g++" even if no c++ compiler is installed.
- # Check for that case, and just disable c++ code if g++ doesn't run.
- AC_LANG_PUSH(C++)
diff --git a/recipes/libpcre/libpcre_8.32.bb b/recipes/libpcre/libpcre_8.32.bb
deleted file mode 100644
index 7a7d603..0000000
--- a/recipes/libpcre/libpcre_8.32.bb
+++ /dev/null
@@ -1,58 +0,0 @@
-DESCRIPTION = "The PCRE library is a set of functions that implement regular \
-expression pattern matching using the same syntax and semantics as Perl 5. PCRE \
-has its own native API, as well as a set of wrapper functions that correspond \
-to the POSIX regular expression API."
-SUMMARY = "Perl Compatible Regular Expressions"
-HOMEPAGE = "http://www.pcre.org"
-SECTION = "devel"
-PR = "r0"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=115e2bee152e2e23e838a29136094877"
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/pcre/pcre/${PV}/pcre-${PV}.tar.bz2 \
- file://pcre-cross.patch \
- file://fix-pcre-name-collision.patch"
-
-SRC_URI[md5sum] = "62f02a76bb57a40bc66681760ed511d5"
-SRC_URI[sha256sum] = "a913fb9bd058ef380a2d91847c3c23fcf98e92dc3b47cd08a53c021c5cde0f55"
-
-S = "${WORKDIR}/pcre-${PV}"
-
-FILESPATH .= ":${@base_set_filespath([bb.which(BBPATH, 'recipes-support/libpcre/files', direction=True)], d)}"
-
-PROVIDES += "pcre"
-DEPENDS += "bzip2 zlib readline"
-
-inherit autotools binconfig
-
-PARALLEL_MAKE = ""
-
-EXTRA_OECONF = "\
- --enable-newline-is-lf \
- --enable-rebuild-chartables \
- --enable-utf8 \
- --with-link-size=2 \
- --with-match-limit=10000000 \
-"
-
-BUILD_CPPFLAGS += "-DLINK_SIZE=2"
-BUILD_CFLAGS =+ "-I${S}/include"
-CFLAGS += "-D_REENTRANT"
-CXXFLAGS_append_powerpc = " -lstdc++"
-
-PACKAGES =+ "libpcrecpp libpcreposix pcregrep pcregrep-doc pcretest pcretest-doc"
-
-SUMMARY_libpcrecpp = "${SUMMARY} - C++ wrapper functions"
-SUMMARY_libpcreposix = "${SUMMARY} - C wrapper functions based on the POSIX regex API"
-SUMMARY_pcregrep = "grep utility that uses perl 5 compatible regexes"
-SUMMARY_pcregrep-doc = "grep utility that uses perl 5 compatible regexes - docs"
-SUMMARY_pcretest = "program for testing Perl-comatible regular expressions"
-SUMMARY_pcretest-doc = "program for testing Perl-comatible regular expressions - docs"
-
-FILES_libpcrecpp = "${libdir}/libpcrecpp.so.*"
-FILES_libpcreposix = "${libdir}/libpcreposix.so.*"
-FILES_pcregrep = "${bindir}/pcregrep"
-FILES_pcregrep-doc = "${mandir}/man1/pcregrep.1"
-FILES_pcretest = "${bindir}/pcretest"
-FILES_pcretest-doc = "${mandir}/man1/pcretest.1"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/perf/perf_3.4.bbappend b/recipes/perf/perf_3.4.bbappend
deleted file mode 100644
index cd7266f..0000000
--- a/recipes/perf/perf_3.4.bbappend
+++ /dev/null
@@ -1,24 +0,0 @@
-PRINC := "${@int(PRINC) + 3}"
-
-do_configure_prepend () {
- sed -i 's,-Werror ,,' ${S}/tools/perf/Makefile
-}
-
-# We already pass the correct arguments to our compiler for the CFLAGS (if we
-# don't override it, it'll add -m32/-m64 itself). For LDFLAGS, it was failing
-# to find bfd symbols.
-EXTRA_OEMAKE += "\
- 'CFLAGS=${CFLAGS}' \
- 'LDFLAGS=${LDFLAGS} -lpthread -lrt -lelf -lm -lbfd' \
- \
- 'prefix=${prefix}' \
- 'bindir=${bindir}' \
- 'sharedir=${datadir}' \
- 'sysconfdir=${sysconfdir}' \
- 'perfexecdir=${libexecdir}/perf-core' \
- \
- 'ETC_PERFCONFIG=${@oe.path.relative(prefix, sysconfdir)}' \
- 'sharedir=${@oe.path.relative(prefix, datadir)}' \
- 'mandir=${@oe.path.relative(prefix, mandir)}' \
- 'infodir=${@oe.path.relative(prefix, infodir)}' \
-"
diff --git a/recipes/tar/tar/tar-1.26-fortifysourcessigabrt.patch b/recipes/tar/tar/tar-1.26-fortifysourcessigabrt.patch
deleted file mode 100644
index c59ddea..0000000
--- a/recipes/tar/tar/tar-1.26-fortifysourcessigabrt.patch
+++ /dev/null
@@ -1,28 +0,0 @@
----
- src/create.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- tar-1.26.orig/src/create.c
-+++ tar-1.26/src/create.c
-@@ -562,8 +562,8 @@ write_gnu_long_link (struct tar_stat_inf
- GNAME_TO_CHARS (tmpname, header->header.gname);
- free (tmpname);
-
-- strcpy (header->buffer + offsetof (struct posix_header, magic),
-- OLDGNU_MAGIC);
-+ strncpy (header->buffer + offsetof (struct posix_header, magic),
-+ OLDGNU_MAGIC, sizeof(header->header.magic));
- header->header.typeflag = type;
- finish_header (st, header, -1);
-
-@@ -900,8 +900,8 @@ start_header (struct tar_stat_info *st)
- case OLDGNU_FORMAT:
- case GNU_FORMAT: /*FIXME?*/
- /* Overwrite header->header.magic and header.version in one blow. */
-- strcpy (header->buffer + offsetof (struct posix_header, magic),
-- OLDGNU_MAGIC);
-+ strncpy (header->buffer + offsetof (struct posix_header, magic),
-+ OLDGNU_MAGIC, sizeof(header->header.magic));
- break;
-
- case POSIX_FORMAT:
diff --git a/recipes/tar/tar_1.26.bbappend b/recipes/tar/tar_1.26.bbappend
deleted file mode 100644
index 2ff6f86..0000000
--- a/recipes/tar/tar_1.26.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-PRINC := "${@int(PRINC) + 1}"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "file://tar-1.26-fortifysourcessigabrt.patch"
--
1.8.1.3
More information about the meta-mentor
mailing list