diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2011-08-10 11:13:33 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-12 17:21:54 +0100 |
commit | 93084574046b2b64826bd5ebde55a0504f3b9283 (patch) | |
tree | 523ff2167f66b670746930e855281d91e9fe35c2 /meta/recipes-devtools/rpm/rpm/hdraddorappend.patch | |
parent | 8bc2ebf59a82de568b6543246d6e5aa9769a03d5 (diff) | |
download | poky-93084574046b2b64826bd5ebde55a0504f3b9283.tar.gz |
rpm: Fix the canonical arch --target processing and cleanup
[YOCTO #1352]
Fix the canonical arch --target processor to work with the way OE
handles the GNU canonical arch.
Also cleanup a number of files that are no longer used, and refactor
the no-loop patch into the "no-loopmsg" patch.
(From OE-Core rev: 25904ad2bdeadda9189805bb7a210eafe5795024)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/hdraddorappend.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/hdraddorappend.patch | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/hdraddorappend.patch b/meta/recipes-devtools/rpm/rpm/hdraddorappend.patch deleted file mode 100644 index 020337a598..0000000000 --- a/meta/recipes-devtools/rpm/rpm/hdraddorappend.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | diff --git a/lib/rpm4compat.h b/lib/rpm4compat.h | ||
2 | index b957f8e..b1954d5 100644 | ||
3 | --- a/lib/rpm4compat.h | ||
4 | +++ b/lib/rpm4compat.h | ||
5 | @@ -211,6 +211,17 @@ static inline int headerAddEntry(Header h, int_32 tag, int_32 type, const void * | ||
6 | return headerPut(h, he, 0); | ||
7 | } | ||
8 | |||
9 | +static inline int headerAddOrAppendEntry(Header h, int_32 tag, int_32 type, const void * p, int_32 c) { | ||
10 | + HE_t he = (HE_s*)memset(alloca(sizeof(*he)), 0, sizeof(*he)); | ||
11 | + | ||
12 | + he->tag = (rpmTag)tag; | ||
13 | + he->t = (rpmTagType)type; | ||
14 | + he->p.str = (const char*)p; | ||
15 | + he->c = (rpmTagCount)c; | ||
16 | + he->append = 1; | ||
17 | + return headerPut(h, he, 0); | ||
18 | +} | ||
19 | + | ||
20 | static inline int headerRemoveEntry(Header h, int_32 tag) { | ||
21 | HE_t he = (HE_s*)memset(alloca(sizeof(*he)), 0, sizeof(*he)); | ||
22 | |||