aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/apt/files
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2016-07-29 14:53:01 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-04 15:05:46 +0100
commit369a7f7232aa8406b63376f7888896fe90f9ce40 (patch)
treecea67cea08309eaec099bda1baa9829a019685a8 /meta/recipes-devtools/apt/files
parent0d79e7b4373053a7f20f18ed962c5a17a969e57e (diff)
downloadopenembedded-core-contrib-369a7f7232aa8406b63376f7888896fe90f9ce40.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 Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-devtools/apt/files')
-rw-r--r--meta/recipes-devtools/apt/files/no-curl.patch30
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 @@
Upstream-Status: Inappropriate [configuration]
+From 5d61ac822fd9a3871cd5089389c210606232ecdc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
+Date: Thu, 26 May 2016 15:34:45 -0500
+Subject: [PATCH] Upstream-Status: Inappropriate [configuration]
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---
- configure.in | 6 ------
- methods/makefile | 7 -------
- 2 files changed, 13 deletions(-)
+ configure.ac | 7 -------
+ methods/makefile | 7 -------
+ 2 files changed, 14 deletions(-)
+diff --git a/configure.ac b/configure.ac
+index e47f459..cd24264 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -86,12 +86,6 @@ AC_CHECK_HEADER(db.h,
+@@ -83,13 +83,6 @@ AC_CHECK_HEADER(db.h,
LIBS="$saveLIBS"
@@ -17,9 +27,12 @@ Upstream-Status: Inappropriate [configuration]
- curl_ok=no)],
- AC_MSG_ERROR([failed: I need CURL due https support]),
-)
-
+-
AC_SUBST(BDBLIB)
+ HAVE_ZLIB=no
+diff --git a/methods/makefile b/methods/makefile
+index 3274e92..255086b 100644
--- a/methods/makefile
+++ b/methods/makefile
@@ -51,13 +51,6 @@ LIB_MAKES = apt-pkg/makefile
@@ -28,11 +41,14 @@ Upstream-Status: Inappropriate [configuration]
-# The https method
-PROGRAM=https
--SLIBS = -lapt-pkg -lcurl $(INTLLIBS)
+-SLIBS = -lapt-pkg -lcurl $(INTLLIBS) -lresolv
-LIB_MAKES = apt-pkg/makefile
-SOURCE = https.cc server.cc
-include $(PROGRAM_H)
-
# The ftp method
PROGRAM=ftp
- SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS)
+ SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS) -lresolv
+--
+2.1.4
+