diff options
author | Aníbal Limón <anibal.limon@linux.intel.com> | 2016-07-29 14:53:01 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-04 15:22:21 +0100 |
commit | 8b21a516b0824aa6b47fa21287b160edfa232d96 (patch) | |
tree | 7ecb48d5cc0ca1a0195ab3fb47bde306658680ee /meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch | |
parent | 564657edae7adfbd777cac9d313a6ccf8f37579c (diff) | |
download | poky-8b21a516b0824aa6b47fa21287b160edfa232d96.tar.gz |
apt: Upgrade to 1.2.12
Test was made building core-image-sato with package_deb on qemux86 and
qemuarm then run for two of them testimage and install packages with
apt-get using PACKAGE_FEED_URI's configuration.
Now apt support drop priviligies for install packages using a sandbox
with _apt user, the useradd class was inherit and configured to install
_apt user and group.
Rebased patches:
- 0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch
- 0001-fix-the-gcc-version-check.patch
- 0001-remove-Wsuggest-attribute-from-CFLAGS.patch
- disable-test.patch
- no-curl.patch
(From OE-Core rev: 369a7f7232aa8406b63376f7888896fe90f9ce40)
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch')
-rw-r--r-- | meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch | 128 |
1 files changed, 21 insertions, 107 deletions
diff --git a/meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch b/meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch index beea56d2ae..3ac92462c5 100644 --- a/meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch +++ b/meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 15c6ef6a827d3681ad06e862d27ab3dfb84cb687 Mon Sep 17 00:00:00 2001 | 1 | From 53c5d0982f03fd0e24c4195d6e1e42b9ade9d500 Mon Sep 17 00:00:00 2001 |
2 | From: Roy Li <rongqing.li@windriver.com> | 2 | From: Roy Li <rongqing.li@windriver.com> |
3 | Date: Wed, 27 May 2015 14:30:28 +0800 | 3 | Date: Wed, 27 May 2015 14:30:28 +0800 |
4 | Subject: [PATCH] fix the gcc version check | 4 | Subject: [PATCH] fix the gcc version check |
@@ -9,37 +9,29 @@ Upstream-Status: pending | |||
9 | 9 | ||
10 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | 10 | Signed-off-by: Roy Li <rongqing.li@windriver.com> |
11 | --- | 11 | --- |
12 | apt-pkg/cacheset.h | 4 ++-- | 12 | apt-pkg/contrib/macros.h | 2 +- |
13 | apt-pkg/deb/debsrcrecords.cc | 12 ++++++------ | 13 | apt-pkg/deb/debsrcrecords.cc | 4 ++-- |
14 | apt-pkg/srcrecords.cc | 4 ++-- | 14 | apt-pkg/srcrecords.cc | 4 ++-- |
15 | apt-pkg/srcrecords.h | 4 ++-- | 15 | 3 files changed, 5 insertions(+), 5 deletions(-) |
16 | apt-pkg/vendorlist.cc | 4 ++-- | ||
17 | 5 files changed, 14 insertions(+), 14 deletions(-) | ||
18 | 16 | ||
19 | diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h | 17 | diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h |
20 | index b7229bc..8cc2917 100644 | 18 | index 2727fd8..0ecae50 100644 |
21 | --- a/apt-pkg/cacheset.h | 19 | --- a/apt-pkg/contrib/macros.h |
22 | +++ b/apt-pkg/cacheset.h | 20 | +++ b/apt-pkg/contrib/macros.h |
23 | @@ -119,12 +119,12 @@ public: | 21 | @@ -136,7 +136,7 @@ |
24 | inline std::string FullName(bool const Pretty) const { return getPkg().FullName(Pretty); } | ||
25 | inline std::string FullName() const { return getPkg().FullName(); } | ||
26 | APT_DEPRECATED inline const char *Section() const { | ||
27 | -#if __GNUC__ >= 4 | ||
28 | +#if __GNUC__ >= 4 + (6 >= __GNUC_MINOR__) | ||
29 | #pragma GCC diagnostic push | ||
30 | #pragma GCC diagnostic ignored "-Wdeprecated-declarations" | ||
31 | #endif | 22 | #endif |
32 | return getPkg().Section(); | 23 | #endif |
24 | |||
33 | -#if __GNUC__ >= 4 | 25 | -#if __GNUC__ >= 4 |
34 | +#if __GNUC__ >= 4 + (6 >= __GNUC_MINOR__) | 26 | +#if __GNUC__ >= 4 + (6 >= __GNUC_MINOR__) |
35 | #pragma GCC diagnostic pop | 27 | #define APT_IGNORE_DEPRECATED_PUSH \ |
36 | #endif | 28 | _Pragma("GCC diagnostic push") \ |
37 | } | 29 | _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") |
38 | diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc | 30 | diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc |
39 | index 49a348d..4bc9dcf 100644 | 31 | index e8295de..40160b2 100644 |
40 | --- a/apt-pkg/deb/debsrcrecords.cc | 32 | --- a/apt-pkg/deb/debsrcrecords.cc |
41 | +++ b/apt-pkg/deb/debsrcrecords.cc | 33 | +++ b/apt-pkg/deb/debsrcrecords.cc |
42 | @@ -126,13 +126,13 @@ bool debSrcRecordParser::Files(std::vector<pkgSrcRecords::File> &F) | 34 | @@ -139,13 +139,13 @@ bool debSrcRecordParser::Files(std::vector<pkgSrcRecords::File> &F) |
43 | for (std::vector<pkgSrcRecords::File2>::const_iterator f2 = F2.begin(); f2 != F2.end(); ++f2) | 35 | for (std::vector<pkgSrcRecords::File2>::const_iterator f2 = F2.begin(); f2 != F2.end(); ++f2) |
44 | { | 36 | { |
45 | pkgSrcRecords::File2 f; | 37 | pkgSrcRecords::File2 f; |
@@ -55,46 +47,11 @@ index 49a348d..4bc9dcf 100644 | |||
55 | #pragma GCC diagnostic pop | 47 | #pragma GCC diagnostic pop |
56 | #endif | 48 | #endif |
57 | f.Path = f2->Path; | 49 | f.Path = f2->Path; |
58 | @@ -190,14 +190,14 @@ bool debSrcRecordParser::Files2(std::vector<pkgSrcRecords::File2> &List) | ||
59 | // we have it already, store the new hash and be done | ||
60 | if (file != List.end()) | ||
61 | { | ||
62 | -#if __GNUC__ >= 4 | ||
63 | +#if __GNUC__ >= 4 + (6 >= __GNUC_MINOR__) | ||
64 | // set for compatibility only, so warn users not us | ||
65 | #pragma GCC diagnostic push | ||
66 | #pragma GCC diagnostic ignored "-Wdeprecated-declarations" | ||
67 | #endif | ||
68 | if (checksumField == "Files") | ||
69 | file->MD5Hash = hash; | ||
70 | -#if __GNUC__ >= 4 | ||
71 | +#if __GNUC__ >= 4 + (6 >= __GNUC_MINOR__) | ||
72 | #pragma GCC diagnostic pop | ||
73 | #endif | ||
74 | // an error here indicates that we have two different hashes for the same file | ||
75 | @@ -212,7 +212,7 @@ bool debSrcRecordParser::Files2(std::vector<pkgSrcRecords::File2> &List) | ||
76 | F.FileSize = strtoull(size.c_str(), NULL, 10); | ||
77 | F.Hashes.push_back(hashString); | ||
78 | |||
79 | -#if __GNUC__ >= 4 | ||
80 | +#if __GNUC__ >= 4 + (6 >= __GNUC_MINOR__) | ||
81 | // set for compatibility only, so warn users not us | ||
82 | #pragma GCC diagnostic push | ||
83 | #pragma GCC diagnostic ignored "-Wdeprecated-declarations" | ||
84 | @@ -220,7 +220,7 @@ bool debSrcRecordParser::Files2(std::vector<pkgSrcRecords::File2> &List) | ||
85 | F.Size = F.FileSize; | ||
86 | if (checksumField == "Files") | ||
87 | F.MD5Hash = hash; | ||
88 | -#if __GNUC__ >= 4 | ||
89 | +#if __GNUC__ >= 4 + (6 >= __GNUC_MINOR__) | ||
90 | #pragma GCC diagnostic pop | ||
91 | #endif | ||
92 | |||
93 | diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc | 50 | diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc |
94 | index 3175ee7..340e796 100644 | 51 | index 53d7e60..1484828 100644 |
95 | --- a/apt-pkg/srcrecords.cc | 52 | --- a/apt-pkg/srcrecords.cc |
96 | +++ b/apt-pkg/srcrecords.cc | 53 | +++ b/apt-pkg/srcrecords.cc |
97 | @@ -160,7 +160,7 @@ bool pkgSrcRecords::Parser::Files2(std::vector<pkgSrcRecords::File2> &F2)/*{{{*/ | 54 | @@ -157,7 +157,7 @@ bool pkgSrcRecords::Parser::Files2(std::vector<pkgSrcRecords::File2> &F2)/*{{{*/ |
98 | for (std::vector<pkgSrcRecords::File>::const_iterator f = F.begin(); f != F.end(); ++f) | 55 | for (std::vector<pkgSrcRecords::File>::const_iterator f = F.begin(); f != F.end(); ++f) |
99 | { | 56 | { |
100 | pkgSrcRecords::File2 f2; | 57 | pkgSrcRecords::File2 f2; |
@@ -103,7 +60,7 @@ index 3175ee7..340e796 100644 | |||
103 | #pragma GCC diagnostic push | 60 | #pragma GCC diagnostic push |
104 | #pragma GCC diagnostic ignored "-Wdeprecated-declarations" | 61 | #pragma GCC diagnostic ignored "-Wdeprecated-declarations" |
105 | #endif | 62 | #endif |
106 | @@ -168,7 +168,7 @@ bool pkgSrcRecords::Parser::Files2(std::vector<pkgSrcRecords::File2> &F2)/*{{{*/ | 63 | @@ -165,7 +165,7 @@ bool pkgSrcRecords::Parser::Files2(std::vector<pkgSrcRecords::File2> &F2)/*{{{*/ |
107 | f2.Size = f->Size; | 64 | f2.Size = f->Size; |
108 | f2.Hashes.push_back(HashString("MD5Sum", f->MD5Hash)); | 65 | f2.Hashes.push_back(HashString("MD5Sum", f->MD5Hash)); |
109 | f2.FileSize = f->Size; | 66 | f2.FileSize = f->Size; |
@@ -112,49 +69,6 @@ index 3175ee7..340e796 100644 | |||
112 | #pragma GCC diagnostic pop | 69 | #pragma GCC diagnostic pop |
113 | #endif | 70 | #endif |
114 | f2.Path = f->Path; | 71 | f2.Path = f->Path; |
115 | diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h | ||
116 | index dde22bd..91f8061 100644 | ||
117 | --- a/apt-pkg/srcrecords.h | ||
118 | +++ b/apt-pkg/srcrecords.h | ||
119 | @@ -30,7 +30,7 @@ class pkgSrcRecords | ||
120 | { | ||
121 | public: | ||
122 | |||
123 | -#if __GNUC__ >= 4 | ||
124 | +#if __GNUC__ >= 4 + (6 >= __GNUC_MINOR__) | ||
125 | // ensure that con- & de-structor don't trigger this warning | ||
126 | #pragma GCC diagnostic push | ||
127 | #pragma GCC diagnostic ignored "-Wdeprecated-declarations" | ||
128 | @@ -48,7 +48,7 @@ class pkgSrcRecords | ||
129 | unsigned long long FileSize; | ||
130 | HashStringList Hashes; | ||
131 | }; | ||
132 | -#if __GNUC__ >= 4 | ||
133 | +#if __GNUC__ >= 4 + (6 >= __GNUC_MINOR__) | ||
134 | #pragma GCC diagnostic pop | ||
135 | #endif | ||
136 | |||
137 | diff --git a/apt-pkg/vendorlist.cc b/apt-pkg/vendorlist.cc | ||
138 | index fb33ff1..ba1d3c3 100644 | ||
139 | --- a/apt-pkg/vendorlist.cc | ||
140 | +++ b/apt-pkg/vendorlist.cc | ||
141 | @@ -11,7 +11,7 @@ | ||
142 | |||
143 | #include <apti18n.h> | ||
144 | |||
145 | -#if __GNUC__ >= 4 | ||
146 | +#if __GNUC__ >= 4 + (6 >= __GNUC_MINOR__) | ||
147 | #pragma GCC diagnostic push | ||
148 | #pragma GCC diagnostic ignored "-Wdeprecated-declarations" | ||
149 | #endif | ||
150 | @@ -163,6 +163,6 @@ const Vendor* pkgVendorList::FindVendor(const std::vector<string> GPGVOutput) /* | ||
151 | } | ||
152 | /*}}}*/ | ||
153 | |||
154 | -#if __GNUC__ >= 4 | ||
155 | +#if __GNUC__ >= 4 + (6 >= __GNUC_MINOR__) | ||
156 | #pragma GCC diagnostic pop | ||
157 | #endif | ||
158 | -- | 72 | -- |
159 | 1.9.1 | 73 | 2.1.4 |
160 | 74 | ||