From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- poky/meta/recipes-devtools/apt/files/apt.conf | 42 +++++++++++++++++ .../apt/files/db_linking_hack.patch | 29 ++++++++++++ .../recipes-devtools/apt/files/environment.patch | 15 ++++++ poky/meta/recipes-devtools/apt/files/no-curl.patch | 54 ++++++++++++++++++++++ 4 files changed, 140 insertions(+) create mode 100644 poky/meta/recipes-devtools/apt/files/apt.conf create mode 100644 poky/meta/recipes-devtools/apt/files/db_linking_hack.patch create mode 100644 poky/meta/recipes-devtools/apt/files/environment.patch create mode 100644 poky/meta/recipes-devtools/apt/files/no-curl.patch (limited to 'poky/meta/recipes-devtools/apt/files') diff --git a/poky/meta/recipes-devtools/apt/files/apt.conf b/poky/meta/recipes-devtools/apt/files/apt.conf new file mode 100644 index 000000000..03351356b --- /dev/null +++ b/poky/meta/recipes-devtools/apt/files/apt.conf @@ -0,0 +1,42 @@ +Dir "${STAGING_DIR_NATIVE}/" +{ + State "var/lib/apt/" + { + Lists "#APTCONF#/lists/"; + status "#ROOTFS#/var/lib/dpkg/status"; + }; + Cache "var/cache/apt/" + { + Archives "archives/"; + pkgcache ""; + srcpkgcache ""; + }; + Bin "${STAGING_BINDIR_NATIVE}/" + { + methods "${STAGING_LIBDIR}/apt/methods/"; + gzip "/bin/gzip"; + dpkg "dpkg"; + dpkg-source "dpkg-source"; + dpkg-buildpackage "dpkg-buildpackage"; + apt-get "apt-get"; + apt-cache "apt-cache"; + }; + Etc "#APTCONF#" + { + Preferences "preferences"; + }; +}; + +APT +{ + Install-Recommends "true"; + Immediate-Configure "false"; + Architecture "i586"; + Get + { + Assume-Yes "true"; + Force-Yes "true" + }; +}; + +DPkg::Options {"--root=#ROOTFS#";"--admindir=#ROOTFS#/var/lib/dpkg";"--force-all";"--no-debsig"}; diff --git a/poky/meta/recipes-devtools/apt/files/db_linking_hack.patch b/poky/meta/recipes-devtools/apt/files/db_linking_hack.patch new file mode 100644 index 000000000..a61d4b07c --- /dev/null +++ b/poky/meta/recipes-devtools/apt/files/db_linking_hack.patch @@ -0,0 +1,29 @@ +Upstream-Status: Backport + +Index: apt-0.7.3/configure.ac +=================================================================== +--- apt-0.7.3.orig/configure.ac 2007-07-01 10:38:45.000000000 +0000 ++++ apt-0.7.3/configure.ac 2007-08-21 13:39:26.000000000 +0000 +@@ -67,8 +67,20 @@ + [AC_DEFINE(HAVE_BDB) + BDBLIB="-ldb" + AC_MSG_RESULT(yes)], +- [BDBLIB="" +- AC_MSG_RESULT(no)] ++ ++ LIBS="$LIBS -lpthread" ++ [AC_MSG_CHECKING(if we can link against BerkeleyDB with pthread) ++ AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM( ++ [#include ], ++ [int r, s, t; db_version(&r, &s, &t);] ++ )], ++ [AC_DEFINE(HAVE_BDB) ++ BDBLIB="-ldb -lpthread" ++ AC_MSG_RESULT(yes)], ++ [BDBLIB="" ++ AC_MSG_RESULT(no)] ++ )] + )] + ) + diff --git a/poky/meta/recipes-devtools/apt/files/environment.patch b/poky/meta/recipes-devtools/apt/files/environment.patch new file mode 100644 index 000000000..9a0303803 --- /dev/null +++ b/poky/meta/recipes-devtools/apt/files/environment.patch @@ -0,0 +1,15 @@ +Upstream-Status: Backport + +Index: apt-0.6.46.2/buildlib/environment.mak.in +=================================================================== +--- apt-0.6.46.2.orig/buildlib/environment.mak.in 2007-03-29 11:38:58.000000000 +0100 ++++ apt-0.6.46.2/buildlib/environment.mak.in 2007-03-29 11:39:12.000000000 +0100 +@@ -62,7 +62,7 @@ + + # Shared library things + HOST_OS = @host_os@ +-ifneq ($(words $(filter linux-gnu gnu% %gnu,$(HOST_OS))),0) ++ifneq ($(words $(filter linux-gnu linux-gnueabi gnu% %gnu,$(HOST_OS))),0) + SONAME_MAGIC=-Wl,-soname -Wl, + LFLAGS_SO= + else diff --git a/poky/meta/recipes-devtools/apt/files/no-curl.patch b/poky/meta/recipes-devtools/apt/files/no-curl.patch new file mode 100644 index 000000000..0838552b2 --- /dev/null +++ b/poky/meta/recipes-devtools/apt/files/no-curl.patch @@ -0,0 +1,54 @@ +Upstream-Status: Inappropriate [configuration] +From 5d61ac822fd9a3871cd5089389c210606232ecdc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= +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 +--- + 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 +@@ -83,13 +83,6 @@ AC_CHECK_HEADER(db.h, + + LIBS="$saveLIBS" + +-AC_CHECK_LIB(curl, curl_easy_init, +- [AC_CHECK_HEADER(curl/curl.h, +- curl_ok=yes, +- 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 + SOURCE = http.cc http_main.cc rfc2553emu.cc connect.cc server.cc + include $(PROGRAM_H) + +-# The https method +-PROGRAM=https +-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) -lresolv +-- +2.1.4 + -- cgit v1.2.3