diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-12-30 18:38:51 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-13 09:43:21 +0000 |
| commit | d0365f35303db3595688a6e5290677e02a72c54e (patch) | |
| tree | 41a7989277ed93b4d48c7d331de742fa177fcda9 | |
| parent | 2358e786ec8d1199d90e181eb5d8d00816f669b4 (diff) | |
| download | openembedded-core-d0365f35303db3595688a6e5290677e02a72c54e.tar.gz openembedded-core-d0365f35303db3595688a6e5290677e02a72c54e.tar.bz2 openembedded-core-d0365f35303db3595688a6e5290677e02a72c54e.zip | |
rpm: remove 5.x recipe
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
83 files changed, 0 insertions, 6097 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/0001-Disable-__sync_add_and_fetch_8-on-nios2.patch b/meta/recipes-devtools/rpm/rpm/0001-Disable-__sync_add_and_fetch_8-on-nios2.patch deleted file mode 100644 index e9b73b8bfc..0000000000 --- a/meta/recipes-devtools/rpm/rpm/0001-Disable-__sync_add_and_fetch_8-on-nios2.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 06967a50f20095f5ca30b8214f4c98ba0f5262bf Mon Sep 17 00:00:00 2001 -From: Marek Vasut <marex@denx.de> -Date: Sun, 3 Apr 2016 06:55:25 +0200 -Subject: [PATCH] Disable __sync_add_and_fetch_8 on nios2 - -The NIOS2 softcore does not implement the __sync_add_and_fetch_8, -so disable it accordingly. - -Signed-off-by: Marek Vasut <marex@denx.de> -Upstream-Status: Submitted ---- - rpmio/bson.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rpmio/bson.h b/rpmio/bson.h -index 57023f1..60c7d02 100644 ---- a/rpmio/bson.h -+++ b/rpmio/bson.h -@@ -880,7 +880,7 @@ BSON_END_DECLS - BSON_BEGIN_DECLS - - /* Some architectures do not support __sync_add_and_fetch_8 */ --#if (__mips == 32) || (defined(__PPC__) && !defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8)) -+#if (__mips == 32) || (__nios2__) || (defined(__PPC__) && !defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8)) - # define __BSON_NEED_ATOMIC_64 1 - #endif - --- -2.8.0.rc3 - diff --git a/meta/recipes-devtools/rpm/rpm/0001-define-EM_AARCH64.patch b/meta/recipes-devtools/rpm/rpm/0001-define-EM_AARCH64.patch deleted file mode 100644 index c9fb268687..0000000000 --- a/meta/recipes-devtools/rpm/rpm/0001-define-EM_AARCH64.patch +++ /dev/null @@ -1,35 +0,0 @@ -[PATCH] define EM_AARCH64 - -Upstream-Status: Submitted [RPM5 maintainer] - -EM_AARCH64 maybe not be defined due to old version elf.h, and lead to -that debugedit can not work on aarch64 elf object files, since there is -no other dependence, except these two macro, define them to make -debugedit work on aarch64 elf files. - -Signed-off-by: Roy Li <rongqing.li@windriver.com> ---- - tools/debugedit.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/tools/debugedit.c b/tools/debugedit.c -index de693ed..d16a641 100644 ---- a/tools/debugedit.c -+++ b/tools/debugedit.c -@@ -35,6 +35,13 @@ - - #include <gelf.h> - -+#ifndef EM_AARCH64 -+#define EM_AARCH64 183 /* ARM AARCH64 */ -+#endif -+#ifndef R_AARCH64_ABS32 -+#define R_AARCH64_ABS32 258 -+#endif -+ - /* some defines taken from the dwarf standard */ - - #define DW_TAG_compile_unit 0x11 --- -1.9.1 - diff --git a/meta/recipes-devtools/rpm/rpm/0001-macros-add-_gpg_sign_cmd_extra_args.patch b/meta/recipes-devtools/rpm/rpm/0001-macros-add-_gpg_sign_cmd_extra_args.patch deleted file mode 100644 index eb43a87346..0000000000 --- a/meta/recipes-devtools/rpm/rpm/0001-macros-add-_gpg_sign_cmd_extra_args.patch +++ /dev/null @@ -1,43 +0,0 @@ -From fa9726ff69f86d6a87c4c4bd7e3d2881999a872a Mon Sep 17 00:00:00 2001 -From: Markus Lehtonen <markus.lehtonen@linux.intel.com> -Date: Thu, 23 Feb 2017 11:14:20 +0200 -Subject: [PATCH] macros: add %_gpg_sign_cmd_extra_args - -Similar to what rpm4 has. This macro can be used to customize the -gpg command line options when signing packages. This is needed for -gpg 2.1 which requires "--pinentry-mode loopback" to allow -non-interactive signing. - -Upstream-Status: Pending - -Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - macros/macros.in | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/macros/macros.in b/macros/macros.in -index 8bc5840..fda3c66 100644 ---- a/macros/macros.in -+++ b/macros/macros.in -@@ -524,7 +524,9 @@ $_arbitrary_tags_tests Foo:Bar - %_gpg_passphrase_way %{?_gpg_passphrase:--passphrase "%{_gpg_passphrase}"}%{!?_gpg_passphrase:--passphrase-fd 3} - - %__gpg_check_password_cmd %{__gpg} \ -- gpg --batch --no-verbose %{_gpg_passphrase_way} -u "%{_gpg_name}" -so - -+ gpg --batch --no-verbose %{_gpg_passphrase_way} \ -+ %{?_gpg_sign_cmd_extra_args:%{_gpg_sign_cmd_extra_args}} \ -+ -u "%{_gpg_name}" -so - - #%__pgp_check_password_cmd %{__pgp} \ - # pgp +batchmode=on +verbose=0 "%{_pgp_name}" -sf - #%__pgp5_check_password_cmd %{__pgp} \ -@@ -532,6 +534,7 @@ $_arbitrary_tags_tests Foo:Bar - - %__gpg_sign_cmd %{__gpg} \ - gpg --batch --no-verbose --no-armor %{_gpg_passphrase_way} --no-secmem-warning \ -+ %{?_gpg_sign_cmd_extra_args:%{_gpg_sign_cmd_extra_args}} \ - -u "%{_gpg_name}" -sbo %{__signature_filename} %{__plaintext_filename} - #%__pgp_sign_cmd %{__pgp} \ - # pgp +batchmode=on +verbose=0 +armor=off \ --- -2.10.2 - diff --git a/meta/recipes-devtools/rpm/rpm/0001-rpm-Fix-build-on-musl.patch b/meta/recipes-devtools/rpm/rpm/0001-rpm-Fix-build-on-musl.patch deleted file mode 100644 index 70dd4ff532..0000000000 --- a/meta/recipes-devtools/rpm/rpm/0001-rpm-Fix-build-on-musl.patch +++ /dev/null @@ -1,294 +0,0 @@ -From 0af17c2ae86c1e8e42b96f6dface08f535bb55ad Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 14 Feb 2016 08:33:24 +0000 -Subject: [PATCH] rpm: Fix build on musl - -Provide alternatives to assumptions about glibc -on linux - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Updated to 5.4.16 (CVS) - -The patch will likely need additional rework before it can be accepted upsteam -due to the way MUSL changes are patched in. - -Signed-off-by: Mark Hatle <mark.hatle@windriver.com> - ---- -Upstream-Status: Pending - - lib/poptALL.c | 2 ++ - rpmio/fts.c | 4 ++++ - rpmio/poptIO.c | 2 ++ - rpmqv.c | 2 ++ - system.h | 13 ++++++------- - tools/debugedit.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ - tools/rpm2cpio.c | 2 ++ - tools/rpmcache.c | 2 ++ - tools/rpmcmp.c | 2 ++ - tools/rpmdeps-oecore.c | 2 ++ - tools/rpmdeps.c | 2 ++ - tools/rpmdigest.c | 2 ++ - tools/rpmfind.c | 6 +++--- - 13 files changed, 78 insertions(+), 10 deletions(-) - -Index: rpm-5.4.15/rpmio/fts.c -=================================================================== ---- rpm-5.4.15.orig/rpmio/fts.c -+++ rpm-5.4.15/rpmio/fts.c -@@ -124,6 +124,10 @@ static char sccsid[] = "@(#)fts.c 8.6 (B - # define __fxstat64(_stat_ver, _fd, _sbp) fstat((_fd), (_sbp)) - #endif - -+#ifndef _STAT_VER -+# define _STAT_VER 0 -+#endif -+ - #if !defined(_D_EXACT_NAMLEN) - # define _D_EXACT_NAMLEN(d) (strlen((d)->d_name)) - #endif -Index: rpm-5.4.15/tools/debugedit.c -=================================================================== ---- rpm-5.4.15.orig/tools/debugedit.c -+++ rpm-5.4.15/tools/debugedit.c -@@ -22,7 +22,12 @@ - #include <byteswap.h> - #include <endian.h> - #include <errno.h> -+#ifdef __GLIBC__ - #include <error.h> -+#else -+#include <stdarg.h> -+void error(int, int, const char *, ...); -+#endif - #include <limits.h> - #include <string.h> - #include <stdlib.h> -@@ -1535,6 +1540,48 @@ handle_build_id (DSO *dso, Elf_Data *bui - puts (hex); - } - } -+#ifndef __GLIBC__ -+extern char *__progname; -+ -+void (*error_print_progname)(void) = 0; -+unsigned int error_message_count = 0; -+int error_one_per_line = 0; -+ -+static void eprint(int status, int e, const char *file, unsigned int line, const char *fmt, va_list ap) -+{ -+ if (file && error_one_per_line) { -+ static const char *oldfile; -+ static unsigned int oldline; -+ if (line == oldline && strcmp(file, oldfile) == 0) -+ return; -+ oldfile = file; -+ oldline = line; -+ } -+ if (error_print_progname) -+ error_print_progname(); -+ else -+ fprintf(stderr, "%s: ", __progname); -+ if (file) -+ fprintf(stderr, "%s:%u: ", file, line); -+ vfprintf(stderr, fmt, ap); -+ if (e) -+ fprintf(stderr, ": %s", strerror(e)); -+ putc('\n', stderr); -+ fflush(stderr); -+ error_message_count++; -+ if (status) -+ exit(status); -+} -+ -+void error(int status, int e, const char *fmt, ...) -+{ -+ va_list ap; -+ va_start(ap,fmt); -+ eprint(status, e, 0, 0, fmt, ap); -+ va_end(ap); -+} -+ -+#endif - - /* It avoided the segment fault while file's bss offset have a large number. - See https://bugzilla.redhat.com/show_bug.cgi?id=1019707 -Index: rpm-5.4.15/tools/rpmfind.c -=================================================================== ---- rpm-5.4.15.orig/tools/rpmfind.c -+++ rpm-5.4.15/tools/rpmfind.c -@@ -1175,7 +1175,7 @@ find_parsenum(PLAN *plan, const char *op - * and endchar points to the beginning of the string we know we have - * a syntax error. - */ --#if defined(__sun) -+#if defined(__sun) || !defined(__GLIBC_) - value = strtoll(str, &endchar, 10); - #else - value = strtoq(str, &endchar, 10); -@@ -1215,7 +1215,7 @@ find_parsetime(PLAN *plan, const char *o - break; - } - --#if defined(__sun) -+#if defined(__sun) || !defined(__GLIBC_) - value = strtoll(str, &unit, 10); - #else - value = strtoq(str, &unit, 10); -@@ -1253,7 +1253,7 @@ find_parsetime(PLAN *plan, const char *o - str = unit + 1; - if (*str == '\0') /* EOS */ - break; --#if defined(__sun) -+#if defined(__sun) || !defined(__GLIBC_) - value = strtoll(str, &unit, 10); - #else - value = strtoq(str, &unit, 10); -Index: rpm-5.4.15/system.h -=================================================================== ---- rpm-5.4.15.orig/system.h -+++ rpm-5.4.15/system.h -@@ -372,16 +372,15 @@ extern int _tolower(int) __THROW /*@*/; - #define __progname __assert_program_name - #endif - #define setprogname(pn) -+/*@unchecked@*/ - |
