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/disable-test.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/disable-test.patch')
-rw-r--r-- | meta/recipes-devtools/apt/apt/disable-test.patch | 47 |
1 files changed, 32 insertions, 15 deletions
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 | ||