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/files | |
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/files')
-rw-r--r-- | meta/recipes-devtools/apt/files/no-curl.patch | 30 |
1 files changed, 23 insertions, 7 deletions
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 | |||