diff options
Diffstat (limited to 'meta/recipes-devtools/apt')
-rw-r--r-- | meta/recipes-devtools/apt/apt-native_1.2.12.bb (renamed from meta/recipes-devtools/apt/apt-native_1.0.10.1.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/apt.inc | 11 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch | 278 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch | 128 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch | 24 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/apt/disable-test.patch | 47 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/apt_1.2.12.bb (renamed from meta/recipes-devtools/apt/apt_1.0.10.1.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/files/no-curl.patch | 30 |
8 files changed, 108 insertions, 410 deletions
diff --git a/meta/recipes-devtools/apt/apt-native_1.0.10.1.bb b/meta/recipes-devtools/apt/apt-native_1.2.12.bb index 1e660da74b..1e660da74b 100644 --- a/meta/recipes-devtools/apt/apt-native_1.0.10.1.bb +++ b/meta/recipes-devtools/apt/apt-native_1.2.12.bb | |||
diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc index 78ef5a7e1e..87cc20693e 100644 --- a/meta/recipes-devtools/apt/apt.inc +++ b/meta/recipes-devtools/apt/apt.inc | |||
@@ -2,7 +2,7 @@ SUMMARY = "Advanced front-end for dpkg" | |||
2 | LICENSE = "GPLv2.0+" | 2 | LICENSE = "GPLv2.0+" |
3 | SECTION = "base" | 3 | SECTION = "base" |
4 | 4 | ||
5 | SRC_URI = "http://snapshot.debian.org/archive/debian/20150805T094928Z/pool/main/a/${BPN}/${BPN}_${PV}.tar.xz \ | 5 | SRC_URI = "http://snapshot.debian.org/archive/debian/20160526T162943Z/pool/main/a/${BPN}/${BPN}_${PV}.tar.xz \ |
6 | file://use-host.patch \ | 6 | file://use-host.patch \ |
7 | file://makerace.patch \ | 7 | file://makerace.patch \ |
8 | file://no-nls-dpkg.patch \ | 8 | file://no-nls-dpkg.patch \ |
@@ -13,15 +13,15 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20150805T094928Z/pool/main/ | |||
13 | file://disable-test.patch \ | 13 | file://disable-test.patch \ |
14 | file://0001-environment.mak-musl-based-systems-can-generate-shar.patch \ | 14 | file://0001-environment.mak-musl-based-systems-can-generate-shar.patch \ |
15 | " | 15 | " |
16 | SRC_URI[md5sum] = "6505c4297b338adb2087ce87bbc4a276" | 16 | SRC_URI[md5sum] = "80f6f0ef110a45a7e5af8a9d233fb0e7" |
17 | SRC_URI[sha256sum] = "3fb1de9598363c416591d49e3c285458e095b035e6c06d5b944a54e15fc9b543" | 17 | SRC_URI[sha256sum] = "e820d27cba73476df4abcff27dadd1b5847474bfe85f7e9202a9a07526973ea6" |
18 | LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" | 18 | LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" |
19 | 19 | ||
20 | # the package is taken from snapshots.debian.org; that source is static and goes stale | 20 | # the package is taken from snapshots.debian.org; that source is static and goes stale |
21 | # so we check the latest upstream from a directory that does get updated | 21 | # so we check the latest upstream from a directory that does get updated |
22 | UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/apt/" | 22 | UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/apt/" |
23 | 23 | ||
24 | inherit autotools gettext | 24 | inherit autotools gettext useradd |
25 | 25 | ||
26 | EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" | 26 | EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" |
27 | 27 | ||
@@ -29,3 +29,6 @@ do_configure_prepend() { | |||
29 | rm -rf ${S}/buildlib/config.sub | 29 | rm -rf ${S}/buildlib/config.sub |
30 | rm -rf ${S}/buildlib/config.guess | 30 | rm -rf ${S}/buildlib/config.guess |
31 | } | 31 | } |
32 | |||
33 | USERADD_PACKAGES = "${PN}" | ||
34 | USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /nonexistent --shell /bin/false --user-group _apt" | ||
diff --git a/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch b/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch index d33069b73a..b3a883bae8 100644 --- a/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch +++ b/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 106797f1c66fa578dad21fd9380bf9d576573dfd Mon Sep 17 00:00:00 2001 | 1 | From dfc1370d50322e2e9d225a7a63b44993fc01a727 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: Fri, 22 May 2015 08:05:15 +0800 | 3 | Date: Fri, 22 May 2015 08:05:15 +0800 |
4 | Subject: [PATCH] Revert "always run 'dpkg --configure -a' at the end of our | 4 | Subject: [PATCH] Revert "always run 'dpkg --configure -a' at the end of our |
@@ -16,21 +16,16 @@ be passed into dpkg, and lead to the below similar error: | |||
16 | 16 | ||
17 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | 17 | Signed-off-by: Roy Li <rongqing.li@windriver.com> |
18 | --- | 18 | --- |
19 | apt-pkg/deb/dpkgpm.cc | 9 +-- | 19 | apt-pkg/deb/dpkgpm.cc | 9 ++------- |
20 | test/integration/framework | 25 ++++---- | 20 | test/integration/test-apt-progress-fd-deb822 | 14 +++++++------- |
21 | test/integration/test-apt-progress-fd | 67 +++++++++---------- | 21 | test/integration/test-no-fds-leaked-to-maintainer-scripts | 6 ++---- |
22 | test/integration/test-apt-progress-fd-deb822 | 18 ++---- | 22 | 3 files changed, 11 insertions(+), 18 deletions(-) |
23 | test/integration/test-apt-progress-fd-error | 2 +- | ||
24 | ...est-bug-769609-triggers-still-pending-after-run | 75 ---------------------- | ||
25 | .../test-no-fds-leaked-to-maintainer-scripts | 6 +- | ||
26 | 7 files changed, 56 insertions(+), 146 deletions(-) | ||
27 | delete mode 100755 test/integration/test-bug-769609-triggers-still-pending-after-run | ||
28 | 23 | ||
29 | diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc | 24 | diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc |
30 | index b187efb..f269764 100644 | 25 | index 834cb0e..84ded3a 100644 |
31 | --- a/apt-pkg/deb/dpkgpm.cc | 26 | --- a/apt-pkg/deb/dpkgpm.cc |
32 | +++ b/apt-pkg/deb/dpkgpm.cc | 27 | +++ b/apt-pkg/deb/dpkgpm.cc |
33 | @@ -1049,12 +1049,6 @@ void pkgDPkgPM::BuildPackagesProgressMap() | 28 | @@ -1037,12 +1037,6 @@ void pkgDPkgPM::BuildPackagesProgressMap() |
34 | PackagesTotal++; | 29 | PackagesTotal++; |
35 | } | 30 | } |
36 | } | 31 | } |
@@ -42,8 +37,8 @@ index b187efb..f269764 100644 | |||
42 | - ++PackagesTotal; | 37 | - ++PackagesTotal; |
43 | } | 38 | } |
44 | /*}}}*/ | 39 | /*}}}*/ |
45 | #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13) | 40 | bool pkgDPkgPM::Go(int StatusFd) |
46 | @@ -1294,8 +1288,9 @@ bool pkgDPkgPM::GoNoABIBreak(APT::Progress::PackageManager *progress) | 41 | @@ -1250,8 +1244,9 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) |
47 | 42 | ||
48 | // support subpressing of triggers processing for special | 43 | // support subpressing of triggers processing for special |
49 | // cases like d-i that runs the triggers handling manually | 44 | // cases like d-i that runs the triggers handling manually |
@@ -54,159 +49,11 @@ index b187efb..f269764 100644 | |||
54 | List.push_back(Item(Item::ConfigurePending, PkgIterator())); | 49 | List.push_back(Item(Item::ConfigurePending, PkgIterator())); |
55 | 50 | ||
56 | // for the progress | 51 | // for the progress |
57 | diff --git a/test/integration/framework b/test/integration/framework | ||
58 | index 70ad381..00672ad 100644 | ||
59 | --- a/test/integration/framework | ||
60 | +++ b/test/integration/framework | ||
61 | @@ -1178,13 +1178,10 @@ testnopackage() { | ||
62 | fi | ||
63 | } | ||
64 | |||
65 | -testdpkgstatus() { | ||
66 | - local STATE="$1" | ||
67 | - local NR="$2" | ||
68 | - shift 2 | ||
69 | - msgtest "Test that $NR package(s) are in state $STATE with" "dpkg -l $*" | ||
70 | - local PKGS="$(dpkg -l "$@" 2>/dev/null | grep "^${STATE}" | wc -l)" | ||
71 | - if [ "$PKGS" != $NR ]; then | ||
72 | +testdpkginstalled() { | ||
73 | + msgtest "Test for correctly installed package(s) with" "dpkg -l $*" | ||
74 | + local PKGS="$(dpkg -l "$@" 2>/dev/null | grep '^i' | wc -l)" | ||
75 | + if [ "$PKGS" != $# ]; then | ||
76 | echo >&2 $PKGS | ||
77 | dpkg -l "$@" | grep '^[a-z]' >&2 | ||
78 | msgfail | ||
79 | @@ -1193,12 +1190,16 @@ testdpkgstatus() { | ||
80 | fi | ||
81 | } | ||
82 | |||
83 | -testdpkginstalled() { | ||
84 | - testdpkgstatus 'ii' "$#" "$@" | ||
85 | -} | ||
86 | - | ||
87 | testdpkgnotinstalled() { | ||
88 | - testdpkgstatus 'ii' '0' "$@" | ||
89 | + msgtest "Test for correctly not-installed package(s) with" "dpkg -l $*" | ||
90 | + local PKGS="$(dpkg -l "$@" 2> /dev/null | grep '^i' | wc -l)" | ||
91 | + if [ "$PKGS" != 0 ]; then | ||
92 | + echo | ||
93 | + dpkg -l "$@" | grep '^[a-z]' >&2 | ||
94 | + msgfail | ||
95 | + else | ||
96 | + msgpass | ||
97 | + fi | ||
98 | } | ||
99 | |||
100 | testmarkedauto() { | ||
101 | diff --git a/test/integration/test-apt-progress-fd b/test/integration/test-apt-progress-fd | ||
102 | index 68cc043..d72e7e7 100755 | ||
103 | --- a/test/integration/test-apt-progress-fd | ||
104 | +++ b/test/integration/test-apt-progress-fd | ||
105 | @@ -19,14 +19,13 @@ testequal "dlstatus:1:0:Retrieving file 1 of 1 | ||
106 | dlstatus:1:0:Retrieving file 1 of 1 | ||
107 | pmstatus:dpkg-exec:0:Running dpkg | ||
108 | pmstatus:testing:0:Installing testing (amd64) | ||
109 | -pmstatus:testing:16.6667:Preparing testing (amd64) | ||
110 | -pmstatus:testing:33.3333:Unpacking testing (amd64) | ||
111 | -pmstatus:testing:50:Preparing to configure testing (amd64) | ||
112 | -pmstatus:dpkg-exec:50:Running dpkg | ||
113 | -pmstatus:testing:50:Configuring testing (amd64) | ||
114 | -pmstatus:testing:66.6667:Configuring testing (amd64) | ||
115 | -pmstatus:testing:83.3333:Installed testing (amd64) | ||
116 | -pmstatus:dpkg-exec:83.3333:Running dpkg" cat apt-progress.log | ||
117 | +pmstatus:testing:20:Preparing testing (amd64) | ||
118 | +pmstatus:testing:40:Unpacking testing (amd64) | ||
119 | +pmstatus:testing:60:Preparing to configure testing (amd64) | ||
120 | +pmstatus:dpkg-exec:60:Running dpkg | ||
121 | +pmstatus:testing:60:Configuring testing (amd64) | ||
122 | +pmstatus:testing:80:Configuring testing (amd64) | ||
123 | +pmstatus:testing:100:Installed testing (amd64)" cat apt-progress.log | ||
124 | |||
125 | # upgrade | ||
126 | exec 3> apt-progress.log | ||
127 | @@ -35,14 +34,13 @@ testequal "dlstatus:1:0:Retrieving file 1 of 1 | ||
128 | dlstatus:1:0:Retrieving file 1 of 1 | ||
129 | pmstatus:dpkg-exec:0:Running dpkg | ||
130 | pmstatus:testing:0:Installing testing (amd64) | ||
131 | -pmstatus:testing:16.6667:Preparing testing (amd64) | ||
132 | -pmstatus:testing:33.3333:Unpacking testing (amd64) | ||
133 | -pmstatus:testing:50:Preparing to configure testing (amd64) | ||
134 | -pmstatus:dpkg-exec:50:Running dpkg | ||
135 | -pmstatus:testing:50:Configuring testing (amd64) | ||
136 | -pmstatus:testing:66.6667:Configuring testing (amd64) | ||
137 | -pmstatus:testing:83.3333:Installed testing (amd64) | ||
138 | -pmstatus:dpkg-exec:83.3333:Running dpkg" cat apt-progress.log | ||
139 | +pmstatus:testing:20:Preparing testing (amd64) | ||
140 | +pmstatus:testing:40:Unpacking testing (amd64) | ||
141 | +pmstatus:testing:60:Preparing to configure testing (amd64) | ||
142 | +pmstatus:dpkg-exec:60:Running dpkg | ||
143 | +pmstatus:testing:60:Configuring testing (amd64) | ||
144 | +pmstatus:testing:80:Configuring testing (amd64) | ||
145 | +pmstatus:testing:100:Installed testing (amd64)" cat apt-progress.log | ||
146 | |||
147 | # reinstall | ||
148 | exec 3> apt-progress.log | ||
149 | @@ -51,24 +49,22 @@ testequal "dlstatus:1:0:Retrieving file 1 of 1 | ||
150 | dlstatus:1:0:Retrieving file 1 of 1 | ||
151 | pmstatus:dpkg-exec:0:Running dpkg | ||
152 | pmstatus:testing:0:Installing testing (amd64) | ||
153 | -pmstatus:testing:16.6667:Preparing testing (amd64) | ||
154 | -pmstatus:testing:33.3333:Unpacking testing (amd64) | ||
155 | -pmstatus:testing:50:Preparing to configure testing (amd64) | ||
156 | -pmstatus:dpkg-exec:50:Running dpkg | ||
157 | -pmstatus:testing:50:Configuring testing (amd64) | ||
158 | -pmstatus:testing:66.6667:Configuring testing (amd64) | ||
159 | -pmstatus:testing:83.3333:Installed testing (amd64) | ||
160 | -pmstatus:dpkg-exec:83.3333:Running dpkg" cat apt-progress.log | ||
161 | +pmstatus:testing:20:Preparing testing (amd64) | ||
162 | +pmstatus:testing:40:Unpacking testing (amd64) | ||
163 | +pmstatus:testing:60:Preparing to configure testing (amd64) | ||
164 | +pmstatus:dpkg-exec:60:Running dpkg | ||
165 | +pmstatus:testing:60:Configuring testing (amd64) | ||
166 | +pmstatus:testing:80:Configuring testing (amd64) | ||
167 | +pmstatus:testing:100:Installed testing (amd64)" cat apt-progress.log | ||
168 | |||
169 | # and remove | ||
170 | exec 3> apt-progress.log | ||
171 | testsuccess aptget remove testing -y -o APT::Status-Fd=3 | ||
172 | testequal "pmstatus:dpkg-exec:0:Running dpkg | ||
173 | pmstatus:testing:0:Removing testing (amd64) | ||
174 | -pmstatus:testing:25:Preparing for removal of testing (amd64) | ||
175 | -pmstatus:testing:50:Removing testing (amd64) | ||
176 | -pmstatus:testing:75:Removed testing (amd64) | ||
177 | -pmstatus:dpkg-exec:75:Running dpkg" cat apt-progress.log | ||
178 | +pmstatus:testing:33.3333:Preparing for removal of testing (amd64) | ||
179 | +pmstatus:testing:66.6667:Removing testing (amd64) | ||
180 | +pmstatus:testing:100:Removed testing (amd64)" cat apt-progress.log | ||
181 | |||
182 | # install non-native and ensure we get proper progress info | ||
183 | exec 3> apt-progress.log | ||
184 | @@ -79,13 +75,12 @@ testequal "dlstatus:1:0:Retrieving file 1 of 1 | ||
185 | dlstatus:1:0:Retrieving file 1 of 1 | ||
186 | pmstatus:dpkg-exec:0:Running dpkg | ||
187 | pmstatus:testing2:0:Installing testing2 (i386) | ||
188 | -pmstatus:testing2:16.6667:Preparing testing2 (i386) | ||
189 | -pmstatus:testing2:33.3333:Unpacking testing2 (i386) | ||
190 | -pmstatus:testing2:50:Preparing to configure testing2 (i386) | ||
191 | -pmstatus:dpkg-exec:50:Running dpkg | ||
192 | -pmstatus:testing2:50:Configuring testing2 (i386) | ||
193 | -pmstatus:testing2:66.6667:Configuring testing2 (i386) | ||
194 | -pmstatus:testing2:83.3333:Installed testing2 (i386) | ||
195 | -pmstatus:dpkg-exec:83.3333:Running dpkg" cat apt-progress.log | ||
196 | +pmstatus:testing2:20:Preparing testing2 (i386) | ||
197 | +pmstatus:testing2:40:Unpacking testing2 (i386) | ||
198 | +pmstatus:testing2:60:Preparing to configure testing2 (i386) | ||
199 | +pmstatus:dpkg-exec:60:Running dpkg | ||
200 | +pmstatus:testing2:60:Configuring testing2 (i386) | ||
201 | +pmstatus:testing2:80:Configuring testing2 (i386) | ||
202 | +pmstatus:testing2:100:Installed testing2 (i386)" cat apt-progress.log | ||
203 | |||
204 | rm -f apt-progress*.log | ||
205 | diff --git a/test/integration/test-apt-progress-fd-deb822 b/test/integration/test-apt-progress-fd-deb822 | 52 | diff --git a/test/integration/test-apt-progress-fd-deb822 b/test/integration/test-apt-progress-fd-deb822 |
206 | index badc985..9d22794 100755 | 53 | index 58fd732..3359762 100755 |
207 | --- a/test/integration/test-apt-progress-fd-deb822 | 54 | --- a/test/integration/test-apt-progress-fd-deb822 |
208 | +++ b/test/integration/test-apt-progress-fd-deb822 | 55 | +++ b/test/integration/test-apt-progress-fd-deb822 |
209 | @@ -27,41 +27,37 @@ Message: Installing testing (amd64) | 56 | @@ -27,36 +27,36 @@ Message: Installing testing (amd64) |
210 | 57 | ||
211 | Status: progress | 58 | Status: progress |
212 | Package: testing:amd64 | 59 | Package: testing:amd64 |
@@ -248,109 +95,10 @@ index badc985..9d22794 100755 | |||
248 | -Percent: 83.3333 | 95 | -Percent: 83.3333 |
249 | +Percent: 100 | 96 | +Percent: 100 |
250 | Message: Installed testing (amd64) | 97 | Message: Installed testing (amd64) |
251 | - | ||
252 | -Status: progress | ||
253 | -Percent: 83.3333 | ||
254 | -Message: Running dpkg | ||
255 | " cat apt-progress.log | ||
256 | |||
257 | 98 | ||
258 | diff --git a/test/integration/test-apt-progress-fd-error b/test/integration/test-apt-progress-fd-error | 99 | Status: progress |
259 | index 6323007..a47095b 100755 | ||
260 | --- a/test/integration/test-apt-progress-fd-error | ||
261 | +++ b/test/integration/test-apt-progress-fd-error | ||
262 | @@ -18,7 +18,7 @@ setupaptarchive | ||
263 | exec 3> apt-progress.log | ||
264 | testfailure aptget install foo1 foo2 -y -o APT::Status-Fd=3 | ||
265 | msgtest "Ensure correct error message" | ||
266 | -if grep -q "aptarchive/pool/foo2_0.8.15_amd64.deb:36.3636:trying to overwrite '/usr/bin/file-conflict', which is also in package foo1 0.8.15" apt-progress.log; then | ||
267 | +if grep -q "aptarchive/pool/foo2_0.8.15_amd64.deb:40:trying to overwrite '/usr/bin/file-conflict', which is also in package foo1 0.8.15" apt-progress.log; then | ||
268 | msgpass | ||
269 | else | ||
270 | cat apt-progress.log | ||
271 | diff --git a/test/integration/test-bug-769609-triggers-still-pending-after-run b/test/integration/test-bug-769609-triggers-still-pending-after-run | ||
272 | deleted file mode 100755 | ||
273 | index 146fa76..0000000 | ||
274 | --- a/test/integration/test-bug-769609-triggers-still-pending-after-run | ||
275 | +++ /dev/null | ||
276 | @@ -1,75 +0,0 @@ | ||
277 | -#!/bin/sh | ||
278 | -set -e | ||
279 | - | ||
280 | -TESTDIR=$(readlink -f $(dirname $0)) | ||
281 | -. $TESTDIR/framework | ||
282 | - | ||
283 | -setupenvironment | ||
284 | -configarchitecture 'amd64' | ||
285 | - | ||
286 | -msgtest 'Check if installed dpkg supports' 'noawait trigger' | ||
287 | -if dpkg-checkbuilddeps -d 'dpkg (>= 1.16.1)' /dev/null; then | ||
288 | - msgpass | ||
289 | -else | ||
290 | - msgskip 'dpkg version too old' | ||
291 | - exit 0 | ||
292 | -fi | ||
293 | -configdpkgnoopchroot | ||
294 | - | ||
295 | -buildtriggerpackages() { | ||
296 | - local TYPE="$1" | ||
297 | - setupsimplenativepackage "triggerable-$TYPE" 'all' '1.0' 'unstable' "Depends: trigdepends-$TYPE" | ||
298 | - BUILDDIR="incoming/triggerable-${TYPE}-1.0" | ||
299 | - cat >${BUILDDIR}/debian/postinst <<EOF | ||
300 | -#!/bin/sh | ||
301 | -if [ "\$1" = 'triggered' ]; then | ||
302 | - ls -l /proc/self/fd/ | ||
303 | -fi | ||
304 | -EOF | ||
305 | - echo "$TYPE /usr/share/doc" > ${BUILDDIR}/debian/triggers | ||
306 | - buildpackage "$BUILDDIR" 'unstable' 'main' 'native' | ||
307 | - rm -rf "$BUILDDIR" | ||
308 | - buildsimplenativepackage "trigdepends-$TYPE" 'all' '1.0' 'unstable' | ||
309 | -} | ||
310 | - | ||
311 | -#buildtriggerpackages 'interest' | ||
312 | -buildtriggerpackages 'interest-noawait' | ||
313 | -buildsimplenativepackage "trigstuff" 'all' '1.0' 'unstable' | ||
314 | - | ||
315 | -setupaptarchive | ||
316 | - | ||
317 | -runtests() { | ||
318 | - local TYPE="$1" | ||
319 | - msgmsg 'Working with trigger type' "$TYPE" | ||
320 | - testsuccess aptget install triggerable-$TYPE -y | ||
321 | - cp rootdir/tmp/testsuccess.output terminal.output | ||
322 | - testsuccess grep '^REWRITE ' terminal.output | ||
323 | - testdpkginstalled triggerable-$TYPE trigdepends-$TYPE | ||
324 | - | ||
325 | - testsuccess aptget install trigdepends-$TYPE -y --reinstall | ||
326 | - cp rootdir/tmp/testsuccess.output terminal.output | ||
327 | - testsuccess grep '^REWRITE ' terminal.output | ||
328 | - testsuccess grep ' root root ' terminal.output | ||
329 | - testdpkginstalled triggerable-$TYPE trigdepends-$TYPE | ||
330 | - | ||
331 | - testsuccess aptget install trigstuff -y | ||
332 | - cp rootdir/tmp/testsuccess.output terminal.output | ||
333 | - testsuccess grep '^REWRITE ' terminal.output | ||
334 | - testsuccess grep ' root root ' terminal.output | ||
335 | - testdpkginstalled triggerable-$TYPE trigdepends-$TYPE trigstuff | ||
336 | - | ||
337 | - testsuccess aptget purge trigstuff -y | ||
338 | - cp rootdir/tmp/testsuccess.output terminal.output | ||
339 | - testsuccess grep '^REWRITE ' terminal.output | ||
340 | - testsuccess grep ' root root ' terminal.output | ||
341 | - testdpkginstalled triggerable-$TYPE trigdepends-$TYPE | ||
342 | - testdpkgnotinstalled trigstuff | ||
343 | - | ||
344 | - testsuccess aptget purge trigdepends-$TYPE -y | ||
345 | - cp rootdir/tmp/testsuccess.output terminal.output | ||
346 | - testfailure grep '^REWRITE ' terminal.output | ||
347 | - testfailure grep ' root root ' terminal.output | ||
348 | - testdpkgnotinstalled triggerable-$TYPE trigdepends-$TYPE | ||
349 | -} | ||
350 | -#runtests 'interest' | ||
351 | -runtests 'interest-noawait' | ||
352 | diff --git a/test/integration/test-no-fds-leaked-to-maintainer-scripts b/test/integration/test-no-fds-leaked-to-maintainer-scripts | 100 | diff --git a/test/integration/test-no-fds-leaked-to-maintainer-scripts b/test/integration/test-no-fds-leaked-to-maintainer-scripts |
353 | index 41c0570..d3960d7 100755 | 101 | index d86e638..ef6d23b 100755 |
354 | --- a/test/integration/test-no-fds-leaked-to-maintainer-scripts | 102 | --- a/test/integration/test-no-fds-leaked-to-maintainer-scripts |
355 | +++ b/test/integration/test-no-fds-leaked-to-maintainer-scripts | 103 | +++ b/test/integration/test-no-fds-leaked-to-maintainer-scripts |
356 | @@ -59,8 +59,7 @@ startup packages configure | 104 | @@ -59,8 +59,7 @@ startup packages configure |
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 | ||
diff --git a/meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch b/meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch index 7c42ff07b8..47870e3c8b 100644 --- a/meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch +++ b/meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 2bff7ee06a4f96e7d326991d61fb86f8aa651d48 Mon Sep 17 00:00:00 2001 | 1 | From 9fdf50d63df08ee65e7d8e62c35f19ac4841bca9 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 09:48:45 +0800 | 3 | Date: Wed, 27 May 2015 09:48:45 +0800 |
4 | Subject: [PATCH] remove Wsuggest-attribute from CXXFLAGS | 4 | Subject: [PATCH] remove Wsuggest-attribute from CXXFLAGS |
@@ -15,29 +15,29 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com> | |||
15 | 2 files changed, 2 deletions(-) | 15 | 2 files changed, 2 deletions(-) |
16 | 16 | ||
17 | diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in | 17 | diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in |
18 | index b0a8d9d..91ed011 100644 | 18 | index 9620722..c344d01 100644 |
19 | --- a/buildlib/environment.mak.in | 19 | --- a/buildlib/environment.mak.in |
20 | +++ b/buildlib/environment.mak.in | 20 | +++ b/buildlib/environment.mak.in |
21 | @@ -11,7 +11,6 @@ CPPFLAGS+= @CPPFLAGS@ @DEFS@ -D_REENTRANT -D_FORTIFY_SOURCE=2 | 21 | @@ -14,7 +14,6 @@ CXXFLAGS+= @CXXFLAGS@ -Wall -Wextra |
22 | CXX = @CXX@ | ||
23 | CXXFLAGS+= @CXXFLAGS@ -Wall -Wextra | ||
24 | CXXFLAGS+= -Wcast-align -Wlogical-op -Wredundant-decls -Wmissing-declarations -Wunsafe-loop-optimizations | 22 | CXXFLAGS+= -Wcast-align -Wlogical-op -Wredundant-decls -Wmissing-declarations -Wunsafe-loop-optimizations |
25 | -CXXFLAGS+= -Wsuggest-attribute=pure -Wsuggest-attribute=const -Wsuggest-attribute=noreturn | 23 | CXXFLAGS+= -Wctor-dtor-privacy -Wdisabled-optimization -Winit-self -Wmissing-include-dirs -Wnoexcept -Wsign-promo -Wundef |
24 | # suggests methods which already have such an attribute | ||
25 | -#CXXFLAGS+= -Wsuggest-attribute=pure -Wsuggest-attribute=const -Wsuggest-attribute=noreturn | ||
26 | # sanitize options to be enabled for testing | ||
27 | #CXXFLAGS+= -fsanitize=address -fsanitize=undefined -fno-sanitize=vptr | ||
26 | # a bit too pedantic to be run by default | 28 | # a bit too pedantic to be run by default |
27 | #CXXFLAGS+= -Wpedantic -Wno-long-long -Wno-vla -Wno-variadic-macros | ||
28 | NUM_PROCS = @NUM_PROCS@ | ||
29 | diff --git a/test/libapt/makefile b/test/libapt/makefile | 29 | diff --git a/test/libapt/makefile b/test/libapt/makefile |
30 | index 7f23ace..e805f13 100644 | 30 | index 5ff9cf6..c5b5190 100644 |
31 | --- a/test/libapt/makefile | 31 | --- a/test/libapt/makefile |
32 | +++ b/test/libapt/makefile | 32 | +++ b/test/libapt/makefile |
33 | @@ -39,7 +39,6 @@ CXXFLAGS += -pthread | 33 | @@ -40,7 +40,6 @@ CXXFLAGS += -pthread |
34 | # disable some flags for gtest again | 34 | # disable some flags for gtest again |
35 | CXXFLAGS+= -Wno-missing-declarations | 35 | CXXFLAGS+= -Wno-missing-declarations |
36 | CXXFLAGS+= -Wno-missing-field-initializers | 36 | CXXFLAGS+= -Wno-missing-field-initializers |
37 | -CXXFLAGS+= -Wno-suggest-attribute=pure -Wno-suggest-attribute=const -Wno-suggest-attribute=noreturn | 37 | -CXXFLAGS+= -Wno-suggest-attribute=pure -Wno-suggest-attribute=const -Wno-suggest-attribute=noreturn |
38 | CXXFLAGS+= -Wno-undef | ||
38 | 39 | ||
39 | # All Google Test headers. Usually you shouldn't change this definition. | 40 | # All Google Test headers. Usually you shouldn't change this definition. |
40 | GTEST_HEADERS = /usr/include/gtest/*.h \ | ||
41 | -- | 41 | -- |
42 | 1.9.1 | 42 | 2.1.4 |
43 | 43 | ||
diff --git a/meta/recipes-devtools/apt/apt/disable-test.patch b/meta/recipes-devtools/apt/apt/disable-test.patch index 676795dc8a..0532671747 100644 --- a/meta/recipes-devtools/apt/apt/disable-test.patch +++ b/meta/recipes-devtools/apt/apt/disable-test.patch | |||
@@ -1,35 +1,51 @@ | |||
1 | [PATCH] disable test | 1 | From 67bc7948e0a721c75d636931abc105da5dcb0763 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> | ||
3 | Date: Thu, 26 May 2016 15:32:11 -0500 | ||
4 | Subject: [PATCH] [PATCH] disable test | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
2 | 8 | ||
3 | Upstream-Status: Inappropriate [configuration] | 9 | Upstream-Status: Inappropriate [configuration] |
4 | 10 | ||
5 | test needs gtest package, so not build the test dir | 11 | test needs gtest package, so not build the test dir |
6 | 12 | ||
7 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | 13 | Signed-off-by: Roy Li <rongqing.li@windriver.com> |
14 | Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> | ||
8 | --- | 15 | --- |
9 | Makefile | 7 +++---- | 16 | Makefile | 9 +++------ |
10 | configure.ac | 6 ------ | 17 | configure.ac | 7 ------- |
11 | 2 files changed, 3 insertions(+), 10 deletions(-) | 18 | 2 files changed, 3 insertions(+), 13 deletions(-) |
12 | 19 | ||
13 | diff --git a/Makefile b/Makefile | 20 | diff --git a/Makefile b/Makefile |
14 | index 5f5fb27..5070e96 100644 | 21 | index 7680f08..69527a5 100644 |
15 | --- a/Makefile | 22 | --- a/Makefile |
16 | +++ b/Makefile | 23 | +++ b/Makefile |
17 | @@ -9,8 +9,8 @@ endif | 24 | @@ -9,8 +9,8 @@ endif |
18 | .PHONY: default | 25 | .PHONY: default |
19 | default: startup all | 26 | default: startup all |
20 | 27 | ||
21 | -.PHONY: headers library clean veryclean all binary program doc test update-po | 28 | -.PHONY: fast headers library clean veryclean all binary program doc test update-po |
22 | -all headers library clean veryclean binary program doc manpages docbook test update-po startup dirs: | 29 | -all headers library clean veryclean binary program doc manpages docbook test update-po startup dirs: |
23 | +.PHONY: headers library clean veryclean all binary program doc update-po | 30 | +.PHONY: fast headers library clean veryclean all binary program doc update-po |
24 | +all headers library clean veryclean binary program doc manpages docbook update-po startup dirs: | 31 | +all headers library clean veryclean binary program doc manpages docbook update-po startup dirs: |
25 | $(MAKE) -C vendor $@ | 32 | $(MAKE) -C vendor $@ |
26 | $(MAKE) -C apt-pkg $@ | 33 | $(MAKE) -C apt-pkg $@ |
27 | $(MAKE) -C apt-inst $@ | 34 | $(MAKE) -C apt-inst $@ |
28 | @@ -21,9 +21,8 @@ all headers library clean veryclean binary program doc manpages docbook test upd | 35 | @@ -21,8 +21,6 @@ all headers library clean veryclean binary program doc manpages docbook test upd |
29 | $(MAKE) -C dselect $@ | 36 | $(MAKE) -C dselect $@ |
30 | # $(MAKE) -C doc $@ | 37 | $(MAKE) -C doc $@ |
31 | $(MAKE) -C po $@ | 38 | $(MAKE) -C po $@ |
32 | - $(MAKE) -C test $@ | 39 | - # FIXME: -C test has issue swith parallel builds, investigate! |
40 | - -$(MAKE) -C test $@ | ||
41 | |||
42 | fast: | ||
43 | $(MAKE) -C vendor all | ||
44 | @@ -32,9 +30,8 @@ fast: | ||
45 | $(MAKE) -C methods all | ||
46 | $(MAKE) -C cmdline all | ||
47 | $(MAKE) -C ftparchive all | ||
48 | - $(MAKE) -C test all | ||
33 | 49 | ||
34 | -all headers library clean veryclean binary program doc manpages docbook test update-po: startup dirs | 50 | -all headers library clean veryclean binary program doc manpages docbook test update-po: startup dirs |
35 | +all headers library clean veryclean binary program doc manpages docbook update-po: startup dirs | 51 | +all headers library clean veryclean binary program doc manpages docbook update-po: startup dirs |
@@ -37,22 +53,23 @@ index 5f5fb27..5070e96 100644 | |||
37 | dirs: startup | 53 | dirs: startup |
38 | 54 | ||
39 | diff --git a/configure.ac b/configure.ac | 55 | diff --git a/configure.ac b/configure.ac |
40 | index 5663aaf..b0f9564 100644 | 56 | index 1f05da5..e47f459 100644 |
41 | --- a/configure.ac | 57 | --- a/configure.ac |
42 | +++ b/configure.ac | 58 | +++ b/configure.ac |
43 | @@ -89,12 +89,6 @@ AC_CHECK_LIB(curl, curl_easy_init, | 59 | @@ -90,13 +90,6 @@ AC_CHECK_LIB(curl, curl_easy_init, |
44 | AC_MSG_ERROR([failed: I need CURL due https support]), | 60 | AC_MSG_ERROR([failed: I need CURL due https support]), |
45 | ) | 61 | ) |
46 | 62 | ||
47 | -AC_LANG_PUSH([C++]) | 63 | -AC_LANG_PUSH([C++]) |
48 | -AC_CHECK_HEADER(gtest/gtest.h,, | 64 | -AC_CHECK_HEADER(gtest/gtest.h,, |
49 | - AC_MSG_ERROR([failed: I need gtest to build tests]), | 65 | - AC_MSG_WARN([failed: I need gtest (packaged as libgtest-dev) for unit testing]), |
50 | -) | 66 | -) |
51 | -AC_LANG_POP([C++]) | 67 | -AC_LANG_POP([C++]) |
52 | - | 68 | - |
53 | 69 | - | |
54 | AC_SUBST(BDBLIB) | 70 | AC_SUBST(BDBLIB) |
55 | 71 | ||
72 | HAVE_ZLIB=no | ||
56 | -- | 73 | -- |
57 | 1.9.1 | 74 | 2.1.4 |
58 | 75 | ||
diff --git a/meta/recipes-devtools/apt/apt_1.0.10.1.bb b/meta/recipes-devtools/apt/apt_1.2.12.bb index 85c0d56159..85c0d56159 100644 --- a/meta/recipes-devtools/apt/apt_1.0.10.1.bb +++ b/meta/recipes-devtools/apt/apt_1.2.12.bb | |||
diff --git a/meta/recipes-devtools/apt/files/no-curl.patch b/meta/recipes-devtools/apt/files/no-curl.patch index 30238faad3..0838552b26 100644 --- a/meta/recipes-devtools/apt/files/no-curl.patch +++ b/meta/recipes-devtools/apt/files/no-curl.patch | |||
@@ -1,13 +1,23 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | 1 | Upstream-Status: Inappropriate [configuration] |
2 | From 5d61ac822fd9a3871cd5089389c210606232ecdc Mon Sep 17 00:00:00 2001 | ||
3 | From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> | ||
4 | Date: Thu, 26 May 2016 15:34:45 -0500 | ||
5 | Subject: [PATCH] Upstream-Status: Inappropriate [configuration] | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
2 | 9 | ||
10 | Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> | ||
3 | --- | 11 | --- |
4 | configure.in | 6 ------ | 12 | configure.ac | 7 ------- |
5 | methods/makefile | 7 ------- | 13 | methods/makefile | 7 ------- |
6 | 2 files changed, 13 deletions(-) | 14 | 2 files changed, 14 deletions(-) |
7 | 15 | ||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index e47f459..cd24264 100644 | ||
8 | --- a/configure.ac | 18 | --- a/configure.ac |
9 | +++ b/configure.ac | 19 | +++ b/configure.ac |
10 | @@ -86,12 +86,6 @@ AC_CHECK_HEADER(db.h, | 20 | @@ -83,13 +83,6 @@ AC_CHECK_HEADER(db.h, |
11 | 21 | ||
12 | LIBS="$saveLIBS" | 22 | LIBS="$saveLIBS" |
13 | 23 | ||
@@ -17,9 +27,12 @@ Upstream-Status: Inappropriate [configuration] | |||
17 | - curl_ok=no)], | 27 | - curl_ok=no)], |
18 | - AC_MSG_ERROR([failed: I need CURL due https support]), | 28 | - AC_MSG_ERROR([failed: I need CURL due https support]), |
19 | -) | 29 | -) |
20 | 30 | - | |
21 | AC_SUBST(BDBLIB) | 31 | AC_SUBST(BDBLIB) |
22 | 32 | ||
33 | HAVE_ZLIB=no | ||
34 | diff --git a/methods/makefile b/methods/makefile | ||
35 | index 3274e92..255086b 100644 | ||
23 | --- a/methods/makefile | 36 | --- a/methods/makefile |
24 | +++ b/methods/makefile | 37 | +++ b/methods/makefile |
25 | @@ -51,13 +51,6 @@ LIB_MAKES = apt-pkg/makefile | 38 | @@ -51,13 +51,6 @@ LIB_MAKES = apt-pkg/makefile |
@@ -28,11 +41,14 @@ Upstream-Status: Inappropriate [configuration] | |||
28 | 41 | ||
29 | -# The https method | 42 | -# The https method |
30 | -PROGRAM=https | 43 | -PROGRAM=https |
31 | -SLIBS = -lapt-pkg -lcurl $(INTLLIBS) | 44 | -SLIBS = -lapt-pkg -lcurl $(INTLLIBS) -lresolv |
32 | -LIB_MAKES = apt-pkg/makefile | 45 | -LIB_MAKES = apt-pkg/makefile |
33 | -SOURCE = https.cc server.cc | 46 | -SOURCE = https.cc server.cc |
34 | -include $(PROGRAM_H) | 47 | -include $(PROGRAM_H) |
35 | - | 48 | - |
36 | # The ftp method | 49 | # The ftp method |
37 | PROGRAM=ftp | 50 | PROGRAM=ftp |
38 | SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS) | 51 | SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS) -lresolv |
52 | -- | ||
53 | 2.1.4 | ||
54 | |||